From svn at tinysofa.org  Mon Nov  1 10:23:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  1 Nov 2004 05:23:53 -0500 (EST)
Subject: [tinysofa-svn] 
	r5054 - in tinysofa/releases/1.1/dietlibc/current: sources specs
Message-ID: <20041101102353.1A24734417D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-01 05:23:51 -0500 (Mon, 01 Nov 2004)
New Revision: 5054

Added:
   tinysofa/releases/1.1/dietlibc/current/sources/dietlibc-0.27.tar.bz2
Removed:
   tinysofa/releases/1.1/dietlibc/current/sources/dietlibc-0.26.tar.bz2
Modified:
   tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec
Log:
- 0.27
- include x86_64


Deleted: tinysofa/releases/1.1/dietlibc/current/sources/dietlibc-0.26.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/dietlibc/current/sources/dietlibc-0.27.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/dietlibc/current/sources/dietlibc-0.27.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec
===================================================================
--- tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec	2004-10-31 22:08:51 UTC (rev 5053)
+++ tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec	2004-11-01 10:23:51 UTC (rev 5054)
@@ -1,10 +1,10 @@
 %define __os_install_post /usr/lib/rpm/brp-compress
 
-ExclusiveArch: %{ix86}
+ExclusiveArch: %{ix86} x86_64
 Summary: A small libc implementation
 Name: dietlibc
-Version: 0.26
-Release: 1ts
+Version: 0.27
+Release: 1jh
 Group: development
 License: GPL
 Url: http://www.fefe.de/dietlibc/
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Mon Nov  1 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.27-1jh
+- 0.27
+- include x86_64
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 0.26-1ts
 - current (0.26-1jh) integrated as 0.26-1ts for release 1.1
 


From svn at tinysofa.org  Mon Nov  1 10:56:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  1 Nov 2004 05:56:13 -0500 (EST)
Subject: [tinysofa-svn] 
	r5055 - tinysofa/releases/1.1/foomatic-filters/current/specs
Message-ID: <20041101105613.2C41434417D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-01 05:56:12 -0500 (Mon, 01 Nov 2004)
New Revision: 5055

Modified:
   tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec
Log:
- run sed always


Modified: tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec
===================================================================
--- tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec	2004-11-01 10:23:51 UTC (rev 5054)
+++ tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec	2004-11-01 10:56:12 UTC (rev 5055)
@@ -22,9 +22,7 @@
 %setup -q
 
 rm -fr CVS
-%ifarch x86_64
-sed -i 's/\/usr\/lib\/cups/\/usr\/lib64\/cups/g' *
-%endif
+sed -i 's/\/usr\/lib\/cups/\/usr\/%{_lib}\/cups/g' *
 
 %build
 %configure


From svn at tinysofa.org  Mon Nov  1 17:49:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  1 Nov 2004 12:49:09 -0500 (EST)
Subject: [tinysofa-svn] 
	r5056 - in tinysofa/releases/1.1: filesystem/current/specs
	foomatic-filters/current/specs
Message-ID: <20041101174909.84B7C34417D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-01 12:49:08 -0500 (Mon, 01 Nov 2004)
New Revision: 5056

Modified:
   tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec
   tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec
Log:
- build with arch because of multilib differences


Modified: tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec
===================================================================
--- tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec	2004-11-01 10:56:12 UTC (rev 5055)
+++ tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec	2004-11-01 17:49:08 UTC (rev 5056)
@@ -6,7 +6,6 @@
 Group: main
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: setup
-BuildArch: noarch
 Epoch: 2
 
 %description

Modified: tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec
===================================================================
--- tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec	2004-11-01 10:56:12 UTC (rev 5055)
+++ tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec	2004-11-01 17:49:08 UTC (rev 5056)
@@ -2,7 +2,6 @@
 Name: foomatic-filters
 Version: 3.0.2
 Release: 3jh
-BuildArch: noarch
 License: GPL
 Group: extra
 Source: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{version}.tar.gz


From svn at tinysofa.org  Tue Nov  2 17:56:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  2 Nov 2004 12:56:54 -0500 (EST)
Subject: [tinysofa-svn] 
	r5057 - in tinysofa/releases/1.1/syslinux/current: sources specs
Message-ID: <20041102175654.1C24C34417D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-02 12:56:52 -0500 (Tue, 02 Nov 2004)
New Revision: 5057

Added:
   tinysofa/releases/1.1/syslinux/current/sources/syslinux-2.08-x86_64.patch
   tinysofa/releases/1.1/syslinux/current/sources/syslinux-2.10.tar.bz2
Removed:
   tinysofa/releases/1.1/syslinux/current/sources/syslinux-2.08.tar.bz2
Modified:
   tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec
Log:
- 2.10
- build and install correctly on x86_64


Added: tinysofa/releases/1.1/syslinux/current/sources/syslinux-2.08-x86_64.patch
===================================================================
--- tinysofa/releases/1.1/syslinux/current/sources/syslinux-2.08-x86_64.patch	2004-11-01 17:49:08 UTC (rev 5056)
+++ tinysofa/releases/1.1/syslinux/current/sources/syslinux-2.08-x86_64.patch	2004-11-02 17:56:52 UTC (rev 5057)
@@ -0,0 +1,25 @@
+--- syslinux-2.08/sample/Makefile.x86_64	2003-12-10 15:44:57.000000000 -0500
++++ syslinux-2.08/sample/Makefile	2003-12-14 17:26:35.142040434 -0500
+@@ -29,6 +29,13 @@
+ 
+ LIBOBJS	   = conio.o atou.o skipatou.o printf.o
+ 
++ARCH := $(shell uname -m)
++ifneq (x86_64, $ARCH)
++CFLAGS += -m32
++SFLAGS += -m32
++LDFLAGS += -m elf_i386
++endif
++
+ .SUFFIXES: .lss .c .o .elf .c32
+ 
+ all: syslogo.lss comecho.com hello.c32 hello2.c32 filetest.c32 c32echo.c32 fd.c32 chain.c32
+@@ -40,7 +47,7 @@
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ %.elf: c32entry.o %.o $(LIB)
+-	$(LD) -Ttext 0x101000 -e _start -o $@ $^
++	$(LD) $(LDFLAGS) -Ttext 0x101000 -e _start -o $@ $^
+ 
+ %.c32: %.elf
+ 	$(OBJCOPY) -O binary $< $@

Deleted: tinysofa/releases/1.1/syslinux/current/sources/syslinux-2.08.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/syslinux/current/sources/syslinux-2.10.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/syslinux/current/sources/syslinux-2.10.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec
===================================================================
--- tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec	2004-11-01 17:49:08 UTC (rev 5056)
+++ tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec	2004-11-02 17:56:52 UTC (rev 5057)
@@ -1,13 +1,14 @@
 Summary: Kernel loader which uses a FAT or iso9660 filesystem or a PXE network
 Name:    syslinux
-Version: 2.08
-Release: 7ts
+Version: 2.10
+Release: 1jh
 License: GPL
 Group: extra
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2
-Patch:   syslinux-2.08-png2pnm.patch
-ExclusiveArch: i386 i586 x86_64
-BuildRoot: %{_tmppath}/%{name}-root
+Patch0: syslinux-2.08-png2pnm.patch
+Patch1: syslinux-2.08-x86_64.patch
+ExclusiveArch: %{ix86} x86_64
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: nasm >= 0.98.35, perl, libpng-tools
 
 %description
@@ -27,8 +28,10 @@
 
 %prep
 %setup -q -n syslinux-%{version}
-%patch -p1
+%patch0 -p1 -b .png2pnm
+%patch1 -p1 -b .x86_64
 
+
 %build
 make DATE="$(echo `date +%%m-%%d-%%Y` tinysofa build)" \
      CC="gcc %{?no_stack_protector}" clean
@@ -37,45 +40,54 @@
 mv syslinux syslinux-mtools
 mv syslinux-nomtools syslinux
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/syslinux
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
+# install to /usr/lib also on x86_64
+mkdir -p \
+	$RPM_BUILD_ROOT%{_bindir} \
+	$RPM_BUILD_ROOT%{_prefix}/lib/syslinux \
+	$RPM_BUILD_ROOT%{_includedir}
 make install install-lib \
      INSTALLROOT=%{buildroot} BINDIR=%{_bindir} \
-     LIBDIR=%{_libdir} INCDIR=%{_includedir}
+     LIBDIR=%{_prefix}/lib INCDIR=%{_includedir}
 install -m 644 sample/mdiskchk.com $RPM_BUILD_ROOT%{_libdir}/syslinux/
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc NEWS README *.doc memdisk/*.doc COPYING
 %doc sample/sample.msg sample/syslogo.lss sample/syslogo.png
 %{_bindir}/syslinux
-%{_libdir}/syslinux/pxelinux.0
-%{_libdir}/syslinux/isolinux.bin
+%dir %{_prefix}/lib/syslinux
+%{_prefix}/lib/syslinux/pxelinux.0
+%{_prefix}/lib/syslinux/isolinux.bin
 
 %files tools
 %defattr(-,root,root)
 %{_bindir}/gethostip
 %{_bindir}/ppmtolss16
 %{_bindir}/lss16toppm
-%{_libdir}/syslinux/isolinux-debug.bin
-%{_libdir}/syslinux/syslinux.com
-%{_libdir}/syslinux/syslinux.exe
-%{_libdir}/syslinux/copybs.com
-%{_libdir}/syslinux/memdisk
-%{_libdir}/syslinux/mdiskchk.com
+%{_prefix}/lib/syslinux/isolinux-debug.bin
+%{_prefix}/lib/syslinux/syslinux.com
+%{_prefix}/lib/syslinux/syslinux.exe
+%{_prefix}/lib/syslinux/copybs.com
+%{_prefix}/lib/syslinux/memdisk
+%{_prefix}/lib/syslinux/mdiskchk.com
 
 %exclude %{_includedir}/syslinux.h
 %exclude %{_libdir}/libsyslinux.a
 %exclude %{_libdir}/libsyslinux.so*
 
+
 %changelog
+* Tue Nov  2 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.10-1jh
+- 2.10
+- build and install correctly on x86_64
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.08-7ts
 - current (2.08-7jh) integrated as 2.08-7ts for release 1.1
 


From svn at tinysofa.org  Wed Nov  3 05:12:11 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  3 Nov 2004 00:12:11 -0500 (EST)
Subject: [tinysofa-svn] r5058 - tinysofa/releases/1.1/syslinux/current/specs
Message-ID: <20041103051211.AEA1D34417D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-03 00:12:10 -0500 (Wed, 03 Nov 2004)
New Revision: 5058

Modified:
   tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec
Log:
- x86_64 fix


Modified: tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec
===================================================================
--- tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec	2004-11-02 17:56:52 UTC (rev 5057)
+++ tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec	2004-11-03 05:12:10 UTC (rev 5058)
@@ -50,7 +50,7 @@
 make install install-lib \
      INSTALLROOT=%{buildroot} BINDIR=%{_bindir} \
      LIBDIR=%{_prefix}/lib INCDIR=%{_includedir}
-install -m 644 sample/mdiskchk.com $RPM_BUILD_ROOT%{_libdir}/syslinux/
+install -m 644 sample/mdiskchk.com $RPM_BUILD_ROOT%{_prefix}/lib/syslinux/
 
 
 %clean
@@ -79,8 +79,8 @@
 %{_prefix}/lib/syslinux/mdiskchk.com
 
 %exclude %{_includedir}/syslinux.h
-%exclude %{_libdir}/libsyslinux.a
-%exclude %{_libdir}/libsyslinux.so*
+%exclude %{_prefix}/lib/libsyslinux.a
+%exclude %{_prefix}/lib/libsyslinux.so*
 
 
 %changelog


From svn at tinysofa.org  Wed Nov  3 13:55:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  3 Nov 2004 08:55:28 -0500 (EST)
Subject: [tinysofa-svn] r5059 - tinysofa/releases/1.1/kernel/current/sources
Message-ID: <20041103135528.D8E4F34417D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-03 08:55:27 -0500 (Wed, 03 Nov 2004)
New Revision: 5059

Modified:
   tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ia64.config
   tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64.config
   tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64iseries.config
   tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64pseries.config
   tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-x86_64-smp.config
   tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-x86_64.config
Log:
- update some configs


Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ia64.config
===================================================================
--- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ia64.config	2004-11-03 05:12:10 UTC (rev 5058)
+++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ia64.config	2004-11-03 13:55:27 UTC (rev 5059)
@@ -183,6 +183,7 @@
 # CONFIG_CISS_MONITOR_THREAD is not set
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_INITRD=y
@@ -615,11 +616,15 @@
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SIL=m
+CONFIG_SCSI_SATA_VIA=m
+CONFIG_SCSI_SATA_VITESSE=m
+CONFIG_SCSI_SATA_SIS=m
+CONFIG_SCSI_SATA_SX4=m
+CONFIG_SCSI_SATA_NV=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
@@ -651,6 +656,7 @@
 CONFIG_FC_QLA2200=m
 CONFIG_FC_QLA2300=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
+CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_NEWISP=m
 CONFIG_SCSI_SEAGATE=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
@@ -2117,6 +2123,8 @@
 CONFIG_PANIC_MORSE=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+CONFIG_DISKDUMP=m
+CONFIG_SCSI_DUMP=m
 
 #
 # Library routines
@@ -2243,5 +2251,7 @@
 CONFIG_AGP_HP_ZX1=y
 CONFIG_SERIAL_HCDP=y
 CONFIG_OPROFILE=m
+CONFIG_DISKDUMP=m
+CONFIG_SCSI_DUMP=m
 ##CONFIG_BLK_CPQ_DA=m
 ##CONFIG_FB_RADEON=m

Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64.config
===================================================================
--- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64.config	2004-11-03 05:12:10 UTC (rev 5058)
+++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64.config	2004-11-03 13:55:27 UTC (rev 5059)
@@ -182,6 +182,7 @@
 # CONFIG_CISS_MONITOR_THREAD is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_INITRD=y
@@ -614,11 +615,15 @@
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SIL=m
+CONFIG_SCSI_SATA_VIA=m
+CONFIG_SCSI_SATA_VITESSE=m
+CONFIG_SCSI_SATA_SIS=m
+CONFIG_SCSI_SATA_SX4=m
+CONFIG_SCSI_SATA_NV=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
@@ -650,6 +655,7 @@
 CONFIG_FC_QLA2200=m
 CONFIG_FC_QLA2300=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
+CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_NEWISP=m
 CONFIG_SCSI_SEAGATE=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
@@ -1409,24 +1415,24 @@
 #
 # Watchdog Cards
 #
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 # CONFIG_WDT_501 is not set
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_WDT=m
-CONFIG_WDTPCI=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_PCWATCHDOG=m
-CONFIG_W83877F_WDT=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_SC1200_WDT=m
-CONFIG_ALIM1535_WDT=m
+# CONFIG_WDT is not set
+# CONFIG_WDTPCI is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
 # CONFIG_60XX_WDT is not set
 # CONFIG_MIXCOMWD is not set
 CONFIG_I810_TCO=m
@@ -2115,6 +2121,8 @@
 CONFIG_PANIC_MORSE=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_DISKDUMP is not set
+# CONFIG_SCSI_DUMP is not set
 
 #
 # Library routines
@@ -2172,6 +2180,22 @@
 # CONFIG_DIGIEPCA is not set
 # CONFIG_ATI_CD1865 is not set
 CONFIG_ICOM=m
+CONFIG_WATCHDOG=y
+CONFIG_SOFT_WATCHDOG=m
+# CONFIG_WDT is not set
+# CONFIG_WDTPCI is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_HUGETLBFS is not set
@@ -2221,3 +2245,5 @@
 CONFIG_PARPORT_1284=y
 # CONFIG_PARPORT_OTHER is not set
 # CONFIG_PARIDE is not set
+CONFIG_IBMVETH=m
+CONFIG_SCSI_IBMVSCSI=m

Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64iseries.config
===================================================================
--- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64iseries.config	2004-11-03 05:12:10 UTC (rev 5058)
+++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64iseries.config	2004-11-03 13:55:27 UTC (rev 5059)
@@ -182,6 +182,7 @@
 # CONFIG_CISS_MONITOR_THREAD is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_INITRD=y
@@ -619,6 +620,10 @@
 # CONFIG_SCSI_SATA_PROMISE is not set
 # CONFIG_SCSI_SATA_SIL is not set
 # CONFIG_SCSI_SATA_VIA is not set
+# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SCSI_SATA_SIS is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+# CONFIG_SCSI_SATA_NV is not set
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
@@ -650,6 +655,7 @@
 CONFIG_FC_QLA2200=m
 CONFIG_FC_QLA2300=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
+CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_NEWISP=m
 CONFIG_SCSI_SEAGATE=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
@@ -1409,24 +1415,24 @@
 #
 # Watchdog Cards
 #
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 # CONFIG_WDT_501 is not set
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_WDT=m
-CONFIG_WDTPCI=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_PCWATCHDOG=m
-CONFIG_W83877F_WDT=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_SC1200_WDT=m
-CONFIG_ALIM1535_WDT=m
+# CONFIG_WDT is not set
+# CONFIG_WDTPCI is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
 # CONFIG_60XX_WDT is not set
 # CONFIG_MIXCOMWD is not set
 CONFIG_I810_TCO=m
@@ -2115,6 +2121,8 @@
 CONFIG_PANIC_MORSE=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_DISKDUMP is not set
+# CONFIG_SCSI_DUMP is not set
 
 #
 # Library routines
@@ -2172,6 +2180,22 @@
 # CONFIG_DIGIEPCA is not set
 # CONFIG_ATI_CD1865 is not set
 CONFIG_ICOM=m
+CONFIG_WATCHDOG=y
+CONFIG_SOFT_WATCHDOG=m
+# CONFIG_WDT is not set
+# CONFIG_WDTPCI is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_HUGETLBFS is not set
@@ -2238,7 +2262,12 @@
 # CONFIG_SCSI_SATA_PROMISE is not set
 # CONFIG_SCSI_SATA_SIL is not set
 # CONFIG_SCSI_SATA_VIA is not set
+# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SCSI_SATA_SIS is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+# CONFIG_SCSI_SATA_NV is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_IBMVSCSI is not set
 # CONFIG_DL2K is not set
 # CONFIG_VORTEX is not set
 # CONFIG_NE2K_PCI is not set

Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64pseries.config
===================================================================
--- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64pseries.config	2004-11-03 05:12:10 UTC (rev 5058)
+++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ppc64pseries.config	2004-11-03 13:55:27 UTC (rev 5059)
@@ -182,6 +182,7 @@
 # CONFIG_CISS_MONITOR_THREAD is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_INITRD=y
@@ -614,11 +615,15 @@
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SIL=m
+CONFIG_SCSI_SATA_VIA=m
+CONFIG_SCSI_SATA_VITESSE=m
+CONFIG_SCSI_SATA_SIS=m
+CONFIG_SCSI_SATA_SX4=m
+CONFIG_SCSI_SATA_NV=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
@@ -650,6 +655,7 @@
 CONFIG_FC_QLA2200=m
 CONFIG_FC_QLA2300=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
+CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_NEWISP=m
 CONFIG_SCSI_SEAGATE=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
@@ -1409,24 +1415,24 @@
 #
 # Watchdog Cards
 #
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 # CONFIG_WDT_501 is not set
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_WDT=m
-CONFIG_WDTPCI=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_PCWATCHDOG=m
-CONFIG_W83877F_WDT=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_SC1200_WDT=m
-CONFIG_ALIM1535_WDT=m
+# CONFIG_WDT is not set
+# CONFIG_WDTPCI is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
 # CONFIG_60XX_WDT is not set
 # CONFIG_MIXCOMWD is not set
 CONFIG_I810_TCO=m
@@ -2115,6 +2121,8 @@
 CONFIG_PANIC_MORSE=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_DISKDUMP is not set
+# CONFIG_SCSI_DUMP is not set
 
 #
 # Library routines
@@ -2172,6 +2180,22 @@
 # CONFIG_DIGIEPCA is not set
 # CONFIG_ATI_CD1865 is not set
 CONFIG_ICOM=m
+CONFIG_WATCHDOG=y
+CONFIG_SOFT_WATCHDOG=m
+# CONFIG_WDT is not set
+# CONFIG_WDTPCI is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_HUGETLBFS is not set
@@ -2221,3 +2245,5 @@
 CONFIG_PARPORT_1284=y
 # CONFIG_PARPORT_OTHER is not set
 # CONFIG_PARIDE is not set
+CONFIG_IBMVETH=m
+CONFIG_SCSI_IBMVSCSI=m

Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-x86_64-smp.config
===================================================================
--- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-x86_64-smp.config	2004-11-03 05:12:10 UTC (rev 5058)
+++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-x86_64-smp.config	2004-11-03 13:55:27 UTC (rev 5059)
@@ -182,6 +182,7 @@
 # CONFIG_CISS_MONITOR_THREAD is not set
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_INITRD=y
@@ -614,11 +615,15 @@
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SIL=m
+CONFIG_SCSI_SATA_VIA=m
+CONFIG_SCSI_SATA_VITESSE=m
+CONFIG_SCSI_SATA_SIS=m
+CONFIG_SCSI_SATA_SX4=m
+CONFIG_SCSI_SATA_NV=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
@@ -650,6 +655,7 @@
 CONFIG_FC_QLA2200=m
 CONFIG_FC_QLA2300=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
+CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_NEWISP=m
 CONFIG_SCSI_SEAGATE=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
@@ -2115,6 +2121,8 @@
 CONFIG_PANIC_MORSE=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_DISKDUMP is not set
+# CONFIG_SCSI_DUMP is not set
 
 #
 # Library routines
@@ -2126,7 +2134,7 @@
 CONFIG_MK8=y
 CONFIG_IA32_EMULATION=y
 CONFIG_ISA=y
-CONFIG_UID16=y
+# CONFIG_UID16 is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_TOSHIBA=m

Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-x86_64.config
===================================================================
--- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-x86_64.config	2004-11-03 05:12:10 UTC (rev 5058)
+++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-x86_64.config	2004-11-03 13:55:27 UTC (rev 5059)
@@ -182,6 +182,7 @@
 # CONFIG_CISS_MONITOR_THREAD is not set
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_INITRD=y
@@ -614,11 +615,15 @@
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SIL=m
+CONFIG_SCSI_SATA_VIA=m
+CONFIG_SCSI_SATA_VITESSE=m
+CONFIG_SCSI_SATA_SIS=m
+CONFIG_SCSI_SATA_SX4=m
+CONFIG_SCSI_SATA_NV=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
@@ -650,6 +655,7 @@
 CONFIG_FC_QLA2200=m
 CONFIG_FC_QLA2300=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
+CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_NEWISP=m
 CONFIG_SCSI_SEAGATE=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
@@ -2115,6 +2121,8 @@
 CONFIG_PANIC_MORSE=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_DISKDUMP is not set
+# CONFIG_SCSI_DUMP is not set
 
 #
 # Library routines
@@ -2126,7 +2134,7 @@
 CONFIG_MK8=y
 CONFIG_IA32_EMULATION=y
 CONFIG_ISA=y
-CONFIG_UID16=y
+# CONFIG_UID16 is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_TOSHIBA=m


From svn at tinysofa.org  Wed Nov  3 19:35:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  3 Nov 2004 14:35:02 -0500 (EST)
Subject: [tinysofa-svn] r5060 - tinysofa/releases/1.1/modutils/current/specs
Message-ID: <20041103193502.981FF34417D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-03 14:35:02 -0500 (Wed, 03 Nov 2004)
New Revision: 5060

Modified:
   tinysofa/releases/1.1/modutils/current/specs/modutils.spec
Log:
- add devel package
- disable 2.0 compatibility


Modified: tinysofa/releases/1.1/modutils/current/specs/modutils.spec
===================================================================
--- tinysofa/releases/1.1/modutils/current/specs/modutils.spec	2004-11-03 13:55:27 UTC (rev 5059)
+++ tinysofa/releases/1.1/modutils/current/specs/modutils.spec	2004-11-03 19:35:02 UTC (rev 5060)
@@ -1,7 +1,7 @@
 Summary: The kernel module utilities.
 Name: modutils
 Version: 2.4.27
-Release: 4ts
+Release: 5jh
 License: GPL
 Group: main
 Source: http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-%{version}.tar.bz2
@@ -17,18 +17,40 @@
 other module management programs.  Examples of loaded and unloaded 
 modules are device drivers and filesystems, as well as some other things.
 
+%package devel
+Summary: Kernel module management utilities development libraries.
+Group: development
+%description devel
+The modutils-devel package includes library archives that allow programs
+to implement insmod and rmmod.  Developers should not use these libraries,
+they are for internal use only.
+
+
 %prep
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-combined --enable-insmod-static --mandir=%{_mandir}
-make dep all
+%configure \
+	--exec-prefix=/ \
+	--disable-compat-2-0 \
+	--disable-combined \
+	--disable-kerneld \
+	--enable-insmod-static
+%make dep all
 
+mkdir libs
+cp util/libutil.a libs/libmodutilutil.a
+cp obj/libobj.a libs/libmodutilobj.a
+cp insmod/libmodutils.a libs
+
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{%{_mandir}/man{1,2,8},/sbin}}
-make install prefix=$RPM_BUILD_ROOT/usr exec_prefix=$RPM_BUILD_ROOT \
-             mandir=$RPM_BUILD_ROOT%{_mandir}
+mkdir -p $RPM_BUILD_ROOT/{%{_mandir}/man{1,2,8},/sbin} \
+	$RPM_BUILD_ROOT%{_libdir}
+
+%makeinstall_std \
+	sbindir=/sbin
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/modutils.conf
 
@@ -41,8 +63,11 @@
 	done
 popd
 
+install -m 644 libs/*.a $RPM_BUILD_ROOT/%{_libdir}
+
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
 
 %files
@@ -51,7 +76,15 @@
 %ghost %{_sysconfdir}/modutils.conf
 %exclude %{_mandir}
 
+%files devel
+%defattr(-,root,root)
+%{_libdir}/*.a
+
 %changelog
+* Mon Nov  1 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.4.27-5jh
+- add devel package
+- disable 2.0 compatibility
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.4.27-4ts
 - current (2.4.27-4jh) integrated as 2.4.27-4ts for release 1.1
 


From svn at tinysofa.org  Wed Nov  3 19:35:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  3 Nov 2004 14:35:57 -0500 (EST)
Subject: [tinysofa-svn] 
	r5061 - in tinysofa/releases/1.1: kernel/current/sources
	lvm/current/specs openssl/current/specs
Message-ID: <20041103193557.C90BB34417D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-03 14:35:57 -0500 (Wed, 03 Nov 2004)
New Revision: 5061

Modified:
   tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ia32e.config
   tinysofa/releases/1.1/lvm/current/specs/lvm.spec
   tinysofa/releases/1.1/openssl/current/specs/openssl.spec
Log:
- x86_64 fixes


Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ia32e.config
===================================================================
--- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ia32e.config	2004-11-03 19:35:02 UTC (rev 5060)
+++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-ia32e.config	2004-11-03 19:35:57 UTC (rev 5061)
@@ -182,6 +182,7 @@
 # CONFIG_CISS_MONITOR_THREAD is not set
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_INITRD=y
@@ -614,11 +615,15 @@
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SIL=m
+CONFIG_SCSI_SATA_VIA=m
+CONFIG_SCSI_SATA_VITESSE=m
+CONFIG_SCSI_SATA_SIS=m
+CONFIG_SCSI_SATA_SX4=m
+CONFIG_SCSI_SATA_NV=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
@@ -650,6 +655,7 @@
 CONFIG_FC_QLA2200=m
 CONFIG_FC_QLA2300=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
+CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_NEWISP=m
 CONFIG_SCSI_SEAGATE=m
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
@@ -2115,6 +2121,8 @@
 CONFIG_PANIC_MORSE=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_DISKDUMP is not set
+# CONFIG_SCSI_DUMP is not set
 
 #
 # Library routines
@@ -2126,7 +2134,7 @@
 # CONFIG_MK8 is not set
 CONFIG_IA32_EMULATION=y
 CONFIG_ISA=y
-CONFIG_UID16=y
+# CONFIG_UID16 is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_TOSHIBA=m

Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec
===================================================================
--- tinysofa/releases/1.1/lvm/current/specs/lvm.spec	2004-11-03 19:35:02 UTC (rev 5060)
+++ tinysofa/releases/1.1/lvm/current/specs/lvm.spec	2004-11-03 19:35:57 UTC (rev 5061)
@@ -46,7 +46,10 @@
 
 
 %install
-%makeinstall sbindir=$RPM_BUILD_ROOT/sbin libdir=$RPM_BUILD_ROOT/%{_lib}
+%makeinstall \
+	sbindir=$RPM_BUILD_ROOT/sbin \
+	libdir=$RPM_BUILD_ROOT/%{_lib} \
+	staticlibdir=$RPM_BUILD_ROOT/%{_libdir}
 
 chmod 755 %{buildroot}/%{_lib}/*.so*
 chmod 755 %{buildroot}/sbin/*

Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec
===================================================================
--- tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-11-03 19:35:02 UTC (rev 5060)
+++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-11-03 19:35:57 UTC (rev 5061)
@@ -65,7 +65,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
+%patch6 -p1 -b .Configure
 
 perl util/perlpath.pl %{_bindir}
 
@@ -136,14 +136,14 @@
 
 
 %install
-# /usr/lib is correct here!
 %{__mkdir_p} \
 	$RPM_BUILD_ROOT/%{_mandir} \
 	$RPM_BUILD_ROOT/%{_sysconfdir}/ssl \
 	$RPM_BUILD_ROOT/%{_bindir} \
 	$RPM_BUILD_ROOT/%{_includedir}/openssl \
 	$RPM_BUILD_ROOT/usr/lib \
-	$RPM_BUILD_ROOT/usr/lib/pkgconfig
+	$RPM_BUILD_ROOT/usr/lib/pkgconfig \
+	$RPM_BUILD_ROOT/%{_libdir}
 
 make INSTALL_PREFIX=$RPM_BUILD_ROOT install
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/ssl/misc/* $RPM_BUILD_ROOT/%{_bindir}
@@ -153,7 +153,7 @@
 install -m 644 libssl.a $RPM_BUILD_ROOT/%{_libdir}
 
 if [ "/usr/lib" != "%{_libdir}" ]; then
-	%{__mv} %{buildroot}/usr/lib/* %{buildroot}/usr/%{_lib}
+	%{__mv} %{buildroot}/usr/lib/* %{buildroot}/%{_libdir}
 	rmdir %{buildroot}/usr/lib/
 fi
 
@@ -254,6 +254,9 @@
 
 
 %changelog
+* Mon Nov  1 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- multilib fixes
+
 * Mon Sep  6 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.9.7d-1jh
 - major spec cleanup
 - new upstream


From svn at tinysofa.org  Wed Nov  3 20:21:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  3 Nov 2004 15:21:18 -0500 (EST)
Subject: [tinysofa-svn] r5062 - tinysofa/misc/comps/releases/1.1
Message-ID: <20041103202118.68AF234417D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-03 15:21:17 -0500 (Wed, 03 Nov 2004)
New Revision: 5062

Modified:
   tinysofa/misc/comps/releases/1.1/comps
Log:
- remove mkbootdisk from local utilities
- change linux-headers to linux-libc-headers


Modified: tinysofa/misc/comps/releases/1.1/comps
===================================================================
--- tinysofa/misc/comps/releases/1.1/comps	2004-11-03 19:35:57 UTC (rev 5061)
+++ tinysofa/misc/comps/releases/1.1/comps	2004-11-03 20:21:17 UTC (rev 5062)
@@ -144,7 +144,6 @@
 	vim-tools
 	zip
 	unzip
-        mkbootdisk
         syslinux
         dosfstools
 }
@@ -341,7 +340,7 @@
 	glibc-devel
 	glibc-headers
 	libtool
-	linux-headers
+	linux-libc-headers
 	m4
 	make
 	nasm


Property changes on: tinysofa/misc/comps/releases/1.1/comps
___________________________________________________________________
Name: svn:executable
   - *


From svn at tinysofa.org  Fri Nov  5 12:34:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  5 Nov 2004 07:34:18 -0500 (EST)
Subject: [tinysofa-svn] 
	r5064 - in tinysofa/releases/1.1/shadow-utils/current: sources specs
Message-ID: <20041105123418.68709344185@minbar.tinysofa.org>

Author: jh
Date: 2004-11-05 07:34:16 -0500 (Fri, 05 Nov 2004)
New Revision: 5064

Added:
   tinysofa/releases/1.1/shadow-utils/current/sources/036_CAN-2004-1001_passwd_check.diff
Modified:
   tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec
Log:
- add 036_CAN-2004-1001_passwd_check.diff to fix security problem
- (Bug ID: #19)


Added: tinysofa/releases/1.1/shadow-utils/current/sources/036_CAN-2004-1001_passwd_check.diff
===================================================================
--- tinysofa/releases/1.1/shadow-utils/current/sources/036_CAN-2004-1001_passwd_check.diff	2004-11-05 09:08:39 UTC (rev 5063)
+++ tinysofa/releases/1.1/shadow-utils/current/sources/036_CAN-2004-1001_passwd_check.diff	2004-11-05 12:34:16 UTC (rev 5064)
@@ -0,0 +1,13 @@
+diff -u -p -Nr --exclude CVS shadow-20000902.orig/libmisc/pwdcheck.c shadow-20000902/libmisc/pwdcheck.c
+--- shadow-20000902.orig/libmisc/pwdcheck.c	1999-07-09 18:11:35.000000000 +0200
++++ shadow-20000902/libmisc/pwdcheck.c	2004-11-02 18:39:47.000000000 +0100
+@@ -40,7 +40,8 @@ bailout:
+ 	retcode = pam_acct_mgmt(pamh, 0);
+ 	if (retcode == PAM_NEW_AUTHTOK_REQD) {
+ 		retcode = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
+-	} else if (retcode)
++	}
++	if (retcode)
+ 		goto bailout;
+ 
+ 	if (pam_setcred(pamh, 0))

Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec
===================================================================
--- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec	2004-11-05 09:08:39 UTC (rev 5063)
+++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec	2004-11-05 12:34:16 UTC (rev 5064)
@@ -1,251 +1,9 @@
-%define utf8_man_pages 1
 
-Summary: Utilities for managing accounts and shadow password files.
-Name: shadow-utils
-Version: 4.0.3
-Release: 26ts
-URL: http://shadow.pld.org.pl/
-Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
-Source1: shadow-4.0.3.login.defs
-Source2: shadow-970616.useradd
-Source3: adduser.8
-Source4: pwunconv.8
-Source5: grpconv.8
-Source6: grpunconv.8
-Patch0: shadow-4.0.3-redhat.patch
-Patch1: shadow-4.0.3-noinst.patch
-Patch2: shadow-4.0.3-nscd.patch
-Patch3: shadow-19990827-group.patch
-Patch4: shadow-4.0.3-vipw.patch
-Patch5: shadow-4.0.3-mailspool.patch
-Patch6: shadow-20000902-usg.patch
-Patch7: shadow-4.0.3-shadow-man.patch
-Patch8: shadow-utils-selinux.patch
-Patch9: shadow-4.0.3-lastlog-size.patch
-Patch10: shadow-4.0.3-largefile.patch
-Patch11: shadow-4.0.3-fixref.patch
-Patch12: shadow-4.0.3-uninitialized.patch
-License: BSD
-Group: main
-BuildPrereq: autoconf, automake, libtool
-BuildRequires: gettext-devel libstdc++-devel gcc-c++
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Obsoletes: adduser
-
-%description
-The shadow-utils package includes the necessary programs for
-converting UNIX password files to the shadow password format, plus
-programs for managing user and group accounts. The pwconv command
-converts passwords to the shadow password format. The pwunconv command
-unconverts shadow passwords and generates an npasswd file (a standard
-UNIX password file). The pwck command checks the integrity of password
-and shadow files. The lastlog command prints out the last login times
-for all users. The useradd, userdel, and usermod commands are used for
-managing user accounts. The groupadd, groupdel, and groupmod commands
-are used for managing group accounts.
-
-%prep
-%setup -q -n shadow-%{version}
-%patch0 -p1 -b .redhat
-%patch1 -p1 -b .noinst
-%patch2 -p1 -b .nscd
-%patch3 -p1 -b .group
-%patch4 -p1 -b .vipw
-%patch5 -p1 -b .mailspool
-%patch6 -p1 -b .usg
-%patch7 -p1 -b .shadow-man
-%if %{with_selinux}
-#SELinux
-%patch8 -p1 -b .selinux
-%endif
-%patch9 -p1 -b .lastlog-size
-%patch10 -p1 -b .largefile
-%patch11 -p1 -b .fixref
-%patch12 -p1 -b .uninitialized
-rm po/*.gmo
-
-# Recode man pages from euc-jp to UTF-8.
-manconv() {
-flags="$-"
-set +x
-incode=$1
-outcode=$2
-shift 2
-for page in $* ; do
-	if ! iconv -f ${outcode} -t ${outcode} ${page} > /dev/null 2> /dev/null ; then
-		if iconv -f ${incode} -t ${outcode} ${page} > /dev/null 2> /dev/null ; then
-			iconv -f ${incode} -t ${outcode} ${page} > ${page}.tmp && \
-			cat ${page}.tmp > ${page} && \
-			rm ${page}.tmp
-		fi
-	fi
-done
-set -"$flags"
-}
-%if %{utf8_man_pages}
-manconv euc-jp utf-8 man/ja/*.*
-%endif
-
-aclocal
-automake -a
-autoconf
-
-%build
-%configure \
-	--disable-desrpc \
-	--enable-shadowgrp \
-	--without-libcrack \
-	--with-libcrypt \
-	--without-libpam \
-	--disable-shared
-%make 
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT gnulocaledir=$RPM_BUILD_ROOT/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs
-install -d -m 755 $RPM_BUILD_ROOT/etc/default
-install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/login.defs
-install -c -m 0600 %{SOURCE2} $RPM_BUILD_ROOT/etc/default/useradd
-
-ln -s useradd $RPM_BUILD_ROOT%{_sbindir}/adduser
-install -m644 $RPM_SOURCE_DIR/adduser.8   $RPM_BUILD_ROOT%{_mandir}/man8/
-install -m644 $RPM_SOURCE_DIR/pwunconv.8  $RPM_BUILD_ROOT%{_mandir}/man8/
-install -m644 $RPM_SOURCE_DIR/grpconv.8   $RPM_BUILD_ROOT%{_mandir}/man8/
-install -m644 $RPM_SOURCE_DIR/grpunconv.8 $RPM_BUILD_ROOT%{_mandir}/man8/
-
-# Convert man pages from references to hard links, so that if a referred-to
-# page is removed, we don't break things.  Not a good idea for the general
-# case, because when the policy script compresses them, we probably lose.
-linkman() {
-	flags="$-"
-	#set +x
-	for manpage in $1/man*/* ; do
-		pushd $1 > /dev/null
-		if grep -q '^\.so' $manpage && \
-		   test `grep -v '^\.so' $manpage | wc -l` -eq 0 ; then
-			target=`awk '/^\.so/ { print $NF }' $manpage`
-			if test -n "$target" ; then
-				rm "$manpage"
-				ln -v "$target" "$manpage"
-			fi
-		fi
-		popd > /dev/null
-	done
-	set -"$flags"
-}
-for subdir in $RPM_BUILD_ROOT/%{_mandir}/{??,??_??,??_??.*} ; do
-	test -d $subdir && linkman $subdir
-done
-
-# Remove binaries we don't use.
-rm $RPM_BUILD_ROOT/%{_bindir}/chfn
-rm $RPM_BUILD_ROOT/%{_bindir}/chsh
-rm $RPM_BUILD_ROOT/%{_bindir}/expiry
-rm $RPM_BUILD_ROOT/%{_bindir}/groups
-rm $RPM_BUILD_ROOT/%{_bindir}/login
-rm $RPM_BUILD_ROOT/%{_bindir}/newgrp
-rm $RPM_BUILD_ROOT/%{_bindir}/passwd
-rm $RPM_BUILD_ROOT/%{_bindir}/su
-rm $RPM_BUILD_ROOT/%{_sbindir}/dpasswd
-rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd
-rm $RPM_BUILD_ROOT/%{_sbindir}/mkpasswd
-rm $RPM_BUILD_ROOT/%{_sbindir}/vipw
-
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/chfn.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/chfn.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/chsh.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/chsh.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/expiry.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/expiry.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/groups.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/login.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/login.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/newgrp.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/newgrp.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/su.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/su.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man3/getspnam.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/d_passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/limits.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/limits.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/login.access.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/login.access.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/login.defs.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/login.defs.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/porttime.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/porttime.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/suauth.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/suauth.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/logoutd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/logoutd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/mkpasswd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/mkpasswd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/vipw.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vipw.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/vigr.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vigr.*
-
-%find_lang shadow
-
-%clean
-%clean_buildroot
-
-%files -f shadow.lang
-%defattr(-,root,root)
-%doc NEWS doc/ANNOUNCE doc/HOWTO doc/LICENSE README doc/README.linux
-%dir /etc/default
-%attr(0644,root,root)	%config /etc/login.defs
-%attr(0600,root,root)	%config /etc/default/useradd
-%{_bindir}/sg
-%{_bindir}/chage
-%{_bindir}/faillog
-%{_bindir}/gpasswd
-%{_bindir}/lastlog
-%{_sbindir}/adduser
-%{_sbindir}/user*
-%{_sbindir}/group*
-%{_sbindir}/grpck
-%{_sbindir}/pwck
-%{_sbindir}/*conv
-%{_sbindir}/chpasswd
-%{_sbindir}/newusers
-#%{_sbindir}/mkpasswd
-%{_mandir}/man1/chage.1*
-%{_mandir}/*/man1/chage.1*
-%{_mandir}/man1/gpasswd.1*
-%{_mandir}/*/man1/gpasswd.1*
-%{_mandir}/man1/sg.1*
-%{_mandir}/*/man1/sg.1*
-%{_mandir}/man3/shadow.3*
-%{_mandir}/man5/shadow.5*
-%{_mandir}/*/man5/shadow.5*
-%{_mandir}/man5/faillog.5*
-%{_mandir}/*/man5/faillog.5*
-%{_mandir}/man8/adduser.8*
-%{_mandir}/*/man8/adduser.8*
-%{_mandir}/man8/group*.8*
-%{_mandir}/*/man8/group*.8*
-%{_mandir}/man8/user*.8*
-%{_mandir}/*/man8/user*.8*
-%{_mandir}/man8/pwck.8*
-%{_mandir}/*/man8/pwck.8*
-%{_mandir}/man8/grpck.8*
-%{_mandir}/*/man8/grpck.8*
-%{_mandir}/man8/chpasswd.8*
-%{_mandir}/*/man8/chpasswd.8*
-%{_mandir}/man8/newusers.8*
-%{_mandir}/*/man8/newusers.8*
-%{_mandir}/man8/*conv.8*
-%{_mandir}/*/man8/*conv.8*
-%{_mandir}/man8/lastlog.8*
-%{_mandir}/*/man8/lastlog.8*
-%{_mandir}/man8/faillog.8*
-%{_mandir}/*/man8/faillog.8*
-
 %changelog
+* Fri Nov  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.3-27jh
+- add 036_CAN-2004-1001_passwd_check.diff to fix security problem
+- (Bug ID: #19)
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 4.0.3-26ts
 - current (4.0.3-26jh) integrated as 4.0.3-26ts for release 1.1
 


From svn at tinysofa.org  Fri Nov  5 20:58:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  5 Nov 2004 15:58:49 -0500 (EST)
Subject: [tinysofa-svn] 
	r5065 - tinysofa/releases/1.1/shadow-utils/current/specs
Message-ID: <20041105205849.A225C34412D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-05 15:58:48 -0500 (Fri, 05 Nov 2004)
New Revision: 5065

Removed:
   tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec
Log:
- oops


Deleted: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec
===================================================================
--- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec	2004-11-05 12:34:16 UTC (rev 5064)
+++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec	2004-11-05 20:58:48 UTC (rev 5065)
@@ -1,302 +0,0 @@
-
-%changelog
-* Fri Nov  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.3-27jh
-- add 036_CAN-2004-1001_passwd_check.diff to fix security problem
-- (Bug ID: #19)
-
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 4.0.3-26ts
-- current (4.0.3-26jh) integrated as 4.0.3-26ts for release 1.1
-
-* Wed Jul 28 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.3-26jh
-- change default from /home/users to /home
-
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.0.3-24ts
-- current (4.0.3-23ts) integrated as 4.0.3-24ts for release 1.0-U1
-
-* Wed May 12 2004 Omar Kilani <omar at tinysofa dot org>
-- Add BuildRequires gettext, gcc-c++-devel.
-
-* Tue Apr 12 2004 Omar Kilani <omar at tinysofa dot org> 4.0.3-23ts
-- Fix SOURCE1 so that it uses the tinysofa login.defs instead of the RH one.
-- Oops. This broke things... and I'm wondering how no one noticed it.
-
-* Wed Apr 07 2004 Omar Kilani <omar at tinysofa dot org> 4.0.3-22ts
-- I'll take this over the Trustix one, thanks.
-
-* Tue Mar 30 2004 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-21
-- rebuild
-
-* Tue Mar 30 2004 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-20
-- make /etc/default world-readable, needed for #118338
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Wed Jan 21 2004 Dan Walsh <dwalsh at redhat.com> 4.0.3-18
-- Fix selinux relabel of /etc/passwd file
-
-* Wed Jan  7 2004 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-17
-- fix use of uninitialized memory in useradd (#89145)
-
-* Tue Dec 16 2003 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-16
-- back to UTF-8 again
-- remove getspnam(3) man page, now conflicts with man-pages 1.64
-
-* Thu Nov 13 2003 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-15
-- don't convert man pages to UTF-8 for RHEL 3, conditionalized using macro
-- fixup dangling man page references
-
-* Mon Nov 10 2003 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-14
-- lastlog: don't pass a possibly-smaller field to localtime (#109648)
-- configure: call AC_SYS_LARGEFILE to get large file support
-
-* Fri Nov 7 2003 Dan Walsh <dwalsh at redhat.com> 4.0.3-13.sel
-- turn on SELinux support
-
-* Wed Oct 22 2003 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-12
-- convert ja man pages to UTF-8 (#106051)
-- override MKINSTALLDIRS at install-time (#107476)
-
-* Mon Sep 8 2003 Dan Walsh <dwalsh at redhat.com>
-- turn off SELinux support
-
-* Thu Sep 4 2003 Dan Walsh <dwalsh at redhat.com> 4.0.3-11.sel
-- build with SELinux support
-
-* Fri Jul 28 2003 Dan Walsh <dwalsh at redhat.com> 4.0.3-10
-- Add SELinux support
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Wed Jun  4 2003 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-8
-- rebuild
-
-* Tue Jun  3 2003 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-7
-- run autoconf to generate updated configure at compile-time
-
-* Wed Feb 12 2003 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-6
-- adjust mailspool patch to complain if no group named "mail" exists, even
-  though that should never happen
-
-* Tue Feb 11 2003 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-5
-- fix perms on mailspools created by useradd to be owned by the "mail"
-  group (#59810)
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Mon Dec  9 2002 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-3
-- install the shadow.3 man page
-
-* Mon Nov 25 2002 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-2
-- disable use of cracklib at build-time
-- fixup reserved-account changes for useradd
-
-* Thu Nov 21 2002 Nalin Dahyabhai <nalin at redhat.com> 4.0.3-1
-- update to 4.0.3, bumping epoch
-
-* Mon Nov 18 2002 Nalin Dahyabhai <nalin at redhat.com> 20000902-14
-- remove man pages which conflict with the man-pages package(s)
-
-* Fri Nov 15 2002 Nalin Dahyabhai <nalin at redhat.com> 20000902-13
-- prevent libshadow from being built more than once, to keep automake happy
-- change how md5 and md5crypt are enabled, to keep autoconf happy
-- remove unpackaged files after %%install
-
-* Thu Aug 29 2002 Nalin Dahyabhai <nalin at redhat.com> 20000902-12
-- force .mo files to be regenerated with current gettext to flush out possible
-  problems
-- fixup non-portable encodings in translations
-- make sv translation header non-fuzzy so that it will be included (#71281)
-
-* Fri Aug 23 2002 Nalin Dahyabhai <nalin at redhat.com> 20000902-11
-- don't apply aging parameters when creating system accounts (#67408)
-
-* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Sun May 26 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Fri May 17 2002 Nalin Dahyabhai <nalin at redhat.com> 20000902-8
-- rebuild in new environment
-
-* Wed Mar 27 2002 Nalin Dahyabhai <nalin at redhat.com> 20000902-7
-- rebuild with proper defines to get support for large lastlog files (#61983)
-
-* Fri Feb 22 2002 Nalin Dahyabhai <nalin at redhat.com> 20000902-6
-- rebuild
-
-* Fri Jan 25 2002 Nalin Dahyabhai <nalin at redhat.com> 20000902-5
-- fix autoheader breakage and random other things autotools complain about
-
-* Mon Aug 27 2001 Nalin Dahyabhai <nalin at redhat.com> 20000902-4
-- use -O0 instead of -O on ia64
-- build in source directory
-- don't leave lock files on the filesystem when useradd creates a group for
-  the user (#50269)
-- fix the -o option to check for duplicate UIDs instead of login names (#52187)
-
-* Thu Jul 26 2001 Bill Nottingham <notting at redhat.com> 20000902-3
-- build with -O on ia64
-
-* Fri Jun 08 2001 Than Ngo <than at redhat.com> 20000902-2
-- fixup broken specfile
-
-* Tue May 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20000902-1
-- Create an empty mailspool when creating a user so non-setuid/non-setgid
-  MDAs (postfix+procmail) can deliver mail (#41811)
-- 20000902
-- adapt patches
-
-* Fri Mar  9 2001 Nalin Dahyabhai <nalin at redhat.com>
-- don't overwrite user dot files in useradd (#19982)
-- truncate new files when moving overwriting files with the contents of other
-  files while moving directories (keeps files from looking weird later on)
-- configure using %%{_prefix} as the prefix
-
-* Fri Feb 23 2001 Trond Eivind Glomsrxd <teg at redhat.com>
-- langify
-
-* Wed Aug 30 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix up chage behavior (Bug #15883)
-
-* Wed Aug 30 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 20000826
-- Fix up useradd man page (Bug #17036)
-
-* Tue Aug  8 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- check for vipw lock before adding or deleting users (Bug #6489)
-
-* Mon Aug  7 2000 Nalin Dahyabhai <nalin at redhat.com>
-- take LOG_CONS out of the openlog() call so that we don't litter the
-  screen during text-mode upgrades
-
-* Tue Jul 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Remove a fixed-size buffer that caused problems when adding a huge number
-  of users to a group (>8192 bytes) (Bugs #3809, #11930)
-
-* Tue Jul 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- remove dependency on util-linux because it causes prereq loops
-
-* Tue Jul 18 2000 Nalin Dahyabhai <nalin at redhat.com>
-- change symlinked man pages to includers
-- require /usr/bin/newgrp (util-linux) so that /usr/bin/sg isn't left dangling
-
-* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
-- automatic rebuild
-
-* Sun Jun 18 2000 Matt Wilson <msw at redhat.com>
-- use mandir for FHS
-- added patches in src/ and po/ to honor DESTDIR
-- use make install DESTDIR=$RPM_BUILD_ROOT
-
-* Wed Feb 16 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix up usermod's symlink behavior (Bug #5458)
-
-* Fri Feb 11 2000 Cristian Gafton <gafton at redhat.com>
-- get rid of mkpasswd
-
-* Mon Feb  7 2000 Nalin Dahyabhai <nalin at redhat.com>
-- fix usermod patch to check for shadow before doing any shadow-specific stuff
-  and merge it into the pwlock patch
-
-* Sat Feb  5 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- fix man symlinks
-
-* Wed Feb  2 2000 Nalin Dahyabhai <gafton at redhat.com>
-- make -p only change shadow password (bug #8923)
-
-* Mon Jan 31 2000 Cristian Gafton <gafton at redhat.com>
-- rebuild to fix dependeencies
-- man pages are compressed
-
-* Wed Jan 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix a security bug (adduser could overwrite previously existing
-  groups, Bug #8609)
-
-* Sun Jan  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- unset LINGUAS before building
-- Fix typo in newusers manpage (Bug #8258)
-- libtoolize
-
-* Wed Sep 22 1999 Cristian Gafton <gafton at redhat.com>
-- fix segfault for userdel when the primary group for the user is not
-  defined
-
-* Tue Sep 21 1999 Cristian Gafton <gafton at redhat.com>
-- Serial: 1 because now we are using 19990827 (why the heck can't they have
-  a normal version just like everybody else?!)
-- ported all patches to the new code base
-
-* Thu Apr 15 1999 Bill Nottingham <notting at redhat.com>
-- SIGHUP nscd from usermod, too
-
-* Fri Apr 09 1999 Michael K. Johnson <johnsonm at redhat.com>
-- added usermod password locking from Chris Adams <cadams at ro.com>
-
-* Thu Apr 08 1999 Bill Nottingham <notting at redhat.com>
-- have things that modify users/groups SIGHUP nscd on exit
-
-* Wed Mar 31 1999 Michael K. Johnson <johnsonm at redhat.com>
-- have userdel remove user private groups when it is safe to do so
-- allow -f to force user removal even when user appears busy in utmp
-
-* Tue Mar 23 1999 Preston Brown <pbrown at redhat.com>
-- edit out unused CHFN fields from login.defs.
-
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 7)
-
-* Wed Jan 13 1999 Bill Nottingham <notting at redhat.com>
-- configure fix for arm
-
-* Wed Dec 30 1998 Cristian Gafton <gafton at redhat.com>
-- build against glibc 2.1
-
-* Fri Aug 21 1998 Jeff Johnson <jbj at redhat.com>
-- Note that /usr/sbin/mkpasswd conflicts with /usr/bin/mkpasswd;
-  one of these (I think /usr/sbin/mkpasswd but other opinions are valid)
-  should probably be renamed.  In any case, mkpasswd.8 from this package
-  needs to be installed. (problem #823)
-
-* Fri May 08 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
-
-* Tue Apr 21 1998 Cristian Gafton <gafton at redhat.com>
-- updated to 980403
-- redid the patches
-
-* Tue Dec 30 1997 Cristian Gafton <gafton at redhat.com>
-- updated the spec file
-- updated the patch so that new accounts created on shadowed system won't
-  confuse pam_pwdb anymore ('!!' default password instead on '!')
-- fixed a bug that made useradd -G segfault
-- the check for the ut_user is now patched into configure
-
-* Thu Nov 13 1997 Erik Troan <ewt at redhat.com>
-- added patch for XOPEN oddities in glibc headers
-- check for ut_user before checking for ut_name -- this works around some
-  confusion on glibc 2.1 due to the utmpx header not defining the ut_name
-  compatibility stuff. I used a gross sed hack here because I couldn't make
-  automake work properly on the sparc (this could be a glibc 2.0.99 problem
-  though). The utuser patch works fine, but I don't apply it.
-- sleep after running autoconf
-
-* Thu Nov 06 1997 Cristian Gafton <gafton at redhat.com>
-- added forgot lastlog command to the spec file
-
-* Mon Oct 26 1997 Cristian Gafton <gafton at redhat.com>
-- obsoletes adduser
-
-* Thu Oct 23 1997 Cristian Gafton <gafton at redhat.com>
-- modified groupadd; updated the patch
-
-* Fri Sep 12 1997 Cristian Gafton <gafton at redhat.com>
-- updated to 970616
-- changed useradd to meet RH specs
-- fixed some bugs
-
-* Tue Jun 17 1997 Erik Troan <ewt at redhat.com>
-- built against glibc


From svn at tinysofa.org  Fri Nov  5 20:59:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  5 Nov 2004 15:59:47 -0500 (EST)
Subject: [tinysofa-svn] 
	r5066 - tinysofa/releases/1.1/shadow-utils/current/specs
Message-ID: <20041105205947.6951034412D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-05 15:59:46 -0500 (Fri, 05 Nov 2004)
New Revision: 5066

Added:
   tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec
Log:
- oops2


Copied: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec (from rev 4100, tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec)


From svn at tinysofa.org  Fri Nov  5 21:01:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  5 Nov 2004 16:01:52 -0500 (EST)
Subject: [tinysofa-svn] 
	r5067 - tinysofa/releases/1.1/shadow-utils/current/specs
Message-ID: <20041105210152.8361134412D@minbar.tinysofa.org>

Author: jh
Date: 2004-11-05 16:01:51 -0500 (Fri, 05 Nov 2004)
New Revision: 5067

Modified:
   tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec
Log:
- oops3


Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec
===================================================================
--- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec	2004-11-05 20:59:46 UTC (rev 5066)
+++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec	2004-11-05 21:01:51 UTC (rev 5067)
@@ -25,6 +25,7 @@
 Patch10: shadow-4.0.3-largefile.patch
 Patch11: shadow-4.0.3-fixref.patch
 Patch12: shadow-4.0.3-uninitialized.patch
+Patch13: 036_CAN-2004-1001_passwd_check.diff
 License: BSD
 Group: main
 BuildPrereq: autoconf, automake, libtool
@@ -62,6 +63,7 @@
 %patch10 -p1 -b .largefile
 %patch11 -p1 -b .fixref
 %patch12 -p1 -b .uninitialized
+%patch13 -p1
 rm po/*.gmo
 
 # Recode man pages from euc-jp to UTF-8.
@@ -246,6 +248,10 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Fri Nov  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.3-27jh
+- add 036_CAN-2004-1001_passwd_check.diff to fix security problem
+- (Bug ID: #19)
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 4.0.3-26ts
 - current (4.0.3-26jh) integrated as 4.0.3-26ts for release 1.1
 


From svn at tinysofa.org  Mon Nov  8 07:40:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  8 Nov 2004 02:40:07 -0500 (EST)
Subject: [tinysofa-svn] r5068 - in contrib/1.1/dtach/current: sources specs
Message-ID: <20041108074007.72E88344260@minbar.tinysofa.org>

Author: jh
Date: 2004-11-08 02:40:06 -0500 (Mon, 08 Nov 2004)
New Revision: 5068

Added:
   contrib/1.1/dtach/current/sources/dtach-0.7.tar.gz
Removed:
   contrib/1.1/dtach/current/sources/dtach-0.5.tar.gz
Modified:
   contrib/1.1/dtach/current/specs/dtach.spec
Log:
- update to 0.7


Deleted: contrib/1.1/dtach/current/sources/dtach-0.5.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/dtach/current/sources/dtach-0.7.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/dtach/current/sources/dtach-0.7.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/dtach/current/specs/dtach.spec
===================================================================
--- contrib/1.1/dtach/current/specs/dtach.spec	2004-11-05 21:01:51 UTC (rev 5067)
+++ contrib/1.1/dtach/current/specs/dtach.spec	2004-11-08 07:40:06 UTC (rev 5068)
@@ -1,12 +1,12 @@
 Summary:	A simple program that emulates the detach feature of screen.
 Name:		dtach
-Version:	0.5
+Version:	0.7
 Release: 1jh
 License:	GPL
 URL:		http://dtach.sourceforge.net/
 Group: contrib
 Source:		http://prdownloads.sourceforge.net/dtach/dtach-%{version}.tar.gz
-Buildroot:	%{_tmppath}/%{name}-root
+Buildroot:	%{_tmppath}/%{name}-%{version}-root
 
  
 %description
@@ -27,8 +27,6 @@
  
 
 %install
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && %{__rm} -rf -- "%{buildroot}"
-
 %{__mkdir_p} %{buildroot}%{_bindir}
 %{__mkdir_p} %{buildroot}%{_mandir}/man1
 %{__install} -m 755 dtach %{buildroot}%{_bindir}/dtach
@@ -36,7 +34,7 @@
 
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && %{__rm} -rf -- "%{buildroot}"
+%clean_buildroot
 
 
 %files


From svn at tinysofa.org  Mon Nov  8 21:38:23 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  8 Nov 2004 16:38:23 -0500 (EST)
Subject: [tinysofa-svn] r5069 - tinysofa/releases/1.1/grub/current/specs
Message-ID: <20041108213823.0466C3441D8@minbar.tinysofa.org>

Author: jh
Date: 2004-11-08 16:38:22 -0500 (Mon, 08 Nov 2004)
New Revision: 5069

Modified:
   tinysofa/releases/1.1/grub/current/specs/grub.spec
Log:
- exclude info documents
- build statically on x86_64


Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec
===================================================================
--- tinysofa/releases/1.1/grub/current/specs/grub.spec	2004-11-08 07:40:06 UTC (rev 5068)
+++ tinysofa/releases/1.1/grub/current/specs/grub.spec	2004-11-08 21:38:22 UTC (rev 5069)
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.94
-Release: 3ts
+Release: 4jh
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: main
 License: GPL
@@ -57,7 +57,7 @@
 BuildRequires: autoconf automake libtool
 Requires: mktemp
 Requires: /usr/bin/cmp
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -65,6 +65,7 @@
 NetBSD, GNU Mach, and others as well as most commercial operating
 systems.
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .config
@@ -92,24 +93,27 @@
 
 %patch1000 -p1 -b .26geom
 
+
 %build
 autoreconf --install --force
 CFLAGS="-Os -g %{?no_stack_protector}" ; export CFLAGS
-%configure --sbindir=/sbin --disable-auto-linux-mem-opt
 %ifarch x86_64
-LDFLAGS="-Wl,-static" ; export LDFLAGS
+CFLAGS="$CFLAGS -static" ; export CFLAGS
 %endif
-make
+%configure --sbindir=/sbin --disable-auto-linux-mem-opt
+%make
 
+
 %install
-rm -fr $RPM_BUILD_ROOT
 %makeinstall sbindir=${RPM_BUILD_ROOT}/sbin
 mkdir -p ${RPM_BUILD_ROOT}/boot/grub
 install -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/boot/grub
 
+
 %clean
-rm -fr $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog NEWS README COPYING TODO docs/menu.lst
@@ -119,12 +123,17 @@
 /sbin/grub-terminfo
 /sbin/grub-md5-crypt
 %{_bindir}/mbchk
-%{_infodir}/grub*
-%{_infodir}/multiboot*
+%exclude %{_infodir}/grub*
+%exclude %{_infodir}/multiboot*
 %{_mandir}/man*/*
 %{_datadir}/grub
 
+
 %changelog
+* Mon Nov  8 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.94-4jh
+- exclude info documents
+- build statically on x86_64
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 0.94-3ts
 - current (0.94-3jh) integrated as 0.94-3ts for release 1.1
 


From svn at tinysofa.org  Tue Nov  9 11:36:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  9 Nov 2004 06:36:07 -0500 (EST)
Subject: [tinysofa-svn] 
	r5070 - in tinysofa/releases/1.1/initscripts/current: sources specs
Message-ID: <20041109113607.C41EC3441E8@minbar.tinysofa.org>

Author: jh
Date: 2004-11-09 06:36:06 -0500 (Tue, 09 Nov 2004)
New Revision: 5070

Added:
   tinysofa/releases/1.1/initscripts/current/sources/initscripts-7.31.9-dovecot.patch
Modified:
   tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec
Log:
- add dovecot patch
- apply patches nicely


Added: tinysofa/releases/1.1/initscripts/current/sources/initscripts-7.31.9-dovecot.patch
===================================================================
--- tinysofa/releases/1.1/initscripts/current/sources/initscripts-7.31.9-dovecot.patch	2004-11-08 21:38:22 UTC (rev 5069)
+++ tinysofa/releases/1.1/initscripts/current/sources/initscripts-7.31.9-dovecot.patch	2004-11-09 11:36:06 UTC (rev 5070)
@@ -0,0 +1,22 @@
+--- initscripts-7.31.9/rc.d/rc.sysinit	2004-11-09 13:21:10.045446584 +0200
++++ initscripts-7.93.2/rc.d/rc.sysinit	2004-10-17 07:51:00.000000000 +0300
+@@ -603,14 +799,17 @@
+ 	if [ -d "$afile" ]; then
+ 	   case "$afile" in
+ 		*/news|*/mon)	;;
+-		*/sudo|*/vmware)	rm -f $afile/*/* ;;
++		*/sudo)		rm -f $afile/*/* ;;
++		*/vmware)	rm -rf $afile/*/* ;;
++		*/samba)	rm -rf $afile/*/* ;;
++		*/dovecot)	rm -rf $afile/*/* ;;
+ 		*)		rm -f $afile/* ;;
+ 	   esac
+ 	else
+ 	   rm -f $afile
+ 	fi
+ done
+-rm -f /var/lib/rpm/__db*
++rm -f /var/lib/rpm/__db* &> /dev/null
+ 
+ # Reset pam_console permissions
+ [ -x /sbin/pam_console_apply ] && /sbin/pam_console_apply -r

Modified: tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec	2004-11-08 21:38:22 UTC (rev 5069)
+++ tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec	2004-11-09 11:36:06 UTC (rev 5070)
@@ -3,7 +3,7 @@
 Version: 7.31.9
 License: GPL
 Group: main
-Release: 8jh
+Release: 9jh
 Source: initscripts-%{version}.tar.bz2
 URL: http://rhlinux.redhat.com/initscripts/
 Patch0: initscripts-s390.patch
@@ -12,6 +12,7 @@
 Patch3: initscripts-7.31.9-network-scripts.patch
 Patch4: initscripts-7.31.9-tinysofa-kernel-2.6.patch
 Patch5: initscripts-7.31.9-alsa.patch
+Patch6: initscripts-7.31.9-dovecot.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: agetty, gawk, sed, mktemp, e2fsprogs >= 1.15
 Requires: procps, sysklogd >= 1.3.31
@@ -25,7 +26,7 @@
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2
 Obsoletes: rhsound sapinit
 Prereq: chkconfig, shadow-utils, gawk, coreutils, filesystem >= 1.0-5gd
-BuildPrereq: glib-devel > 2, popt gettext pkgconfig
+BuildPrereq: glib-devel > 2, popt gettext pkgconfig findutils
 
 %description
 The initscripts package contains the basic system scripts used to boot
@@ -37,15 +38,18 @@
 %prep
 %setup -q
 %ifarch s390 s390x
-%patch0 -p1 -b .s390init
+%patch0 -p1 -b .s390init~
 %endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch1 -p1 -b .tinysofa~
+%patch2 -p1 -b .no-po~
+%patch3 -p1 -b .network~
+%patch4 -p1 -b .kernel-2.6~
+%patch5 -p1 -b .alsa~
+%patch6 -p1 -b .dovecot~
 
+find . -name '*~'|xargs rm
 
+
 %build
 CFLAGS=$RPM_OPT_FLAGS make
 
@@ -53,8 +57,6 @@
 %install
 make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install 
 
-rm -f $RPM_BUILD_ROOT/etc/rc.sysinit{~,.orig}
-rm -f $RPM_BUILD_ROOT/etc/init.d/*~
 rm -f $RPM_BUILD_ROOT/sbin/genhostid
 rm -f $RPM_BUILD_ROOT/sbin/redhat-support-check
 
@@ -203,6 +205,10 @@
 
 
 %changelog
+* Tue Nov  9 2004 Jaakko Heinonen <jh at tinysofa dot org> 7.31-9jh
+- add dovecot patch
+- apply patches nicely
+
 * Fri Oct 22 2004 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-8jh
 - apply s390 patch only on s390 (fixes a problem with hwclock in local time)
 


From svn at tinysofa.org  Tue Nov  9 16:44:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  9 Nov 2004 11:44:38 -0500 (EST)
Subject: [tinysofa-svn] r5071 - tinysofa/releases/1.1/nss_ldap/current/specs
Message-ID: <20041109164438.055B53441E8@minbar.tinysofa.org>

Author: jh
Date: 2004-11-09 11:44:37 -0500 (Tue, 09 Nov 2004)
New Revision: 5071

Modified:
   tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec
Log:
- include /lib/libnss_ldap.so.2 link to the nss_ldap package

Modified: tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec	2004-11-09 11:36:06 UTC (rev 5070)
+++ tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec	2004-11-09 16:44:37 UTC (rev 5071)
@@ -4,7 +4,7 @@
 Summary: NSS library and PAM module for LDAP.
 Name: nss_ldap
 Version: %{nss_ldap_version}
-Release: 1jh
+Release: 2jh
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{nss_ldap_version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -188,7 +188,9 @@
 # Remove a doc file from /etc, we'll included it as a %%doc file.
 rm $RPM_BUILD_ROOT%{_sysconfdir}/nsswitch.ldap
 
+/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}
 
+
 %clean
 %clean_buildroot
 
@@ -201,6 +203,7 @@
 %files
 %defattr(644,root,root,755)
 %attr(0755,root,root) /%{_lib}/libnss_ldap-*.so
+/%{_lib}/libnss_ldap.so.*
 %attr(0755,root,root) %{_libdir}/*.so
 %doc nsswitch.ldap *.nss_ldap $RPM_SOURCE_DIR/README.TLS
 
@@ -216,6 +219,9 @@
 
 
 %changelog
+* Tue Nov  9 2004 Jaakko Heinonen <jh at tinysofa dot org> 226-2jh
+- include /lib/libnss_ldap.so.2 link to the nss_ldap package
+
 * Wed Oct 13 2004 Jaakko Heinonen <jh at tinysofa dot org> 226-1jh
 - update to nss_ldap version 226 and pam ldap version 176
 - db4 is no more needed


From svn at tinysofa.org  Wed Nov 10 05:21:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 10 Nov 2004 00:21:31 -0500 (EST)
Subject: [tinysofa-svn] r5072 - contrib/1.1/tinysofa-utils/current/specs
Message-ID: <20041110052131.87F5C3441D4@minbar.tinysofa.org>

Author: jh
Date: 2004-11-10 00:21:30 -0500 (Wed, 10 Nov 2004)
New Revision: 5072

Modified:
   contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec
Log:
- add tsrelease requirements

Modified: contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec
===================================================================
--- contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec	2004-11-09 16:44:37 UTC (rev 5071)
+++ contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec	2004-11-10 05:21:30 UTC (rev 5072)
@@ -1,6 +1,6 @@
 Name: tinysofa-utils
 Version: 2.0
-Release: 6jh
+Release: 7jh
 URL: http://www.tinysofa.org
 Summary: tinysofa utilities
 Source1: tsbuild
@@ -17,6 +17,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: coreutils
 Requires: rpm python
+# for tsrelease
+Requires: anaconda-runtime mkisofs gnupg rdfgen apt
 BuildArch: noarch
 
 %description


From svn at tinysofa.org  Wed Nov 10 12:02:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 10 Nov 2004 07:02:06 -0500 (EST)
Subject: [tinysofa-svn] 
	r5073 - in contrib/1.1/firefox/current: sources specs
Message-ID: <20041110120206.D58073440EA@minbar.tinysofa.org>

Author: jh
Date: 2004-11-10 07:02:05 -0500 (Wed, 10 Nov 2004)
New Revision: 5073

Added:
   contrib/1.1/firefox/current/sources/firefox-1.0-source.tar.bz2
Removed:
   contrib/1.1/firefox/current/sources/firefox-0.9.3-uri.patch
   contrib/1.1/firefox/current/sources/firefox-1.0PR-source.tar.bz2
   contrib/1.1/firefox/current/sources/firefox-PR1-alt-num-tab-switch.patch
   contrib/1.1/firefox/current/sources/firefox-PR1-clipboard-access.patch
   contrib/1.1/firefox/current/sources/firefox-PR1-js-64bit-math.patch
Modified:
   contrib/1.1/firefox/current/specs/firefox.spec
Log:
- update to 1.0 final
- enable freetype patch to compile on U2


Deleted: contrib/1.1/firefox/current/sources/firefox-0.9.3-uri.patch
===================================================================
--- contrib/1.1/firefox/current/sources/firefox-0.9.3-uri.patch	2004-11-10 05:21:30 UTC (rev 5072)
+++ contrib/1.1/firefox/current/sources/firefox-0.9.3-uri.patch	2004-11-10 12:02:05 UTC (rev 5073)
@@ -1,16 +0,0 @@
---- toolkit/mozapps/extensions/src/nsExtensionManager.js.in.orig	2004-08-08 03:49:04.689354992 +0200
-+++ toolkit/mozapps/extensions/src/nsExtensionManager.js.in	2004-08-08 03:50:24.266257464 +0200
-@@ -1587,9 +1587,13 @@
-   
-   _checkForGlobalInstalls: function (aPath, aItemType)
-   {
-+    var ioServ = Components.classes["@mozilla.org/network/io-service;1"]
-+                           .getService(Components.interfaces.nsIIOService);
-+    var uri = ioServ.newURI(aPath, null, null);
-     // First see if the path supplied is a file path
-     var file = Components.classes["@mozilla.org/file/local;1"]
-                          .createInstance(Components.interfaces.nsILocalFile);
-+    aPath = uri.path;
-     try {
-       file.initWithPath(aPath);
-     }

Added: contrib/1.1/firefox/current/sources/firefox-1.0-source.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/firefox/current/sources/firefox-1.0-source.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: contrib/1.1/firefox/current/sources/firefox-1.0PR-source.tar.bz2
===================================================================
(Binary files differ)

Deleted: contrib/1.1/firefox/current/sources/firefox-PR1-alt-num-tab-switch.patch
===================================================================
--- contrib/1.1/firefox/current/sources/firefox-PR1-alt-num-tab-switch.patch	2004-11-10 05:21:30 UTC (rev 5072)
+++ contrib/1.1/firefox/current/sources/firefox-PR1-alt-num-tab-switch.patch	2004-11-10 12:02:05 UTC (rev 5073)
@@ -1,50 +0,0 @@
-Index: browser/base/content/browser.js
-===================================================================
-RCS file: /cvsroot/mozilla/browser/base/content/browser.js,v
-retrieving revision 1.296.2.3.2.94
-diff -d -u -p -2 -0 -r1.296.2.3.2.94 browser.js
---- browser/base/content/browser.js	10 Sep 2004 22:57:37 -0000	1.296.2.3.2.94
-+++ browser/base/content/browser.js	1 Oct 2004 06:00:34 -0000
-@@ -1494,41 +1494,41 @@ URLBarAutoFillPrefListener.prototype =
-     if (prefValue)
-       gURLBar.setAttribute("completedefaultindex", "true");
-     else
-       gURLBar.removeAttribute("completedefaultindex");
-   }
- }
- 
- function ctrlNumberTabSelection(event)
- {  
-   if (event.altKey && event.keyCode == KeyEvent.DOM_VK_RETURN) {    
-     // XXXblake Proper fix is to just check whether focus is in the urlbar. However, focus with the autocomplete widget is all
-     // hacky and broken and there's no way to do that right now. So this just patches it to ensure that alt+enter works when focus
-     // is on a link.
-     if (!document.commandDispatcher.focusedElement || document.commandDispatcher.focusedElement.localName.toLowerCase() != "a") {
-       // Don't let winxp beep on ALT+ENTER, since the URL bar uses it.
-       event.preventDefault();
-       return;
-     }
-   }
- 
--#ifdef XP_MACOSX
-+#ifdef XP_UNIX
-   if (!event.metaKey)
- #else
-   if (!event.ctrlKey)
- #endif
-     return;
- 
-   var index = event.charCode - 49;
-   if (index < 0 || index > 8)
-     return;
- 
-   if (index >= gBrowser.tabContainer.childNodes.length)
-     return;
- 
-   var oldTab = gBrowser.selectedTab;
-   var newTab = gBrowser.tabContainer.childNodes[index];
-   if (newTab != oldTab) {
-     oldTab.selected = false;
-     gBrowser.selectedTab = newTab;
-   }
- 

Deleted: contrib/1.1/firefox/current/sources/firefox-PR1-clipboard-access.patch
===================================================================
--- contrib/1.1/firefox/current/sources/firefox-PR1-clipboard-access.patch	2004-11-10 05:21:30 UTC (rev 5072)
+++ contrib/1.1/firefox/current/sources/firefox-PR1-clipboard-access.patch	2004-11-10 12:02:05 UTC (rev 5073)
@@ -1,36 +0,0 @@
-Index: layout/html/forms/src/nsTextControlFrame.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/layout/html/forms/src/nsTextControlFrame.cpp,v
-retrieving revision 3.145.2.4.2.1
-diff -d -u -p -r3.145.2.4.2.1 nsTextControlFrame.cpp
---- layout/html/forms/src/nsTextControlFrame.cpp	10 Sep 2004 02:47:57 -0000	3.145.2.4.2.1
-+++ layout/html/forms/src/nsTextControlFrame.cpp	30 Sep 2004 12:37:58 -0000
-@@ -99,6 +99,7 @@
- #include "nsGUIEvent.h"
- #include "nsIDOMEventGroup.h"
- #include "nsIDOM3EventTarget.h"
-+#include "nsIDOMNSEvent.h"
- #include "nsIDOMNSUIEvent.h"
- #include "nsIEventStateManager.h"
- 
-@@ -390,12 +391,18 @@ static PRBool
- DOMEventToNativeKeyEvent(nsIDOMEvent      *aDOMEvent,
-                          nsNativeKeyEvent *aNativeEvent)
- {
--  nsCOMPtr<nsIDOMNSUIEvent> nsevent = do_QueryInterface(aDOMEvent);
-+  nsCOMPtr<nsIDOMNSUIEvent> uievent = do_QueryInterface(aDOMEvent);
-   PRBool defaultPrevented;
--  nsevent->GetPreventDefault(&defaultPrevented);
-+  uievent->GetPreventDefault(&defaultPrevented);
-   if (defaultPrevented)
-     return PR_FALSE;
- 
-+  nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(aDOMEvent);
-+  PRBool trusted = PR_FALSE;
-+  nsevent->GetIsTrusted(&trusted);
-+  if (!trusted)
-+    return PR_FALSE;
-+
-   nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aDOMEvent);
- 
-   keyEvent->GetCharCode(&aNativeEvent->charCode);

Deleted: contrib/1.1/firefox/current/sources/firefox-PR1-js-64bit-math.patch
===================================================================
--- contrib/1.1/firefox/current/sources/firefox-PR1-js-64bit-math.patch	2004-11-10 05:21:30 UTC (rev 5072)
+++ contrib/1.1/firefox/current/sources/firefox-PR1-js-64bit-math.patch	2004-11-10 12:02:05 UTC (rev 5073)
@@ -1,17 +0,0 @@
-Index: js/src/fdlibm/fdlibm.h
-===================================================================
-RCS file: /cvsroot/mozilla/js/src/fdlibm/fdlibm.h,v
-retrieving revision 1.13
-retrieving revision 1.13.18.1
-diff -d -u -p -r1.13 -r1.13.18.1
---- js/src/fdlibm/fdlibm.h	15 Nov 2003 00:11:05 -0000	1.13
-+++ js/src/fdlibm/fdlibm.h	23 Sep 2004 23:34:19 -0000	1.13.18.1
-@@ -61,7 +61,7 @@
- #define __LITTLE_ENDIAN
- #endif
- 
--#if defined(linux) && defined(__i386__)
-+#if defined(linux) && (defined(__i386__) || defined(__x86_64__))
- #define __LITTLE_ENDIAN
- #endif
- 

Modified: contrib/1.1/firefox/current/specs/firefox.spec
===================================================================
--- contrib/1.1/firefox/current/specs/firefox.spec	2004-11-10 05:21:30 UTC (rev 5072)
+++ contrib/1.1/firefox/current/specs/firefox.spec	2004-11-10 12:02:05 UTC (rev 5073)
@@ -9,29 +9,22 @@
 
 Summary: Mozilla Firefox web browser
 Name: firefox
-Version: 0.10.1
+Version: 1.0
 Release: 1jh
 License: MPL/LGPL
 Group: contrib
 URL: http://www.mozilla.org/projects/firefox/
 
-#Source: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-%{version}-source.tar.bz2
-Source: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-1.0PR-source.tar.bz2
+Source: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-%{version}-source.tar.bz2
 Source1: firefox-rebuild-databases.pl.in
 Source2: firefox.png
 Source3: bookmarks.html
 Source4: firefox.xpm
-Patch2: firefox-0.9.3-uri.patch
 Patch3: mozilla-default-plugin-less-annoying.patch
 Patch4: firefox-0.7.3-freetype-compile.patch
 Patch5: mozilla-1.7-psfonts.patch
 Patch6: firefox-0.10-gcc3-alpha.patch
-Patch7: firefox-PR1-js-64bit-math.patch
-Patch90: firefox-PR1-gtk-file-chooser-trunk.patch
-Patch91: firefox-PR1-gtk-file-chooser-updates.patch
 Patch101: firefox-PR1-pkgconfig.patch
-Patch102: firefox-PR1-clipboard-access.patch
-Patch103: firefox-PR1-alt-num-tab-switch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: xorg-x11-devel, zlib-devel, zip, unzip
@@ -52,18 +45,11 @@
 
 %prep
 %setup -q -n mozilla
-%patch2 -p0 -b .uri
 %patch3 -p1 -b .plugin
-# enable this for U2
-#%patch4 -p0 -b .freetype
+%patch4 -p0 -b .freetype
 %patch5 -p1 -b .psfonts
 %patch6 -p1 -b .gcc3-alpha
-%patch7 -p0 -b .64bit-math
-%patch90 -p0 -b .gtk-file-chooser-trunk
-%patch91 -p1 -b .gtk-file-chooser-updates
 %patch101 -p0 -b .pkgconfig
-%patch102 -p0 -b .clipboard-access
-%patch103 -p0 -b .alt-num-tab-switch
 
 %{__cat} <<'EOF' >.mozconfig
 . $topsrcdir/browser/config/mozconfig


From svn at tinysofa.org  Wed Nov 10 12:11:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 10 Nov 2004 07:11:49 -0500 (EST)
Subject: [tinysofa-svn] 
	r5074 - in tinysofa/releases/1.1/zip/current: sources specs
Message-ID: <20041110121149.8AD783440EA@minbar.tinysofa.org>

Author: jh
Date: 2004-11-10 07:11:49 -0500 (Wed, 10 Nov 2004)
New Revision: 5074

Added:
   tinysofa/releases/1.1/zip/current/sources/zip-2.3-longname.patch
Modified:
   tinysofa/releases/1.1/zip/current/specs/zip.spec
Log:
- add longname patch to fix buffer overflow (Bug ID: #25)


Added: tinysofa/releases/1.1/zip/current/sources/zip-2.3-longname.patch
===================================================================
--- tinysofa/releases/1.1/zip/current/sources/zip-2.3-longname.patch	2004-11-10 12:02:05 UTC (rev 5073)
+++ tinysofa/releases/1.1/zip/current/sources/zip-2.3-longname.patch	2004-11-10 12:11:49 UTC (rev 5074)
@@ -0,0 +1,13 @@
+diff -ur zip-2.3/unix/unix.c zip-2.3-lon/unix/unix.c
+--- zip-2.3/unix/unix.c	Mon Nov  8 10:27:17 2004
++++ zip-2.3-lon/unix/unix.c	Mon Nov  8 10:38:28 2004
+@@ -339,6 +339,9 @@
+   char name[FNMAX];
+   int len = strlen(f);
+ 
++  if (len >= sizeof(name))
++    error("File name too long");
++
+   if (f == label) {
+     if (a != NULL)
+       *a = label_mode;

Modified: tinysofa/releases/1.1/zip/current/specs/zip.spec
===================================================================
--- tinysofa/releases/1.1/zip/current/specs/zip.spec	2004-11-10 12:02:05 UTC (rev 5073)
+++ tinysofa/releases/1.1/zip/current/specs/zip.spec	2004-11-10 12:11:49 UTC (rev 5074)
@@ -1,7 +1,7 @@
 Summary: A file compression and packaging utility compatible with PKZIP.
 Name: zip
 Version: 2.3
-Release: 2ts
+Release: 3jh
 License: distributable
 Group: extra
 Source: ftp.uu.net:/pub/archiving/zip/src/zip23.tar.gz
@@ -12,6 +12,7 @@
 Patch2: zip23-umask.patch
 Patch3: zip-2.3-near-4GB.patch
 Patch4: zip-2.3-configure.patch
+Patch5: zip-2.3-longname.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
@@ -32,6 +33,7 @@
 %patch2 -p1 -b .umask
 %patch3 -p1 -b .4gb
 %patch4 -p1 -b .cfg
+%patch5 -p1 -b .longname
 
 
 %build
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Wed Nov 10 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.3-3jh
+- add longname patch to fix buffer overflow (Bug ID: #25)
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.3-2ts
 - current (2.3-2jh) integrated as 2.3-2ts for release 1.1
 


From svn at tinysofa.org  Wed Nov 10 12:26:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 10 Nov 2004 07:26:29 -0500 (EST)
Subject: [tinysofa-svn] 
	r5075 - in tinysofa/releases/1.1/samba/current: sources specs
Message-ID: <20041110122629.D67723440EA@minbar.tinysofa.org>

Author: jh
Date: 2004-11-10 07:26:29 -0500 (Wed, 10 Nov 2004)
New Revision: 5075

Added:
   tinysofa/releases/1.1/samba/current/sources/samba-3.0.7-CAN-2004-0930.patch
Modified:
   tinysofa/releases/1.1/samba/current/specs/samba.spec
Log:
- fix CAN-2004-0930 (Bug ID: #29)

Added: tinysofa/releases/1.1/samba/current/sources/samba-3.0.7-CAN-2004-0930.patch
===================================================================
--- tinysofa/releases/1.1/samba/current/sources/samba-3.0.7-CAN-2004-0930.patch	2004-11-10 12:11:49 UTC (rev 5074)
+++ tinysofa/releases/1.1/samba/current/sources/samba-3.0.7-CAN-2004-0930.patch	2004-11-10 12:26:29 UTC (rev 5075)
@@ -0,0 +1,386 @@
+Only in samba-3.0.7/source: build-samba
+Only in samba-3.0.7/source/include: build_env.h
+Only in samba-3.0.7/source/include: stamp-h
+diff -uBbr --exclude-from=../../../samba-cvs/diff.excludes samba-3.0.7-orig/source/lib/ms_fnmatch.c samba-3.0.7/source/lib/ms_fnmatch.c
+--- samba-3.0.7-orig/source/lib/ms_fnmatch.c	2004-04-04 01:37:34.000000000 -0600
++++ samba-3.0.7/source/lib/ms_fnmatch.c	2004-10-25 16:04:59.000000000 -0500
+@@ -1,7 +1,7 @@
+ /* 
+    Unix SMB/CIFS implementation.
+    filename matching routine
+-   Copyright (C) Andrew Tridgell 1992-1998 
++   Copyright (C) Andrew Tridgell 1992-2004
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -15,229 +15,197 @@
+    
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
++   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
++*/
+ 
+ /*
+    This module was originally based on fnmatch.c copyright by the Free
+-   Software Foundation. It bears little resemblence to that code now 
++   Software Foundation. It bears little (if any) resemblence to that
++   code now
+ */  
+ 
+ 
+-#if FNMATCH_TEST
+-#include <stdio.h>
+-#include <stdlib.h>
+-#else
+ #include "includes.h"
+-#endif
++
++static int null_match(const smb_ucs2_t *p)
++{
++	for (;*p;p++) {
++		if (*p != UCS2_CHAR('*') &&
++		    *p != UCS2_CHAR('<') &&
++		    *p != UCS2_CHAR('"') &&
++		    *p != UCS2_CHAR('>')) return -1;
++	}
++	return 0;
++}
++
++/*
++  the max_n structure is purely for efficiency, it doesn't contribute
++  to the matching algorithm except by ensuring that the algorithm does
++  not grow exponentially
++*/
++struct max_n {
++	const smb_ucs2_t *predot;
++	const smb_ucs2_t *postdot;
++};
++
+ 
+ /* 
+-   bugger. we need a separate wildcard routine for older versions
+-   of the protocol. This is not yet perfect, but its a lot
+-   better than what we had */
+-static int ms_fnmatch_lanman_core(const smb_ucs2_t *pattern, 
+-				  const smb_ucs2_t *string,
+-				  BOOL case_sensitive)
++  p and n are the pattern and string being matched. The max_n array is
++  an optimisation only. The ldot pointer is NULL if the string does
++  not contain a '.', otherwise it points at the last dot in 'n'.
++*/
++static int ms_fnmatch_core(const smb_ucs2_t *p, const smb_ucs2_t *n, 
++			   struct max_n *max_n, const smb_ucs2_t *ldot,
++			   BOOL is_case_sensitive)
+ {
+-	const smb_ucs2_t *p = pattern, *n = string;
+ 	smb_ucs2_t c;
+-
+-	if (strcmp_wa(p, "?")==0 && strcmp_wa(n, ".")) goto match;
++	int i;
+ 
+ 	while ((c = *p++)) {
+ 		switch (c) {
+-		case UCS2_CHAR('.'):
+-			if (! *n) goto next;
+-			if (*n != UCS2_CHAR('.')) goto nomatch;
+-			n++;
+-			break;
+-
+-		case UCS2_CHAR('?'):
+-			if (! *n) goto next;
+-			if ((*n == UCS2_CHAR('.') && 
+-			     n[1] != UCS2_CHAR('.')) || ! *n) 
+-				goto next;
+-			n++;
+-			break;
+-
+-		case UCS2_CHAR('>'):
+-			if (! *n) goto next;
+-			if (n[0] == UCS2_CHAR('.')) {
+-				if (! n[1] && ms_fnmatch_lanman_core(p, n+1, case_sensitive) == 0) goto match;
+-				if (ms_fnmatch_lanman_core(p, n, case_sensitive) == 0) goto match;
+-				goto nomatch;
+-			}
+-			n++;
+-			break;
+-
++			/* a '*' matches zero or more characters of any type */
+ 		case UCS2_CHAR('*'):
+-			if (! *n) goto next;
+-			if (! *p) goto match;
+-			for (; *n; n++) {
+-				if (ms_fnmatch_lanman_core(p, n, case_sensitive) == 0) goto match;
++			if (max_n->predot && max_n->predot <= n) {
++				return null_match(p);
+ 			}
+-			break;
+-
+-		case UCS2_CHAR('<'):
+-			for (; *n; n++) {
+-				if (ms_fnmatch_lanman_core(p, n, case_sensitive) == 0) goto match;
+-				if (*n == UCS2_CHAR('.') && 
+-				    !strchr_w(n+1,UCS2_CHAR('.'))) {
+-					n++;
+-					break;
++			for (i=0; n[i]; i++) {
++				if (ms_fnmatch_core(p, n+i, max_n+1, ldot, is_case_sensitive) == 0) {
++					return 0;
+ 				}
+ 			}
+-			break;
+-
+-		case UCS2_CHAR('"'):
+-			if (*n == 0 && ms_fnmatch_lanman_core(p, n, case_sensitive) == 0) goto match;
+-			if (*n != UCS2_CHAR('.')) goto nomatch;
+-			n++;
+-			break;
++			if (!max_n->predot || max_n->predot > n) max_n->predot = n;
++			return null_match(p);
+ 
+-		default:
+-			if (case_sensitive) {
+-				if (c != *n) goto nomatch;
+-			} else {
+-				if (tolower_w(c) != tolower_w(*n)) goto nomatch;
+-			}
+-			n++;
+-		}
++			/* a '<' matches zero or more characters of
++			   any type, but stops matching at the last
++			   '.' in the string. */
++		case UCS2_CHAR('<'):
++			if (max_n->predot && max_n->predot <= n) {
++				return null_match(p);
+ 	}
+-	
+-	if (! *n) goto match;
+-	
+- nomatch:
+-	/*
+-	if (verbose) printf("NOMATCH pattern=[%s] string=[%s]\n", pattern, string);
+-	*/
++			if (max_n->postdot && max_n->postdot <= n && n <= ldot) {
+ 	return -1;
+-
+-next:
+-	if (ms_fnmatch_lanman_core(p, n, case_sensitive) == 0) goto match;
+-        goto nomatch;
+-
+- match:
+-	/*
+-	if (verbose) printf("MATCH   pattern=[%s] string=[%s]\n", pattern, string);
+-	*/
+-	return 0;
+-}
+-
+-static int ms_fnmatch_lanman1(const smb_ucs2_t *pattern, 
+-			      const smb_ucs2_t *string, BOOL case_sensitive)
+-{
+-	if (!strpbrk_wa(pattern, "?*<>\"")) {
+-		smb_ucs2_t s[] = {UCS2_CHAR('.'), 0};
+-		if (strcmp_wa(string,"..") == 0) string = s;
+-		return strcasecmp_w(pattern, string);
+ 	}
+-
+-	if (strcmp_wa(string,"..") == 0 || strcmp_wa(string,".") == 0) {
+-		smb_ucs2_t dot[] = {UCS2_CHAR('.'), 0};
+-		smb_ucs2_t dotdot[] = {UCS2_CHAR('.'), UCS2_CHAR('.'), 0};
+-		return ms_fnmatch_lanman_core(pattern, dotdot, case_sensitive) &&
+-			ms_fnmatch_lanman_core(pattern, dot, case_sensitive);
++			for (i=0; n[i]; i++) {
++				if (ms_fnmatch_core(p, n+i, max_n+1, ldot, is_case_sensitive) == 0) return 0;
++				if (n+i == ldot) {
++					if (ms_fnmatch_core(p, n+i+1, max_n+1, ldot, is_case_sensitive) == 0) return 0;
++					if (!max_n->postdot || max_n->postdot > n) max_n->postdot = n;
++					return -1;
+ 	}
+-
+-	return ms_fnmatch_lanman_core(pattern, string, case_sensitive);
+-}
+-
+-
+-/* the following function was derived using the masktest utility -
+-   after years of effort we finally have a perfect MS wildcard
+-   matching routine! 
+-
+-   NOTE: this matches only filenames with no directory component
+-
+-   Returns 0 on match, -1 on fail.
+-*/
+-static int ms_fnmatch_w(const smb_ucs2_t *pattern, const smb_ucs2_t *string, 
+-			int protocol, BOOL case_sensitive)
+-{
+-	const smb_ucs2_t *p = pattern, *n = string;
+-	smb_ucs2_t c;
+-
+-	if (protocol <= PROTOCOL_LANMAN2) {
+-		return ms_fnmatch_lanman1(pattern, string, case_sensitive);
+ 	}
++			if (!max_n->predot || max_n->predot > n) max_n->predot = n;
++			return null_match(p);
+ 
+-	while ((c = *p++)) {
+-		switch (c) {
++			/* a '?' matches any single character */
+ 		case UCS2_CHAR('?'):
+-			if (! *n) return -1;
++			if (! *n) {
++				return -1;
++			}
+ 			n++;
+ 			break;
+ 
++			/* a '?' matches any single character */
+ 		case UCS2_CHAR('>'):
+ 			if (n[0] == UCS2_CHAR('.')) {
+-				if (! n[1] && ms_fnmatch_w(p, n+1, protocol, case_sensitive) == 0) return 0;
+-				if (ms_fnmatch_w(p, n, protocol, case_sensitive) == 0) return 0;
+-				return -1;
++				if (! n[1] && null_match(p) == 0) {
++					return 0;
+ 			}
+-			if (! *n) return ms_fnmatch_w(p, n, protocol, case_sensitive);
+-			n++;
+ 			break;
+-
+-		case UCS2_CHAR('*'):
+-			for (; *n; n++) {
+-				if (ms_fnmatch_w(p, n, protocol, case_sensitive) == 0) return 0;
+ 			}
+-			break;
+-
+-		case UCS2_CHAR('<'):
+-			for (; *n; n++) {
+-				if (ms_fnmatch_w(p, n, protocol, case_sensitive) == 0) return 0;
+-				if (*n == UCS2_CHAR('.') && !strchr_wa(n+1,'.')) {
++			if (! *n) return null_match(p);
+ 					n++;
+ 					break;
+-				}
+-			}
+-			break;
+ 
+ 		case UCS2_CHAR('"'):
+-			if (*n == 0 && ms_fnmatch_w(p, n, protocol, case_sensitive) == 0) return 0;
++			if (*n == 0 && null_match(p) == 0) {
++				return 0;
++			}
+ 			if (*n != UCS2_CHAR('.')) return -1;
+ 			n++;
+ 			break;
+ 
+ 		default:
+-			if (case_sensitive) {
+-				if (c != *n) return -1;
+-			} else {
+-				if (tolower_w(c) != tolower_w(*n)) return -1;
++			if (c != *n) {
++				if (is_case_sensitive) {
++					return -1;
++				}
++				if (toupper_w(c) != toupper_w(*n)) {
++					return -1;
++				}
+ 			}
+ 			n++;
++			break;
+ 		}
+ 	}
+ 	
+-	if (! *n) return 0;
++	if (! *n) {
++		return 0;
++	}
+ 	
+ 	return -1;
+ }
+ 
+-int ms_fnmatch(const char *pattern, const char *string, int protocol, 
+-	       BOOL case_senstive)
++int ms_fnmatch(const char *pattern, const char *string, enum protocol_types protocol, 
++	       BOOL is_case_sensitive)
+ {
+-	wpstring buffer_pattern, buffer_string;
+-	int ret;
+-	size_t size;
++	wpstring p, s;
++	int ret, count, i;
++	struct max_n *max_n = NULL;
++
++	if (strcmp(string, "..") == 0) {
++		string = ".";
++	}
+ 
+-	size = push_ucs2(NULL, buffer_pattern, pattern, sizeof(buffer_pattern), STR_TERMINATE);
+-	if (size == (size_t)-1) {
+-		return -1;
+-		/* Not quite the right answer, but finding the right one
+-		   under this failure case is expensive, and it's pretty close */
++	if (strpbrk(pattern, "<>*?\"") == NULL) {
++		/* this is not just an optmisation - it is essential
++		   for LANMAN1 correctness */
++		if (is_case_sensitive) {
++			return strcmp(pattern, string);
++		} else {
++			return StrCaseCmp(pattern, string);
++		}
+ 	}
+ 	
+-	size = push_ucs2(NULL, buffer_string, string, sizeof(buffer_string), STR_TERMINATE);
+-	if (size == (size_t)-1) {
++	pstrcpy_wa(p, pattern);
++	pstrcpy_wa(s, string);
++
++	if (protocol <= PROTOCOL_LANMAN2) {
++		/*
++		  for older negotiated protocols it is possible to
++		  translate the pattern to produce a "new style"
++		  pattern that exactly matches w2k behaviour
++		*/
++		for (i=0;p[i];i++) {
++			if (p[i] == UCS2_CHAR('?')) {
++				p[i] = UCS2_CHAR('>');
++			} else if (p[i] == UCS2_CHAR('.') && 
++				   (p[i+1] == UCS2_CHAR('?') || 
++				    p[i+1] == UCS2_CHAR('*') ||
++				    p[i+1] == 0)) {
++				p[i] = UCS2_CHAR('"');
++			} else if (p[i] == UCS2_CHAR('*') && p[i+1] == UCS2_CHAR('.')) {
++				p[i] = UCS2_CHAR('<');
++			}
++		}
++	}
++
++	for (count=i=0;p[i];i++) {
++		if (p[i] == UCS2_CHAR('*') || p[i] == UCS2_CHAR('<')) count++;
++	}
++
++	if (count != 0) {
++		max_n = calloc(sizeof(struct max_n), count);
++		if (!max_n) {
+ 		return -1;
+-		/* Not quite the right answer, but finding the right one
+-		   under this failure case is expensive, and it's pretty close */
++		}
+ 	}
+ 
+-	ret = ms_fnmatch_w(buffer_pattern, buffer_string, protocol, case_senstive);
+- 	DEBUG(10,("ms_fnmatch(%s,%s) -> %d\n", pattern, string, ret));
++	ret = ms_fnmatch_core(p, s, max_n, strrchr_w(s, UCS2_CHAR('.')), is_case_sensitive);
++
++	if (max_n) {
++		free(max_n);
++	}
+ 
+ 	return ret;
+ }
+@@ -245,5 +214,5 @@
+ /* a generic fnmatch function - uses for non-CIFS pattern matching */
+ int gen_fnmatch(const char *pattern, const char *string)
+ {
+-	return ms_fnmatch(pattern, string, PROTOCOL_NT1, True);
++	return ms_fnmatch(pattern, string, PROTOCOL_NT1, False);
+ }
+Only in samba-3.0.7/source/script: gen-8bit-gap.sh
+Only in samba-3.0.7/source: smbadduser

Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec
===================================================================
--- tinysofa/releases/1.1/samba/current/specs/samba.spec	2004-11-10 12:11:49 UTC (rev 5074)
+++ tinysofa/releases/1.1/samba/current/specs/samba.spec	2004-11-10 12:26:29 UTC (rev 5075)
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.7
-Release: 1jh
+Release: 2jh
 Epoch: 0
 License: GNU GPL Version 2
 Group: extra
@@ -35,6 +35,7 @@
 Patch11: samba-3.0.5pre1-use_authtok.patch
 Patch12: samba-3.0.6-schema.patch
 Patch13: samba-3.0.5rc1-64bit-timestamps.patch
+Patch14: samba-3.0.7-CAN-2004-0930.patch
 
 Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version} 
 Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 
@@ -122,6 +123,7 @@
 %patch11 -p1 -b .use_authtok
 # %patch12 -p1 -b .schema
 %patch13 -p1 -b .64bit-timestamps
+%patch14 -p1 -b .CAN-2004-0930
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -443,6 +445,9 @@
 
 
 %changelog
+* Wed Nov 10 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.0.7-2jh
+- fix CAN-2004-0930 (Bug ID: #29)
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 3.0.6-1ts
 - current (3.0.6-1jh) integrated as 3.0.6-1ts for release 1.1-U1
 


From svn at tinysofa.org  Wed Nov 10 12:46:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 10 Nov 2004 07:46:12 -0500 (EST)
Subject: [tinysofa-svn] 
	r5076 - tinysofa/releases/1.1/shadow-utils/current/specs
Message-ID: <20041110124612.638223440EA@minbar.tinysofa.org>

Author: jh
Date: 2004-11-10 07:46:11 -0500 (Wed, 10 Nov 2004)
New Revision: 5076

Modified:
   tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec
Log:
- increase release number

Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec
===================================================================
--- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec	2004-11-10 12:26:29 UTC (rev 5075)
+++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec	2004-11-10 12:46:11 UTC (rev 5076)
@@ -3,7 +3,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.3
-Release: 26ts
+Release: 27jh
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
 Source1: shadow-4.0.3.login.defs


From svn at tinysofa.org  Wed Nov 10 14:03:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 10 Nov 2004 09:03:15 -0500 (EST)
Subject: [tinysofa-svn] 
	r5077 - in tinysofa/releases/1.1/nss_ldap/current: sources specs
Message-ID: <20041110140315.03CEE3440EA@minbar.tinysofa.org>

Author: jh
Date: 2004-11-10 09:03:15 -0500 (Wed, 10 Nov 2004)
New Revision: 5077

Modified:
   tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176-dnsconfig.patch
   tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec
Log:
- spec cleanup
- update pam_ldap-176-dnsconfig.patch


Modified: tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176-dnsconfig.patch
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176-dnsconfig.patch	2004-11-10 12:46:11 UTC (rev 5076)
+++ tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176-dnsconfig.patch	2004-11-10 14:03:15 UTC (rev 5077)
@@ -1,6 +1,6 @@
---- pam_ldap-176/Makefile.am.dnsconfig	2004-10-01 05:33:14.000000000 +0300
-+++ pam_ldap-176/Makefile.am	2004-10-13 11:17:18.300738208 +0300
-@@ -2,7 +2,7 @@
+--- pam_ldap-176/Makefile.am	2004-09-30 22:33:14.000000000 -0400
++++ pam_ldap-176/Makefile.am	2004-10-28 17:24:13.691936696 -0400
+@@ -2,7 +2,7 @@ noinst_PROGRAMS = pam_ldap.so
  EXTRA_DIST = COPYING.LIB CVSVersionInfo.txt ChangeLog README \
  	     ldap.conf pam.conf pam_ldap.spec pam.d
  
@@ -9,161 +9,8 @@
  pam_ldap_so_LDFLAGS = @pam_ldap_so_LDFLAGS@
  
  DEFS = @DEFS@
---- pam_ldap-176/pam_ldap.h.dnsconfig	2004-10-01 05:33:14.000000000 +0300
-+++ pam_ldap-176/pam_ldap.h	2004-10-13 11:20:59.859056224 +0300
-@@ -19,6 +19,9 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#ifndef _LDAP_PAM_LDAP_H
-+#define _LDAP_PAM_LDAP_H
-+
- #ifdef HAVE_SECURITY_PAM_APPL_H
- #include <security/pam_appl.h>
- #elif defined(HAVE_PAM_PAM_APPL_H)
-@@ -140,6 +143,9 @@
-     int debug;
-     /* SASL mechanism */
-     char *sasl_mechanism;
-+    /* next server in the list */
-+    struct pam_ldap_config *next;
-+
-   }
- pam_ldap_config_t;
- 
-@@ -342,3 +348,4 @@
- #define PAM_SM_ACCOUNT
- PAM_EXTERN int pam_sm_acct_mgmt (pam_handle_t *, int, int, const char **);
- 
-+#endif
---- pam_ldap-176/pam_ldap.c.dnsconfig	2004-10-01 05:33:14.000000000 +0300
-+++ pam_ldap-176/pam_ldap.c	2004-10-13 11:19:39.638251640 +0300
-@@ -129,6 +129,7 @@
- #endif /* YPLDAPD */
- 
- #include "pam_ldap.h"
-+#include "dnsconfig.h"
- #include "md5.h"
- 
- #if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H)
-@@ -792,11 +793,6 @@
- 
-   if (fp == NULL)
-     {
--      /* 
--       * According to PAM Documentation, such an error in a config file
--       * SHOULD be logged at LOG_ALERT level
--       */
--      syslog (LOG_ALERT, "pam_ldap: missing file \"%s\"", configFile);
-       return PAM_SERVICE_ERR;
-     }
- 
-@@ -1099,21 +1095,6 @@
- 	}
-     }
- 
--#ifdef HAVE_LDAP_INITIALIZE
--  if (result->host == NULL && result->uri == NULL)
--#else
--  if (result->host == NULL)
--#endif
--    {
--      /* 
--       * According to PAM Documentation, such an error in a config file
--       * SHOULD be logged at LOG_ALERT level
--       */
--      syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"%s\"",
--	      configFile);
--      return PAM_SERVICE_ERR;
--    }
--
- #if !(defined(HAVE_SASL_SASL_H) || defined(HAVE_SASL_H)) && !defined(HAVE_LDAP_SASL_INTERACTIVE_BIND_S)
-   if (result->sasl_mechanism != NULL)
-     {
-@@ -1177,6 +1158,7 @@
-    * not the buffer
-    */
-   memset (b, 0, BUFSIZ);
-+  *presult = result;
-   return PAM_SUCCESS;
- }
- 
-@@ -2659,16 +2641,31 @@
-       _release_config (&session->conf);
- #endif /* YPLDAPD */
-       rc = _read_config (configFile, &session->conf);
--      if (rc != PAM_SUCCESS)
-+      if ((rc != PAM_SUCCESS) || (session->conf->host == NULL))
- 	{
--	  _release_config (&session->conf);
--	  free (session);
--	  return rc;
-+          rc = _pam_ldap_readconfigfromdns(session->conf);
-+          if (rc != PAM_SUCCESS)
-+	    {
-+	      _release_config (&session->conf);
-+	      free (session);
-+	      return rc;
-+	    }
- 	}
- #ifdef YPLDAPD
-     }
- #endif /* YPLDAPD */
- 
-+    if (session->conf->host == NULL)
-+      {
-+        /* 
-+         * According to PAM Documentation, such an error in a config file
-+         * SHOULD be logged at LOG_ALERT level
-+         */
-+        syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"ldap.conf\","
-+		" and no information in DNS");
-+        return PAM_SYSTEM_ERR;
-+      }
-+
-   rc =
-     pam_set_data (pamh, PADL_LDAP_SESSION_DATA, (void *) session,
- 		  _pam_ldap_cleanup_session);
---- /dev/null	2004-08-31 12:30:25.000000000 +0300
-+++ pam_ldap-176/dnsconfig.h	2004-10-13 11:17:18.312736384 +0300
-@@ -0,0 +1,35 @@
-+/* Copyright (C) 1997-2001 Luke Howard.
-+   This file started off as part of the nss_ldap library.
-+   Contributed by Luke Howard, <lukeh at padl.com>, 1997.
-+   (The author maintains a non-exclusive licence to distribute this file
-+   under their own conditions.)
-+
-+   The nss_ldap library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The nss_ldap library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the nss_ldap library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+ */
-+
-+#ifndef _LDAP_PAM_LDAP_DNSCONFIG_H
-+#define _LDAP_PAM_LDAP_DNSCONFIG_H
-+
-+/* utility routines.  */
-+
-+int _pam_ldap_getdnsdn (
-+			char *domain,
-+			char **rval);
-+
-+int _pam_ldap_readconfigfromdns (
-+				 pam_ldap_config_t *result);
-+
-+#endif /* _LDAP_PAM_LDAP_DNSCONFIG_H */
---- pam_ldap-176/configure.in.dnsconfig	2004-10-01 05:33:14.000000000 +0300
-+++ pam_ldap-176/configure.in	2004-10-13 11:17:18.302737904 +0300
+--- pam_ldap-176/configure.in	2004-09-30 22:33:14.000000000 -0400
++++ pam_ldap-176/configure.in	2004-10-28 17:24:13.692936544 -0400
 @@ -133,6 +133,9 @@
  AC_CHECK_FUNCS(ldap_initialize)
  AC_CHECK_FUNCS(ldap_sasl_bind ldap_sasl_interactive_bind_s)
@@ -174,9 +21,9 @@
  
  if test "$ac_cv_func_gethostbyname_r" = "yes"; then
  AC_CACHE_CHECK(whether gethostbyname_r takes 6 arguments, xad_cv_gethostbyname_r_args, [
---- /dev/null	2004-08-31 12:30:25.000000000 +0300
-+++ pam_ldap-176/dnsconfig.c	2004-10-13 11:17:18.311736536 +0300
-@@ -0,0 +1,200 @@
+--- /dev/null	2004-10-19 17:45:17.794252000 -0400
++++ pam_ldap-176/dnsconfig.c	2004-10-28 17:32:36.915435096 -0400
+@@ -0,0 +1,214 @@
 +
 +/* Copyright (C) 1997-2001 Luke Howard.
 +   This file started off as part of the nss_ldap library.
@@ -332,7 +179,7 @@
 +      return PAM_SYSTEM_ERR;
 +    }
 +
-+  /* XXX need to sort by priority */
++  /* XXX need to sort by priority and reorder using weights */
 +  for (rr = r->head; rr != NULL; rr = rr->next)
 +    {
 +      if (rr->type == T_SRV)
@@ -340,20 +187,34 @@
 +	  if (result->host != NULL)
 +	    {
 +	      /* need more space */
-+	      result->next = (pam_ldap_config_t *) malloc (sizeof (*result));
-+	      if (result->next == NULL)
-+		{
-+		  dns_free_data (r);
++	      int length;
++	      char *tmp;
++	      length = strlen (result->host) + 1 +
++	               strlen (rr->u.srv->target) + 1 + 5 + 1;
++	      tmp = malloc (length);
++	      if (tmp == NULL)
++	        {
++	          dns_free_data (r);
 +		  return PAM_BUF_ERR;
-+		}
-+	      result = result->next;
++	        }
++	      sprintf (tmp, "%s %s:%d", result->host, rr->u.srv->target,
++	               rr->u.srv->port);
++	      free (result->host);
++	      result->host = tmp;
 +	    }
++	  else
++	    {
++	      /* Server Host */
++	      result->host = strdup (rr->u.srv->target);
++	      if (result->host == NULL)
++	        {
++	          dns_free_data (r);
++		  return PAM_BUF_ERR;
++	        }
++	      /* Port */
++	      result->port = rr->u.srv->port;
++	    }
 +
-+	  /* Server Host */
-+	  result->host = strdup (rr->u.srv->target);
-+
-+	  /* Port */
-+	  result->port = rr->u.srv->port;
 +#ifdef LDAPS_PORT
 +	  /* Hack: if the port is the registered SSL port, enable SSL. */
 +	  if (result->port == LDAPS_PORT)
@@ -377,3 +238,71 @@
 +
 +  return stat;
 +}
+--- /dev/null	2004-10-19 17:45:17.794252000 -0400
++++ pam_ldap-176/dnsconfig.h	2004-10-28 17:24:13.694936240 -0400
+@@ -0,0 +1,35 @@
++/* Copyright (C) 1997-2001 Luke Howard.
++   This file started off as part of the nss_ldap library.
++   Contributed by Luke Howard, <lukeh at padl.com>, 1997.
++   (The author maintains a non-exclusive licence to distribute this file
++   under their own conditions.)
++
++   The nss_ldap library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Library General Public License as
++   published by the Free Software Foundation; either version 2 of the
++   License, or (at your option) any later version.
++
++   The nss_ldap library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Library General Public License for more details.
++
++   You should have received a copy of the GNU Library General Public
++   License along with the nss_ldap library; see the file COPYING.LIB.  If not,
++   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++ */
++
++#ifndef _LDAP_PAM_LDAP_DNSCONFIG_H
++#define _LDAP_PAM_LDAP_DNSCONFIG_H
++
++/* utility routines.  */
++
++int _pam_ldap_getdnsdn (
++			char *domain,
++			char **rval);
++
++int _pam_ldap_readconfigfromdns (
++				 pam_ldap_config_t *result);
++
++#endif /* _LDAP_PAM_LDAP_DNSCONFIG_H */
+--- pam_ldap-176/pam_ldap.c	2004-09-30 22:33:14.000000000 -0400
++++ pam_ldap-176/pam_ldap.c	2004-10-28 17:40:56.918423088 -0400
+@@ -130,6 +130,7 @@
+ 
+ #include "pam_ldap.h"
+ #include "md5.h"
++#include "dnsconfig.h"
+ 
+ #if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H)
+  /* FIXME: is there something better to check? */
+@@ -1107,11 +1108,15 @@
+     {
+       /* 
+        * According to PAM Documentation, such an error in a config file
+-       * SHOULD be logged at LOG_ALERT level
++       * SHOULD be logged at LOG_ALERT level, but we suppress it if DNS
++       * can provide us with the needed information
+        */
+-      syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"%s\"",
+-	      configFile);
+-      return PAM_SERVICE_ERR;
++      if (_pam_ldap_readconfigfromdns (result) != PAM_SUCCESS)
++        {
++          syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"%s\"",
++	          configFile);
++          return PAM_SERVICE_ERR;
++        }
+     }
+ 
+ #if !(defined(HAVE_SASL_SASL_H) || defined(HAVE_SASL_H)) && !defined(HAVE_LDAP_SASL_INTERACTIVE_BIND_S)

Modified: tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec	2004-11-10 12:46:11 UTC (rev 5076)
+++ tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec	2004-11-10 14:03:15 UTC (rev 5077)
@@ -1,6 +1,5 @@
 %define nss_ldap_version 226
 %define pam_ldap_version 176
-%define db_version 4.0.14
 Summary: NSS library and PAM module for LDAP.
 Name: nss_ldap
 Version: %{nss_ldap_version}
@@ -57,10 +56,6 @@
 %prep
 %setup -q -c -a 1
 
-pushd nss_ldap-%{nss_ldap_version}
-autoreconf
-popd
-
 cp nss_ldap-%{nss_ldap_version}/resolve.c pam_ldap-%{pam_ldap_version}/
 cp nss_ldap-%{nss_ldap_version}/resolve.h pam_ldap-%{pam_ldap_version}/
 cp nss_ldap-%{nss_ldap_version}/snprintf.c pam_ldap-%{pam_ldap_version}/
@@ -94,7 +89,6 @@
 %build
 # We're building modules here, so make sure -fPIC is always used.
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
-topdir=`pwd`/db-instroot
 
 # Build pam_ldap.
 pushd pam_ldap-%{pam_ldap_version}


From svn at tinysofa.org  Wed Nov 10 18:16:48 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 10 Nov 2004 13:16:48 -0500 (EST)
Subject: [tinysofa-svn] r5078 - contrib/1.1/subversion/current/specs
Message-ID: <20041110181648.C5F5E3440EA@minbar.tinysofa.org>

Author: jh
Date: 2004-11-10 13:16:48 -0500 (Wed, 10 Nov 2004)
New Revision: 5078

Modified:
   contrib/1.1/subversion/current/specs/subversion.spec
Log:
- fix a typo in -perl %defattr


Modified: contrib/1.1/subversion/current/specs/subversion.spec
===================================================================
--- contrib/1.1/subversion/current/specs/subversion.spec	2004-11-10 14:03:15 UTC (rev 5077)
+++ contrib/1.1/subversion/current/specs/subversion.spec	2004-11-10 18:16:48 UTC (rev 5078)
@@ -6,7 +6,7 @@
 Summary:  A Concurrent Versioning system similar to but better than CVS.
 Name:     subversion
 Version:  1.0.8
-Release: 1jh
+Release: 2jh
 License:  BSD
 Group: contrib
 URL:      http://subversion.tigris.org
@@ -431,7 +431,7 @@
 %{_libdir}/apache/mod_authz_svn.so
 
 %files perl
-%defattr(-,root,root.0755)
+%defattr(-,root,root,0755)
 %{perl_vendorarch}/SVN
 %{perl_vendorarch}/auto/SVN
 %{_libdir}/libsvn_swig_perl*so.*


From svn at tinysofa.org  Thu Nov 11 13:42:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 11 Nov 2004 08:42:43 -0500 (EST)
Subject: [tinysofa-svn] 
	r5079 - tinysofa/releases/1.1/initscripts/current/specs
Message-ID: <20041111134243.02A563440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-11 08:42:42 -0500 (Thu, 11 Nov 2004)
New Revision: 5079

Modified:
   tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec
Log:
- minor tweaks


Modified: tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec	2004-11-10 18:16:48 UTC (rev 5078)
+++ tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec	2004-11-11 13:42:42 UTC (rev 5079)
@@ -47,15 +47,19 @@
 %patch5 -p1 -b .alsa~
 %patch6 -p1 -b .dovecot~
 
-find . -name '*~'|xargs rm
+find . -name '*~'|xargs rm -f
 
 
 %build
-CFLAGS=$RPM_OPT_FLAGS make
+CFLAGS="$RPM_OPT_FLAGS" make
 
 
 %install
-make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install 
+make install \
+	ROOT=$RPM_BUILD_ROOT \
+	SUPERUSER=`id -un` \
+	SUPERGROUP=`id -gn` \
+	mandir=%{_mandir}
 
 rm -f $RPM_BUILD_ROOT/sbin/genhostid
 rm -f $RPM_BUILD_ROOT/sbin/redhat-support-check
@@ -69,6 +73,7 @@
 # Add modules that should be loaded during boot, one per line:
 __EOF__
 
+
 %pre
 /usr/sbin/groupadd -g 22 -r -f utmp
 


From svn at tinysofa.org  Thu Nov 11 16:54:23 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 11 Nov 2004 11:54:23 -0500 (EST)
Subject: [tinysofa-svn] 
	r5080 - in contrib/1.1/firehol/current: sources specs
Message-ID: <20041111165423.89DDD3440EC@minbar.tinysofa.org>

Author: bg
Date: 2004-11-11 11:54:22 -0500 (Thu, 11 Nov 2004)
New Revision: 5080

Modified:
   contrib/1.1/firehol/current/sources/firehol.tar.gz
   contrib/1.1/firehol/current/specs/firehol.spec
Log:
new upstream: 1.216


Modified: contrib/1.1/firehol/current/sources/firehol.tar.gz
===================================================================
(Binary files differ)

Modified: contrib/1.1/firehol/current/specs/firehol.spec
===================================================================
--- contrib/1.1/firehol/current/specs/firehol.spec	2004-11-11 13:42:42 UTC (rev 5079)
+++ contrib/1.1/firehol/current/specs/firehol.spec	2004-11-11 16:54:22 UTC (rev 5080)
@@ -1,7 +1,7 @@
 Summary: firewall script for iptables
 Name:    firehol
-Version: 1.194
-Release: 2gd
+Version: 1.216
+Release: 1bg
 Group:   contrib
 Source:  http://firehol.sourceforge.net/firehol.tar.gz
 Source1: firehol.conf
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Nov 11 2004 Goetz Bock <oss at all dash connect dot net> 2.16-1bg
+- new upstream: 1.216
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.194-2gd
 - current (1.194-2gd) integrated as 1.194-2gd
 


From svn at tinysofa.org  Thu Nov 11 16:58:48 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 11 Nov 2004 11:58:48 -0500 (EST)
Subject: [tinysofa-svn] r5081 - contrib/1.1/firehol/releases
Message-ID: <20041111165848.EC4FB3440EC@minbar.tinysofa.org>

Author: bg
Date: 2004-11-11 11:58:48 -0500 (Thu, 11 Nov 2004)
New Revision: 5081

Added:
   contrib/1.1/firehol/releases/1.216/
Log:
tag new upstream: 1.216



From svn at tinysofa.org  Thu Nov 11 17:01:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 11 Nov 2004 12:01:51 -0500 (EST)
Subject: [tinysofa-svn] r5082 - contrib/1.1/firehol/releases/1.216
Message-ID: <20041111170151.41B793440EC@minbar.tinysofa.org>

Author: bg
Date: 2004-11-11 12:01:50 -0500 (Thu, 11 Nov 2004)
New Revision: 5082

Added:
   contrib/1.1/firehol/releases/1.216/1bg/
Log:
tagged 1.216-1bg


Copied: contrib/1.1/firehol/releases/1.216/1bg (from rev 5081, contrib/1.1/firehol/current)


From svn at tinysofa.org  Fri Nov 12 12:42:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 12 Nov 2004 07:42:55 -0500 (EST)
Subject: [tinysofa-svn] 
	r5084 - in tinysofa/releases/1.1/jwhois/current: sources specs
Message-ID: <20041112124255.A2ACB3440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-12 07:42:54 -0500 (Fri, 12 Nov 2004)
New Revision: 5084

Added:
   tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-arin.patch
   tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-denic.patch
   tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-doublefree.patch
   tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-typos.patch
Modified:
   tinysofa/releases/1.1/jwhois/current/specs/jwhois.spec
Log:
- updated jwhois
- include fedora patches


Added: tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-arin.patch
===================================================================
--- tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-arin.patch	2004-11-11 20:20:13 UTC (rev 5083)
+++ tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-arin.patch	2004-11-12 12:42:54 UTC (rev 5084)
@@ -0,0 +1,11 @@
+--- jwhois-3.2.2/example/jwhois.conf.arin	2004-09-13 19:49:58.542882128 +0200
++++ jwhois-3.2.2/example/jwhois.conf	2004-09-13 19:50:03.757089448 +0200
+@@ -508,6 +508,8 @@
+ 		whois-redirect = ".*at \\([Ww][Hh][Oo][Ii][Ss]\\.[A-Za-z]*\\.[Nn][Ee][Tt]\\)";
+ 		whois-redirect = ".* \\([Rr]+[Ww][Hh][Oo][Ii][Ss]\\.[A-Za-z]*\\.[Nn][Ee][Tt]\\) \\([0-9]*\\)";
+ 		whois-redirect = ".* rwhois://\\(.*\\):\\([0-9]*\\)/";
++		whois-redirect = "ReferralServer: r?whois://\\([^:]*\\)";
++		whois-redirect = "ReferralServer: r?whois://\\(.*\\):\\([0-9]*\\)";
+ 	}
+ 
+ 	"whois\\.ncst\\.ernet\\.in" {

Added: tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-denic.patch
===================================================================
--- tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-denic.patch	2004-11-11 20:20:13 UTC (rev 5083)
+++ tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-denic.patch	2004-11-12 12:42:54 UTC (rev 5084)
@@ -0,0 +1,21 @@
+Patch by Robert Scheck <redhat at linuxnetz.de> for jwhois >= 3.2.2 to get the same 
+behaviour at querying/answering .de domains at DENIC like before the IDN change at 
+March, 1st, 2004.
+
+See also http://www.denic.de/en/domains/technik/denic_whois-server/index.html for
+further information.
+
+--- jwhois-3.2.2/example/jwhois.conf		2004-09-11 19:18:55.000000000 +0200
++++ jwhois-3.2.2/example/jwhois.conf.denic	2004-09-11 19:20:39.000000000 +0200
+@@ -138,7 +138,10 @@
+ 	"\\.cx$" = "whois.nic.cx";
+ 	"\\.cy$" = "whois.ripe.net";
+ 	"\\.cz$" = "whois.nic.cz";
+-	"\\.de$" = "whois.denic.de";
++	"\\.de$" {
++		whois-server = "whois.denic.de";
++		query-format = "-C UTF-8 -T dn,ace $*";
++	}
+ 	"\\.dk$" = "whois.dk-hostmaster.dk";
+ 	"\\.do$" = "whois.nic.do";
+ 	"\\.dz$" = "whois.ripe.net";

Added: tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-doublefree.patch
===================================================================
--- tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-doublefree.patch	2004-11-11 20:20:13 UTC (rev 5083)
+++ tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-doublefree.patch	2004-11-12 12:42:54 UTC (rev 5084)
@@ -0,0 +1,35 @@
+--- jwhois-3.2.2/src/jwhois.c~	2002-03-22 17:25:08.000000000 +0100
++++ jwhois-3.2.2/src/jwhois.c	2004-10-30 22:32:07.063106552 +0200
+@@ -182,8 +182,7 @@
+   
+   if (!raw_query)
+     {
+-      oldquery = malloc(strlen(wq->query)+1);
+-      strncpy(oldquery, wq->query, strlen(wq->query)+1);
++      oldquery = wq->query;
+       wq->query = (char *)lookup_query_format(wq);
+     }
+ 
+@@ -207,7 +206,10 @@
+     }
+ 
+   if (!raw_query)
+-    wq->query = oldquery;
++    {
++      free(wq->query);
++      wq->query = oldquery;
++    }
+ 
+   if (ret < 0)
+     {
+@@ -215,9 +217,7 @@
+     }
+   if (ret > 0)
+     {
+-      int rc = jwhois_query(wq, text);
+-      free(wq->query);
+-      return rc;
++      return jwhois_query(wq, text);
+     }
+   else
+     return 0;

Added: tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-typos.patch
===================================================================
--- tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-typos.patch	2004-11-11 20:20:13 UTC (rev 5083)
+++ tinysofa/releases/1.1/jwhois/current/sources/jwhois-3.2.2-typos.patch	2004-11-12 12:42:54 UTC (rev 5084)
@@ -0,0 +1,20 @@
+--- jwhois-3.2.2/example/jwhois.conf	2004-01-06 14:16:29.000000000 -0500
++++ jwhois-3.2.2/example/jwhois.conf	2004-01-06 14:16:22.000000000 -0500
+@@ -191,7 +191,7 @@
+ 	"\\.lv$" = "whois.nic.lv";
+ 	"\\.ma$" = "whois.ripe.net";
+ 	"\\.mil$" = "whois.nic.mil";
+-	"\\.mk$" = "whios.ripe.net";
++	"\\.mk$" = "whois.ripe.net";
+ 	"\\.mm$" = "whois.nic.mm";
+ 	"\\.ms$" = "whois.adamsnames.tc";
+ 	"\\.mt$" = "www.um.edu.mt";
+@@ -346,7 +346,7 @@
+ 	"203.178.0.0/15" = "whois.nic.ad.jp";	# APNIC JPNIC-NET-JP
+ 	"203.180.0.0/14" = "whois.nic.ad.jp";	# APNIC JPNIC-NET-JP
+ 	"210.128.0.0/11" = "whois.nic.ad.jp";	# APNIC JPNIC-NET-JP
+-	"210.136.0.0/13" = "whios.nic.ad.jp";
++	"210.136.0.0/13" = "whois.nic.ad.jp";
+ 	"210.160.0.0/12" = "whois.nic.ad.jp";	# APNIC JPNIC-NET-JP
+ 	"210.188.0.0/14" = "whois.nic.ad.jp";	# APNIC JPNIC-NET-JP
+ 	"210.196.0.0/14" = "whois.nic.ad.jp";	# APNIC JPNIC-NET-JP

Modified: tinysofa/releases/1.1/jwhois/current/specs/jwhois.spec
===================================================================
--- tinysofa/releases/1.1/jwhois/current/specs/jwhois.spec	2004-11-11 20:20:13 UTC (rev 5083)
+++ tinysofa/releases/1.1/jwhois/current/specs/jwhois.spec	2004-11-12 12:42:54 UTC (rev 5084)
@@ -1,141 +1,103 @@
-Summary: The GNU Whois client
 Name: jwhois
 Version: 3.2.2
-Release: 6ts
-License: GPL 
+Release: 7jh
+URL: http://www.gnu.org/software/jwhois/
+Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
+Patch0: jwhois-3.2.2-typos.patch
+Patch1: jwhois-3.2.2-denic.patch
+Patch2: jwhois-3.2.2-arin.patch
+Patch3: jwhois-3.2.2-doublefree.patch
+License: GPL
 Group: main
-URL: http://www.gnu.org/software/jwhois
-Source: ftp://ftp.gnu.org/gnu/jwhois/%{name}-%{version}.tar.gz
-BuildRequires: gdbm-devel
-BuildRoot: %{_tmppath}/%{name}-root
+Summary: Internet whois/nicname client.
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 
+
 %description
-JWHOIS is an Internet Whois client that queries hosts for information
-according to RFC 954 - NICNAME/WHOIS. JWHOIS is configured via a
-configuration file that contains information about all known Whois servers.
-Upon execution, the host to query is selected based on the information
-in the configuration file. 
+A whois client that accepts both traditional and finger-style queries.
 
-The configuration file is highly customizable and makes heavy use of
-regular expressions. 
 
 %prep
 %setup -q
+%patch0 -p1 -b .typos
+%patch1 -p1 -b .denic
+%patch2 -p1 -b .arin
+%patch3 -p1 -b .doublefree
 
+
 %build
-CFLAGS="${RPM_OPT_FLAGS}" \
-./configure --prefix=%{_prefix} \
-	--sysconfdir=/etc \
-	--without-cache
-make
+%configure --without-cache
+%make
 
+
 %install
+%makeinstall
 
-make prefix=${RPM_BUILD_ROOT}%{_prefix} \
-     mandir=${RPM_BUILD_ROOT}%{_mandir} \
-     sysconfdir=${RPM_BUILD_ROOT}/etc install-strip
+%nuke_info
 
-install -d -m 755 ${RPM_BUILD_ROOT}/etc
+%find_lang jwhois
 
-install -m 644 example/jwhois.conf ${RPM_BUILD_ROOT}/etc
+# Make "whois" jwhois.
+ln -sf jwhois $RPM_BUILD_ROOT/%{_bindir}/whois
+echo .so man1/jwhois.1 > $RPM_BUILD_ROOT/%{_mandir}/man1/whois.1
 
-ln -s jwhois ${RPM_BUILD_ROOT}%{_prefix}/bin/whois
-ln -s jwhois.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/whois.1
 
-rm -rf $RPM_BUILD_ROOT/usr/info
+%files -f %{name}.lang
+%defattr(-,root,root)
+%doc AUTHORS COPYING NEWS README TODO
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_mandir}/*/man1/jwhois.1*
+%config(noreplace) %{_sysconfdir}/jwhois.conf
 
-%find_lang %{name}
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
-%pre
-( [ -f /var/cache/jwhois/jwhois.db ] && \
-	rm -f /var/cache/jwhois/jwhois.db ) || true;
 
-%preun 
-( [ -f /var/cache/jwhois/jwhois.db ] && \
-	rm -f /var/cache/jwhois/jwhois.db ) || true;
+%changelog
+* Mon Nov  1 2004 Miloslav Trmac <mitr at redhat.com> - 3.2.2-7
+- Fix double free (#137693)
 
-%files -f %{name}.lang
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%config(noreplace) /etc/jwhois.conf
-%attr(0755,root,root) %{_prefix}/bin/jwhois
-%{_mandir}/man1/jwhois.1*
-%{_prefix}/share/locale/*/LC_MESSAGES/jwhois.mo
+* Mon Sep 13 2004 Miloslav Trmac <mitr at redhat.com> - 3.2.2-6
+- Recognize more redirections at whois.arin.net (#116423)
 
-%{_prefix}/bin/whois
-%{_mandir}/man1/whois.1*
-%exclude %{_mandir}/sv/man1/*
+* Mon Sep 13 2004 Miloslav Trmac <mitr at redhat.com> - 3.2.2-5
+- Update config file for .de (#132362, by Robert Scheck)
 
-%changelog
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 3.2.2-6ts
-- current (3.2.2-6jh) integrated as 3.2.2-6ts for release 1.1
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 3.2.2-5ts
-- current (3.2.2-4ts) integrated as 3.2.2-5ts for release 1.0-U1
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Sun Dec  7 2003 Erlend Midttun <erlendbm at trustix dot org> 3.2.2-1tr
-- New upstream.
+* Wed Jan  7 2004 Nalin Dahyabhai <nalin at redhat.com> 3.2.2-2
+- fix typos in jwhois.conf (#113012)
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 3.2.0-3tr
-- Big rebuild
+* Fri Jul 04 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- new upstream version 3.2.2
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 3.2.0-2em
-- Rebuilt against glibc 2.3.2.
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Thu Aug 15 2002 Christian H. Toldnes <christht at trustix dot com> 3.2.0-1ct
-- New upstream version: 3.2.0
-- Huge .spec cleanups!
+* Sun Feb 02 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 3.2.1
 
-* Tue Jul 23 2002 Daniel Meyer <eagle at trustix dot org> 2.4.2-4dm
-- rebuild for Trustix Secure Linux 2.0
+* Thu Jan 30 2003 Nalin Dahyabhai <nalin at redhat.com> 3.2.0-6
+- search whois.publicinternetregistry.net instead of whois.internic.net for
+  all '.org$' domains (#82802).
 
-* Tue Jun  5 2001 Oystein Viggen <oysteivi at trustix dot com>
-- Disable caching, as it wasn't that useful anyway, had problems and gives us
-  one less setxid binary in our filesystem.
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com> 3.2.0-5
+- rebuilt
 
-* Thu Feb 22 2001 Oren Tirosh <oren at hishome.net>
-- FHS path compliance
+* Thu Dec 12 2002 Karsten Hopp <karsten at redhat.de> 3.2.0-4
+- Requires(post,preun) doesn't seem to work properly
 
-* Wed Jan 10 2001 Ryan Weaver <ryanw at infohwy.com>
-  [jwhois-2.4.2-1]
-- src/lookup.c (find_cidr): Fix for big endian machines
-- src/jwhois.c (main): Better handling of cache errors (P?l L?berg)
-- example/jwhois.conf: Added .in, .nu (Kandra Nyg?rds), .hk (Patrick Liu),
-  .as (P?l L?berg), .gov.uk (Michael Stevens), .at (Alexander Lehmann)
-- src/lookup.c (find_cidr): Match n bits in an /n block instead
-  of 32-n (Tom Hughes, Emil LAURENTIU)
-- po/ru.po: Added (from Dmitry G. Mastrukov)
+* Wed Nov 20 2002 Florian La Roche <Florian.LaRoche at redhat.de> 3.2.0-3
+- require install-info
 
-* Mon Feb 14 2000 Ryan Weaver <ryanw at infohwy.com>
-  [jwhois-2.4.1-2]
-- jwhois now runs as user nobody aswell as group nobody so that the
-  cached database isn't owned by 'the first user to run jwhois', thus
-  affecting their quota. (Thanks to Oren Tirosh <oren at hishome.net>)
-- Oren Tirosh <oren at hishome.net> also informed me that since he was the
-  first one to make a rpm for jwhois, it was unkind of me to rewrite and
-  maintain the rpm for jwhois without as least leaving his rpm changelog
-  entries. Sorry Oren, I can no longer locate the old rpms to replace
-  your entries.
+* Thu Nov 14 2002 Nalin Dahyabhai <nalin at redhat.com> 3.2.0-2
+- don't bail out of %%install if make install doesn't create an info top node
 
-* Thu Jan 27 2000 Ryan Weaver <ryanw at infohwy.com>
-  [jwhois-2.4.1-1]
-- example/jwhois.conf: Added more CIDR blocks
-  Changed registry for .no and added -NORID handles (from P?l L?berg)
-- configure.in: Added generation of jwhois.spec
-- Makefile.am (EXTRA_DIST): Added distribution of jwhois.spec
-- jwhois.spec.in: Added (from Ryan Weaver)
-- src/jwhois.c (make_connect): Output [host]\n -before- doing a
-  resolver query (speeds up output so the user doesn't think it's hung)
-- src/utils.c (fdread): Check return value from read correctly
-- example/jwhois.conf: corrected \. to be \\.
-
-* Mon Jan 24 2000 Ryan Weaver <ryanw at infohwy.com>
-  [jwhois-2.4-2]
-- Made package relocatable.
-- Including available locales now.
-- Rewrote spec file.
-- Made patch against source to include spec it distribution and sent it
-  to the author.
+* Mon Sep 30 2002 Nalin Dahyabhai <nalin at redhat.com> 3.2.0-1
+- initial package


From svn at tinysofa.org  Fri Nov 12 12:56:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 12 Nov 2004 07:56:16 -0500 (EST)
Subject: [tinysofa-svn] r5085 - contrib/1.1/subversion/current/specs
Message-ID: <20041112125616.167573440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-12 07:56:15 -0500 (Fri, 12 Nov 2004)
New Revision: 5085

Modified:
   contrib/1.1/subversion/current/specs/subversion.spec
Log:
- BR: gcc-c++


Modified: contrib/1.1/subversion/current/specs/subversion.spec
===================================================================
--- contrib/1.1/subversion/current/specs/subversion.spec	2004-11-12 12:42:54 UTC (rev 5084)
+++ contrib/1.1/subversion/current/specs/subversion.spec	2004-11-12 12:56:15 UTC (rev 5085)
@@ -19,7 +19,7 @@
 BuildPreReq: autoconf, libtool, python, python-devel, texinfo, gettext
 BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5, swig-python, swig-perl
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1
-BuildPreReq: perl-devel
+BuildPreReq: perl-devel, gcc-c++
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %define __perl_requires %{SOURCE3}


From svn at tinysofa.org  Sat Nov 13 13:45:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 13 Nov 2004 08:45:28 -0500 (EST)
Subject: [tinysofa-svn] r5087 - tinysofa/releases/1.1/glibc/current/specs
Message-ID: <20041113134528.37FDF3440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-13 08:45:27 -0500 (Sat, 13 Nov 2004)
New Revision: 5087

Modified:
   tinysofa/releases/1.1/glibc/current/specs/glibc.spec
Log:
- add missing defattr to common


Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec
===================================================================
--- tinysofa/releases/1.1/glibc/current/specs/glibc.spec	2004-11-13 12:52:07 UTC (rev 5086)
+++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec	2004-11-13 13:45:27 UTC (rev 5087)
@@ -1349,6 +1349,7 @@
 %ifnarch %{auxarches}
 #-f common.filelist common
 %files common
+%defattr(-,root,root)
 %{_bindir}/catchsegv
 %{_bindir}/gencat
 %{_bindir}/getconf


From svn at tinysofa.org  Sun Nov 14 17:43:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 14 Nov 2004 12:43:58 -0500 (EST)
Subject: [tinysofa-svn] r5088 - contrib/1.1/subversion/current/specs
Message-ID: <20041114174358.0737A3440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-14 12:43:56 -0500 (Sun, 14 Nov 2004)
New Revision: 5088

Modified:
   contrib/1.1/subversion/current/specs/subversion.spec
Log:
- BR: cyrus-sasl-devel


Modified: contrib/1.1/subversion/current/specs/subversion.spec
===================================================================
--- contrib/1.1/subversion/current/specs/subversion.spec	2004-11-13 13:45:27 UTC (rev 5087)
+++ contrib/1.1/subversion/current/specs/subversion.spec	2004-11-14 17:43:56 UTC (rev 5088)
@@ -19,7 +19,7 @@
 BuildPreReq: autoconf, libtool, python, python-devel, texinfo, gettext
 BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5, swig-python, swig-perl
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1
-BuildPreReq: perl-devel, gcc-c++
+BuildPreReq: perl-devel, cyrus-sasl-devel ,gcc-c++
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %define __perl_requires %{SOURCE3}


From svn at tinysofa.org  Sun Nov 14 17:54:23 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 14 Nov 2004 12:54:23 -0500 (EST)
Subject: [tinysofa-svn] r5089 - tinysofa/releases/1.1/lvm/current/specs
Message-ID: <20041114175423.D74C53440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-14 12:54:23 -0500 (Sun, 14 Nov 2004)
New Revision: 5089

Modified:
   tinysofa/releases/1.1/lvm/current/specs/lvm.spec
Log:
- add tempfile patch

Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec
===================================================================
--- tinysofa/releases/1.1/lvm/current/specs/lvm.spec	2004-11-14 17:43:56 UTC (rev 5088)
+++ tinysofa/releases/1.1/lvm/current/specs/lvm.spec	2004-11-14 17:54:23 UTC (rev 5089)
@@ -8,6 +8,7 @@
 Patch0: lvm-no_nb.patch
 Patch1: lvm-installowner.patch
 Patch2: lvm-1.0.8-kdevt.patch
+Patch3: lvm-1.0.8-tempfile.patch
 License: GPL
 Group: main
 URL: http://www.sistina.com/lvm
@@ -31,6 +32,7 @@
 %patch0 -p2
 %patch1 -p2
 %patch2 -p2
+%patch3 -p2 -b .tempfile~
 
 
 %build
@@ -86,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 14 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- add tempfile patch
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.0.8-9ts
 - current (1.0.8-9jh) integrated as 1.0.8-9ts for release 1.1
 


From svn at tinysofa.org  Sun Nov 14 18:00:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 14 Nov 2004 13:00:02 -0500 (EST)
Subject: [tinysofa-svn] 
	r5090 - tinysofa/releases/1.1/kerberos5/current/specs
Message-ID: <20041114180002.2F5E73440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-14 13:00:01 -0500 (Sun, 14 Nov 2004)
New Revision: 5090

Modified:
   tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec
Log:
- exclude krb5-send-pr script

Modified: tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec
===================================================================
--- tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec	2004-11-14 17:54:23 UTC (rev 5089)
+++ tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec	2004-11-14 18:00:01 UTC (rev 5090)
@@ -71,9 +71,11 @@
 %defattr(-,root,root)
 %attr(755,root,root) %{_bindir}/*
 %{_sbindir}/*
+%exclude %{_sbindir}/krb5-send-pr
 %{_datadir}/gnats
 %{_mandir}/man8/*
 %{_mandir}/man1/*
+%exclude %{_mandir}/man1/krb5-send-pr*
 %{_mandir}/man5/*
 %{_mandir}/man5/.k5login.5*
 
@@ -88,6 +90,9 @@
 
 
 %changelog
+* Sun Nov 14 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- exclude krb5-send-pr script
+
 * Sun Oct 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.3.5-1jh
 - 1.3.5
 - large file support


From svn at tinysofa.org  Sun Nov 14 20:12:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 14 Nov 2004 15:12:25 -0500 (EST)
Subject: [tinysofa-svn] 
	r5091 - in tinysofa/releases/1.1/libtool/current: sources specs
Message-ID: <20041114201225.B914A3440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-14 15:12:23 -0500 (Sun, 14 Nov 2004)
New Revision: 5091

Added:
   tinysofa/releases/1.1/libtool/current/sources/libtool-1.5.10.tar.gz
Removed:
   tinysofa/releases/1.1/libtool/current/sources/libtool-1.5.6.tar.gz
Modified:
   tinysofa/releases/1.1/libtool/current/specs/libtool.spec
Log:
- update to libtool 1.5.10


Added: tinysofa/releases/1.1/libtool/current/sources/libtool-1.5.10.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/libtool/current/sources/libtool-1.5.10.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.1/libtool/current/sources/libtool-1.5.6.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.1/libtool/current/specs/libtool.spec
===================================================================
--- tinysofa/releases/1.1/libtool/current/specs/libtool.spec	2004-11-14 18:00:01 UTC (rev 5090)
+++ tinysofa/releases/1.1/libtool/current/specs/libtool.spec	2004-11-14 20:12:23 UTC (rev 5091)
@@ -1,14 +1,16 @@
 Summary: The GNU libtool, which simplifies the use of shared libraries.
 Name: libtool
-Version: 1.5.6
-Release: 3ts
+Version: 1.5.10
+Release: 1jh
 License: GPL
 Group: development
-Source: ftp://alpha.gnu.org/gnu/libtool-%{version}.tar.gz
-Prefix: %{_prefix}
-PreReq: htmlinfo
-BuildRequires: texinfo libstdc++-devel gcc-c++
-BuildRoot: %{_tmppath}/%{name}-root
+Source:	http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.gz
+URL: http://www.gnu.org/software/libtool/
+PreReq:	autoconf, automake, m4, perl
+BuildRequires: autoconf, automake, texinfo
+Buildrequires:	gcc, gcc-c++, libstdc++-devel, gcc-g77, gcc-java
+Requires: libtool-libs = %{version}-%{release}, mktemp
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 The libtool package contains the GNU libtool, a set of shell scripts
@@ -20,104 +22,304 @@
 If you are developing programs which will use shared libraries, you
 should install libtool.
 
+%package libs
+Summary: Runtime libraries for GNU libtool.
+Group: main
+
+%description libs
+The libtool-libs package contains the runtime libraries from GNU
+libtool.  GNU libtool uses these libraries to provide portable dynamic
+loading of shared libraries.
+
+If you are using some programs that provide shared libraries built
+with GNU libtool, you should install the libtool-libs package to
+provide the dynamic loading library
+
 %prep
-%setup -q
+%setup
 
+
 %build
-./configure --prefix=%{_prefix} 
-make -k -C doc
+export CC=gcc
+export CXX=g++
+export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+%configure
 make
-make -C tests
-cd doc
-makeinfo --html --no-split --force libtool.texi || :
+make check || make check VERBOSE=yes
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/share/html/libtool
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install
-install -m 644 doc/libtool.html $RPM_BUILD_ROOT/usr/share/html/libtool/
+%makeinstall
 
-cd $RPM_BUILD_ROOT
-# XXX remove zero length file
-  rm -f .%{_prefix}/share/libtool/libltdl/stamp-h.in
-# XXX forcibly break hardlinks
-#  mv .%{_prefix}/share/libtool/libltdl .%{_prefix}/share/libtool/libltdl-X
-#  mkdir .%{_prefix}/share/libtool/libltdl
-#  cp .%{_prefix}/share/libtool/libltdl-X/* .%{_prefix}/share/libtool/libltdl
-#  rm -rf .%{_prefix}/share/libtool/libltdl-X
+%nuke_info
 
-rm -rf $RPM_BUILD_ROOT/usr/info
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
-%post
-/usr/sbin/htmlinfo_update.sh
 
-%postun
-/usr/sbin/htmlinfo_update.sh
+%post libs -p /sbin/ldconfig
 
+%postun libs -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING INSTALL NEWS README
-%doc THANKS TODO ChangeLog demo
-%doc doc/*
-%{_prefix}/bin/*
-%{_prefix}/share/html/libtool
-%{_prefix}/include/ltdl.h
-%{_prefix}/lib/libltdl.*
-%{_prefix}/share/libtool
-%{_prefix}/share/aclocal/*
+%doc AUTHORS COPYING INSTALL NEWS README THANKS TODO ChangeLog
+%{_bindir}/*
+%{_includedir}/*
+%{_datadir}/libtool
+%{_libdir}/libltdl.so
+%{_libdir}/libltdl.*a
+%{_datadir}/aclocal/*
 
+%files libs
+%defattr(-,root,root)
+%{_libdir}/libltdl.so.*
+
+
 %changelog
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.5.6-3ts
-- current (1.5.6-3jh) integrated as 1.5.6-3ts for release 1.1
+* Tue Oct 26 2004 Daniel Reed <djr at redhat.com> 1.5.10-1
+- update to the 1.5.10 bugfix release
+  - obsoletes libtool-1.4-nonneg.patch
+  - obsoletes libtool-1.5-libtool.m4-x86_64.patch
+  - obsoletes libtool-1.4.2-multilib.patch
+  - obsoletes libtool-1.4.2-demo.patch
+  - obsoletes libtool-1.5-testfailure.patch
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.5.6-2ts
-- current (1.5.6-1ts) integrated as 1.5.6-2ts for release 1.0-U1
+* Tue Jul  6 2004 Jens Petersen <petersen at redhat.com> - 1.5.6-4
+- improve buildrequires and prereqs
+- buildrequire texinfo (Dawid Gajownik, 126950)
 
-* Tue May 11 2004 Omar Kilani <omar at tinysofa dot org>
-- Add BuildRequires gcc-c++-devel.
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Apr 12 2004 Omar Kilani <omar at tinysofa dot org> 1.5.6-1ts
-- New upstream: 1.5.6.
+* Thu May 13 2004 Thomas Woerner <twoerner at redhat.com> - 1.5.6-2
+- compile libltdl.a PIC
 
-* Mon Apr  5 2004 Omar Kilani <omar at tinysofa dot org> 1.5.4-1ts
-- New upstream: 1.5.4.
+* Mon Apr 12 2004 Jens Petersen <petersen at redhat.com> - 1.5.6-1
+- update to 1.5.6 bugfix release
 
-* Fri Feb  7 2004 Omar Kilani <ok at trustix dot org> 1.5.2-1ok
-- New upstream.
+* Sun Apr  4 2004 Jens Petersen <petersen at redhat.com> - 1.5.4-1
+- 1.5.4 bugfix release
+- improve libtool-1.4.2-multilib.patch (Albert Chin) and only apply to
+  libtool.m4
+- use bootstrap instead of autoreconf to update configuration
+- update libtool-1.4.3-ltmain-SED.patch to libtool-1.5.4-ltmain-SED.patch
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 1.4.3-2tr
-- Big rebuild
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Thu May 22 2003 Erlend Midttun <erlendbm at trustix dot com> 1.4.3-1em
-- New upstream.
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 1.4.2-4em
-- Rebuilt against glibc 2.3.2.
+* Mon Jan 26 2004 Jens Petersen <petersen at redhat.com> - 1.5.2-1
+- update to 1.5.2 bugfix release
+- update libtool-1.5-libtool.m4-x86_64.patch
+- nolonger need libtool-1.5-mktemp.patch, libtool-1.5-expsym-linux.patch,
+  libtool-1.5-readonlysym.patch, libtool-1.5-relink-libdir-order-91110.patch,
+  libtool-1.5-AC_PROG_LD_GNU-quote-v-97608.patch and libtool-1.5-nostdlib.patch
 
-* Fri Oct 25 2002 Christian H. Toldnes <christht at trustix dot com> 1.4.2-3ct
-- Replaced info stuff with htmlinfo
+* Tue Oct 28 2003 Jens Petersen <petersen at redhat.com> - 1.5-8
+- update libtool-1.4.2-multilib.patch to also deal with powerpc64 (#103316)
+  [Joe Orton]
 
-* Thu May 30 2002 Christian H. Toldnes <christht at trustix dot com>
-- Rebuild with -2ct
+* Sun Oct 26 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- rebuild again, Jakub has done a new compiler version number
 
-* Fri Feb 01 2002 Erlend Midttun <erlendbm at trustix dot com>
-- New upstream version.
+* Thu Oct 02 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- rebuild
 
-* Tue Jul 17 2001 Erlend Midttun <erlendbm at trustix dot com>
-- Inc serial number before release.
+* Thu Jul 17 2003 Jens Petersen <petersen at redhat.com> - 1.5-5
+- bring back libtool-1.4.2-demo.patch to disable nopic tests on amd64 
+  and s390x again
 
-* Thu Sep 14 2000 Per Ivar Paulsen <perp at trustix dot com>
-- Picked up 1.3.5
+* Tue Jul 15 2003 Owen Taylor <otaylor at redhat.com>
+- Fix misapplied chunk for expsym-linux patch
 
-* Sun Feb 27 2000 Lars Gaarden <larsg at trustix dot com>
-- Moved info-file to /usr/share/info
+* Tue Jul  8 2003 Jens Petersen <petersen at redhat.com> - 1.5-4
+- remove the quotes around LD in AC_PROG_LD_GNU (#97608)
+  [reported by twaugh]
+- use -nostdlib also when linking with g++ and non-GNU ld in
+  _LT_AC_LANG_CXX_CONFIG [reported by fnasser, patch by aoliva]
+- use %%configure with CC and CXX set 
 
-* Mon Feb 14 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Repackaged for Trustix
+* Thu Jun 12 2003 Jens Petersen <petersen at redhat.com> - 1.5-3
+- don't use %%configure since target options caused libtool to assume
+  i386-redhat-linux-gcc instead of gcc for CC (reported by Joe Orton)
+- add libtool-1.5-relink-libdir-order-91110.patch to fix order of lib dirs
+  searched when relinking (#91110) [patch from Joe Orton]
 
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu May  1 2003 Jens Petersen <petersen at redhat.com> - 1.5-1
+- update to 1.5
+- no longer override config.{guess,sub} for rpmbuild %%configure,
+  redhat-rpm-config owns those now
+- update and rename libtool-1.4.2-s390_x86_64.patch to
+  libtool-1.5-libtool.m4-x86_64.patch since s390 now included
+- buildrequire autoconf and automake, no longer automake14
+- skip make check on s390 temporarily
+- no longer skip demo-nopic.test on x86_64, s390 and s390x
+- from Owen Taylor
+  - add libtool-1.4.2-expsym-linux.patch (#55607) [from James Henstridge]
+  - add quoting in mktemp patch
+  - add libtool-1.5-readonlysym.patch
+  - add libtool-1.5-testfailure.patch workaround
+  - no longer need libtool-1.4.2-relink-58664.patch
+
+* Sat Feb 08 2003 Florian La Roche <Florian.LaRoche at redhat.de> - 1.4.3-5
+- add config.guess and config.sub, otherwise old versions of
+  these files can creep into /usr/share/libtool/
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Mon Jan 13 2003 Jens Petersen <petersen at redhat.com> 1.4.3-3
+- fix mktemp to work when running mktemp fails (#76602)
+  [reported by (Oron Peled)]
+- remove info dir file, don't exclude it
+- fix typo in -libs description (#79619)
+- use buildroot instead of RPM_BUILD_ROOT
+
+* Tue Jan 07 2003 Karsten Hopp <karsten at redhat.de> 1.4.3-2.2
+- use lib64 on s390x, too.
+
+* Thu Dec  5 2002 Jens Petersen <petersen at redhat.com>
+- add comment to explain why we use an old Automake for building
+- buildrequire automake14
+
+* Sat Nov 23 2002 Jens Petersen <petersen at redhat.com>
+- add --without check build option to allow disabling of "make check"
+- exclude info dir file rather than removing
+
+* Sat Nov 23 2002 Jens Petersen <petersen at redhat.com> 1.4.3-2
+- define SED in ltmain.sh for historic ltconfig files
+- define macro AUTOTOOLS to hold automake-1.4 and aclocal-1.4, and use it
+- leave old missing file for now
+- general spec file cleanup
+  - don't copy install files to demo nor mess with installed ltdl files
+  - don't need to run make in doc
+  - force removal of info dir file
+  - don't need to create install prefix dir
+  - don't bother gzipping info files ourselves
+
+* Mon Nov 18 2002 Jens Petersen <petersen at redhat.com> 1.4.3-1
+- update to 1.4.3
+- remove obsolete patches (test-quote, dup-deps, libtoolize-configure.ac)
+- apply the multilib patch to just the original config files
+- update x86_64/s390 patch and just apply to original config files
+- use automake-1.4 in "make check" for demo-make.test to pass!
+- remove info dir file that is not installed
+- make autoreconf update missing
+
+* Mon Oct 07 2002 Phil Knirsch <pknirsch at redhat.com>  1.4.2-12.2
+- Added s390x and x64_64 support.
+
+* Fri Oct  4 2002 Nalin Dahyabhai <nalin at redhat.com> 1.4.2-12.1
+- rebuild
+
+* Fri Sep 13 2002 Nalin Dahyabhai <nalin at redhat.com>
+- patch to find the proper libdir on multilib boxes
+ 
+* Mon Aug 19 2002 Jens Petersen <petersen at redhat.com> 1.4.2-12
+- don't include demo in doc, specially now that we "make check" (#71609)
+
+* Tue Aug 13 2002 Jens Petersen <petersen at redhat.com> 1.4.2-11
+- don't hardcode "configure.in" in libtoolize (#70864)
+  [reported by bastiaan at webcriminals.com]
+- make check, but not on ia64
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 1.4.2-10
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com> 1.4.2-9
+- automated rebuild
+
+* Fri Apr 26 2002 Jens Petersen <petersen at redhat.com> 1.4.2-8
+- add old patch from aoliva to fix relinking when installing into a buildroot
+- backport dup-deps fix from cvs stable branch
+
+* Wed Mar 27 2002 Jens Petersen <petersen at redhat.com> 1.4.2-7
+- run ldconfig in postin and postun
+
+* Thu Feb 28 2002 Jens Petersen <petersen at redhat.com> 1.4.2-6
+- rebuild in new environment
+
+* Tue Feb 12 2002 Jens Petersen <petersen at redhat.com> 1.4.2-5
+- revert filemagic and archive-shared patches following cvs (#54887)
+- don't change "&& test" to "-a" in ltmain.in
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com> 1.4.2-4
+- automated rebuild
+
+* Mon Dec  3 2001 Jens Petersen <petersen at redhat.com> 1.4.2-3
+- test quoting patch should be on ltmain.in not ltmain.sh (#53276)
+- use file_magic for Linux ELF (#54887)
+- allow link against an archive when building a shared library (#54887)
+- include ltdl.m4 in manifest (#56671)
+
+* Wed Oct 24 2001 Jens Petersen <petersen at redhat.com> 1.4.2-2
+- added URL to spec
+
+* Tue Sep 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.4.2-1
+- 1.4.2 - sync up with autoconf...
+
+* Thu Jul  5 2001 Bernhard Rosenkraenzer <bero at redhat.de> 1.4-8
+- extend s390 patch to 2 more files
+- s/Copyright/License/
+
+* Wed Jul 04 2001 Karsten Hopp <karsten at redhat.de>
+- add s390 patch for deplibs_check_method=pass_all
+
+* Tue Jun 12 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- add patches from Tim Waugh #42724
+
+* Mon Jun 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- add patches from cvs mainline
+
+* Thu Jun 07 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- fix a "test" bug in ltmain.sh
+
+* Sun Jun 03 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- disable the post commands to modify /usr/share/doc/
+
+* Sat May 12 2001 Owen Taylor <otaylor at redhat.com>
+- Require automake 1.4p1
+
+* Wed May 09 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to libtool 1.4
+- adjust or remove patches
+
+* Thu Jul 13 2000 Elliot Lee <sopwith at redhat.com>
+- Fix recognition of ^0[0-9]+$ as a non-negative integer.
+
+* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Fri Jul  7 2000 Nalin Dahyabhai <nalin at redhat.com>
+- patch to use mktemp to create the tempdir
+- use %%configure after defining __libtoolize to /bin/true
+
+* Mon Jul  3 2000 Matt Wilson <msw at redhat.com>
+- subpackage libltdl into libtool-libs
+
+* Sun Jun 18 2000 Bill Nottingham <notting at redhat.com>
+- running libtoolize on the libtool source tree ain't right :)
+
+* Mon Jun  5 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging.
+
+* Thu Jun  1 2000 Nalin Dahyabhai <nalin at redhat.com>
+- update to 1.3.5.
+
+* Fri Mar  3 2000 Jeff Johnson <jbj at redhat.com>
+- add prereqs for m4 and perl inorder to run autoconf/automake.
+
+* Mon Feb 28 2000 Jeff Johnson <jbj at redhat.com>
+- functional /usr/doc/libtool-*/demo by end-user %post procedure (#9719).
+
 * Wed Dec 22 1999 Jeff Johnson <jbj at redhat.com>
 - update to 1.3.4.
 


From svn at tinysofa.org  Sun Nov 14 20:14:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 14 Nov 2004 15:14:40 -0500 (EST)
Subject: [tinysofa-svn] 
	r5092 - in tinysofa/releases/1.1: busybox/current/sources
	lvm/current/sources
Message-ID: <20041114201440.0AF3F3440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-14 15:14:39 -0500 (Sun, 14 Nov 2004)
New Revision: 5092

Added:
   tinysofa/releases/1.1/busybox/current/sources/busybox-1.00.tar.bz2
   tinysofa/releases/1.1/lvm/current/sources/lvm-1.0.8-tempfile.patch
Log:
- add missing lvm-1.0.8-tempfile.patch
- add missing busybox-1.00.tar.bz2


Added: tinysofa/releases/1.1/busybox/current/sources/busybox-1.00.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/busybox/current/sources/busybox-1.00.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.1/lvm/current/sources/lvm-1.0.8-tempfile.patch
===================================================================
--- tinysofa/releases/1.1/lvm/current/sources/lvm-1.0.8-tempfile.patch	2004-11-14 20:12:23 UTC (rev 5091)
+++ tinysofa/releases/1.1/lvm/current/sources/lvm-1.0.8-tempfile.patch	2004-11-14 20:14:39 UTC (rev 5092)
@@ -0,0 +1,14 @@
+diff -ur LVM.orig/1.0.8/tools/lvmcreate_initrd LVM/1.0.8/tools/lvmcreate_initrd
+--- LVM.orig/1.0.8/tools/lvmcreate_initrd	2003-11-17 16:58:56.000000000 +0100
++++ LVM/1.0.8/tools/lvmcreate_initrd	2004-09-13 12:07:23.000000000 +0200
+@@ -233,6 +233,10 @@
+ # run out of room on the ramdisk while stripping the libraries.
+ echo "$cmd -- stripping shared libraries"
+ mkdir $TMPLIB
++if [ $? -ne 0 ]; then
++   echo "$cmd -- ERROR making $TMPLIB"
++   cleanup 1
++fi
+ for LIB in $SHLIBS; do
+    verbose "copy $LIB to $TMPLIB$LIB"
+    mkdir -p `dirname $TMPLIB$LIB`


From svn at tinysofa.org  Sun Nov 14 22:15:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 14 Nov 2004 17:15:44 -0500 (EST)
Subject: [tinysofa-svn] 
	r5093 - in tinysofa/releases/1.1/openssl/current: sources specs
Message-ID: <20041114221544.2C6CD3440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-14 17:15:43 -0500 (Sun, 14 Nov 2004)
New Revision: 5093

Added:
   tinysofa/releases/1.1/openssl/current/sources/Makefile.certificate
   tinysofa/releases/1.1/openssl/current/sources/make-dummy-cert
   tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7c-CAN-2004-0112.patch
   tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7e-Configure.patch
   tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7e.tar.gz
   tinysofa/releases/1.1/openssl/current/sources/swig-1.3.22.tar.gz
Removed:
   tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7d.tar.gz
   tinysofa/releases/1.1/openssl/current/sources/swig-1.3.21.tar.gz
Modified:
   tinysofa/releases/1.1/openssl/current/specs/openssl.spec
Log:
- update to openssl 0.9.7e and swig 1.3.22
- add Makefile and make-dummy-certs to ease dummy certificate creation
- don't use no-asm and 386 flags


Added: tinysofa/releases/1.1/openssl/current/sources/Makefile.certificate
===================================================================
--- tinysofa/releases/1.1/openssl/current/sources/Makefile.certificate	2004-11-14 20:14:39 UTC (rev 5092)
+++ tinysofa/releases/1.1/openssl/current/sources/Makefile.certificate	2004-11-14 22:15:43 UTC (rev 5093)
@@ -0,0 +1,65 @@
+.PHONY: usage
+.SUFFIXES: .key .csr .crt .pem
+.PRECIOUS: %.key %.csr %.crt %.pem
+
+usage:
+	@echo "This makefile allows you to create:"
+	@echo "  o public/private key pairs"
+	@echo "  o SSL certificate signing requests (CSRs)"
+	@echo "  o self-signed SSL test certificates"
+	@echo
+	@echo "To create a key pair, run \"make SOMETHING.key\"."
+	@echo "To create a CSR, run \"make SOMETHING.csr\"."
+	@echo "To create a test certificate, run \"make SOMETHING.crt\"."
+	@echo "To create a key and a test certificate in one file, run \"make SOMETHING.pem\"."
+	@echo
+	@echo "To create a key for use with Apache, run \"make genkey\"."
+	@echo "To create a CSR for use with Apache, run \"make certreq\"."
+	@echo "To create a test certificate for use with Apache, run \"make testcert\"."
+	@echo
+	@echo Examples:
+	@echo "  make server.key"
+	@echo "  make server.csr"
+	@echo "  make server.crt"
+	@echo "  make stunnel.pem"
+	@echo "  make genkey"
+	@echo "  make certreq"
+	@echo "  make testcert"
+
+%.pem:
+	umask 77 ; \
+	PEM1=`/bin/mktemp /tmp/openssl.XXXXXX` ; \
+	PEM2=`/bin/mktemp /tmp/openssl.XXXXXX` ; \
+	/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 -nodes -x509 -days 365 -out $$PEM2 ; \
+	cat $$PEM1 >  $@ ; \
+	echo ""    >> $@ ; \
+	cat $$PEM2 >> $@ ; \
+	$(RM) $$PEM1 $$PEM2
+
+%.key:
+	umask 77 ; \
+	/usr/bin/openssl genrsa -des3 1024 > $@
+
+%.csr: %.key
+	umask 77 ; \
+	/usr/bin/openssl req -new -key $^ -out $@
+
+%.crt: %.key
+	umask 77 ; \
+	/usr/bin/openssl req -new -key $^ -x509 -days 365 -out $@
+
+KEY=/etc/httpd/conf/ssl.key/server.key
+CSR=/etc/httpd/conf/ssl.csr/server.csr
+CRT=/etc/httpd/conf/ssl.crt/server.crt
+
+genkey: $(KEY)
+certreq: $(CSR)
+testcert: $(CRT)
+
+$(CSR): $(KEY)
+	umask 77 ; \
+	/usr/bin/openssl req -new -key $(KEY) -out $(CSR)
+
+$(CRT): $(KEY)
+	umask 77 ; \
+	/usr/bin/openssl req -new -key $(KEY) -x509 -days 365 -out $(CRT)

Added: tinysofa/releases/1.1/openssl/current/sources/make-dummy-cert
===================================================================
--- tinysofa/releases/1.1/openssl/current/sources/make-dummy-cert	2004-11-14 20:14:39 UTC (rev 5092)
+++ tinysofa/releases/1.1/openssl/current/sources/make-dummy-cert	2004-11-14 22:15:43 UTC (rev 5093)
@@ -0,0 +1,28 @@
+#!/bin/sh
+umask 077
+
+answers() {
+	echo --
+	echo SomeState
+	echo SomeCity
+	echo SomeOrganization
+	echo SomeOrganizationalUnit
+	echo localhost.localdomain
+	echo root at localhost.localdomain
+}
+
+if [ $# -eq 0 ] ; then
+	echo $"Usage: `basename $0` filename [...]"
+	exit 0
+fi
+
+for target in $@ ; do
+	PEM1=`/bin/mktemp /tmp/openssl.XXXXXX`
+	PEM2=`/bin/mktemp /tmp/openssl.XXXXXX`
+	trap "rm -f $PEM1 $PEM2" SIGINT
+	answers | /usr/bin/openssl req -newkey rsa:1024 -keyout $PEM1 -nodes -x509 -days 365 -out $PEM2 2> /dev/null
+	cat $PEM1 >  ${target}
+	echo ""   >> ${target}
+	cat $PEM2 >> ${target}
+	rm -f $PEM1 $PEM2
+done


Property changes on: tinysofa/releases/1.1/openssl/current/sources/make-dummy-cert
___________________________________________________________________
Name: svn:executable
   + *

Added: tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7c-CAN-2004-0112.patch
===================================================================
--- tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7c-CAN-2004-0112.patch	2004-11-14 20:14:39 UTC (rev 5092)
+++ tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7c-CAN-2004-0112.patch	2004-11-14 22:15:43 UTC (rev 5093)
@@ -0,0 +1,32 @@
+diff -ur -x CVS openssl7/ssl/s3_srvr.c ossl7/ssl/s3_srvr.c
+--- openssl7/ssl/s3_srvr.c	2004-01-14 23:02:49.000000000 +0000
++++ ossl7/ssl/s3_srvr.c	2004-02-19 13:22:16.000000000 +0000
+@@ -1588,11 +1591,27 @@
+ 
+ 		n2s(p,i);
+ 		enc_ticket.length = i;
++
++		if (n < enc_ticket.length + 6)
++			{
++			SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
++				SSL_R_DATA_LENGTH_TOO_LONG);
++			goto err;
++			}
++
+ 		enc_ticket.data = (char *)p;
+ 		p+=enc_ticket.length;
+ 
+ 		n2s(p,i);
+ 		authenticator.length = i;
++
++		if (n < enc_ticket.length + authenticator.length + 6)
++			{
++			SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
++				SSL_R_DATA_LENGTH_TOO_LONG);
++			goto err;
++			}
++
+ 		authenticator.data = (char *)p;
+ 		p+=authenticator.length;
+ 
+

Deleted: tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7d.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7e-Configure.patch
===================================================================
--- tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7e-Configure.patch	2004-11-14 20:14:39 UTC (rev 5092)
+++ tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7e-Configure.patch	2004-11-14 22:15:43 UTC (rev 5093)
@@ -0,0 +1,144 @@
+--- openssl-0.9.7e/Configure.Configure	2004-10-01 14:34:28.000000000 +0300
++++ openssl-0.9.7e/Configure	2004-11-11 16:29:07.393653432 +0200
+@@ -168,7 +168,7 @@
+ # surrounds it with #APP #NO_APP comment pair which (at least Solaris
+ # 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"
+ # error message.
+-"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -march=i586 -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ #### Solaris x86 with Sun C setups
+ "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -203,15 +203,15 @@
+ "debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ #### SPARC Linux setups
+-"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
++"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
+ # Ray Miller <ray.miller at computing-services.oxford.ac.uk> has patiently
+ # assisted with debugging of following two configs.
+-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-sparcv8","gcc:-DB_ENDIAN -DTERMIO -Wall -DBN_DIV2W \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # it's a real mess with -mcpu=ultrasparc option under Linux, but
+ # -Wa,-Av8plus should do the trick no matter what.
+-"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall -DBN_DIV2W \$(RPM_OPT_FLAGS)::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # GCC 3.1 is a requirement
+-"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux64-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # Sunos configs, assuming sparc for the gcc one.
+ ##"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:::",
+@@ -322,7 +322,7 @@
+ "MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):MPE:-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
+ 
+ #### PARISC Linux setups
+-"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
++"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -Wall -DBN_DIV2W \$(RPM_OPT_FLAGS)::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
+ 
+ # Dec Alpha, OSF/1 - the alpha164-cc is historical, for the conversion
+ # from the older DEC C Compiler to the newer compiler.  It's now the
+@@ -372,8 +372,8 @@
+ #
+ #					<appro at fy.chalmers.se>
+ #
+-"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-alpha-gcc","gcc:-DL_ENDIAN -DTERMIO -mcpu=ev5 \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-alpha+bwx-gcc","gcc:-DL_ENDIAN -DTERMIO -mcpu=ev5 \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+ "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+ 
+@@ -382,33 +382,33 @@
+ 
+ # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
+ # bn86-elf.o file file since it is hand tweaked assembler.
+-"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-pentium",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-ppro",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-k6",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=k6 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
+-"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
+-"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+-"linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
+-"linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-s390x",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-pentium",	"gcc:-DL_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ppro",	"gcc:-DL_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-k6",	"gcc:-DL_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
++"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
++"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
++"linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT:::BN_LLONG::",
++"linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-s390x",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS) -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -march=i586 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i586 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+-"bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown):::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
+-"bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i586 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
++"bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -march=i586::(unknown):::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
++"bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i586 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+ "nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+ 
+@@ -422,7 +422,7 @@
+ "qnx6",	"cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",
+ 
+ # Linux on ARM
+-"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -Wall  \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # SCO/Caldera targets.
+ #
+@@ -439,7 +439,7 @@
+ "unixware-2.0","cc:-DFILIO_H -DNO_STRINGS_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
+ "unixware-2.1","cc:-O -DFILIO_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
+ "unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=i586 -Wall::-D_REENTRANT::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "OpenUNIX-8","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "OpenUNIX-8-gcc","gcc:-O -DFILIO_H -fomit-frame-pointer::-pthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "sco3-gcc",  "gcc:-O3 -fomit-frame-pointer -Dssize_t=int -DNO_SYS_UN_H::(unknown)::-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ...
+@@ -522,7 +522,7 @@
+ "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
+ 
+ # Cygwin
+-"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
++"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i586 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
+ "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:::.dll",
+ 
+ # DJGPP
+@@ -559,7 +559,7 @@
+ "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
+ 
+ ##### GNU Hurd
+-"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
++"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i586 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
+ 
+ ##### OS/2 EMX
+ "OS2-EMX", "gcc::::::::",

Added: tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7e.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7e.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.1/openssl/current/sources/swig-1.3.21.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/openssl/current/sources/swig-1.3.22.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/openssl/current/sources/swig-1.3.22.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec
===================================================================
--- tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-11-14 20:14:39 UTC (rev 5092)
+++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-11-14 22:15:43 UTC (rev 5093)
@@ -1,25 +1,28 @@
 Summary: Secure Sockets Layer communications libs & utils
 Name: openssl
 %define majorver 0.9.7
-Version: %{majorver}d
+Version: %{majorver}e
 Release: 1jh
 License: BSD-like
 Group: main
 %define m2crypto_version 0.13.1
-%define swig_version 1.3.21
+%define swig_version 1.3.22
 Source: http://www.openssl.org/source/openssl-%{version}.tar.gz
 Source1: http://download.sourceforge.net/swig/swig-%{swig_version}.tar.gz
 Source2: m2crypto-%{m2crypto_version}.tar.bz2
+Source3: Makefile.certificate
+Source4: make-dummy-cert
 Patch1: openssl-0.9.7-m2crypto-0.09-types.patch
 Patch2: openssl-0.9.7-perl.patch
 Patch3: openssl-0.9.7-man.patch
 Patch4: openssl-0.9.7-include.patch
 Patch5: openssl-0.9.7c-CAN-2004-0079.patch
-Patch6: openssl-0.9.7c-Configure.patch
+Patch6: openssl-0.9.7e-Configure.patch
 Provides: SSL libssl.so libssl.so.0 libcrypto.so.0
 URL: http://www.openssl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python, python-devel, perl, zlib-devel, autoconf, grep
+BuildRequires: automake libtool
 
 %description
 A C library that provides various crytographic algorithms and protocols,
@@ -46,6 +49,8 @@
 Group: extra
 Requires: python, openssl = %{version}-%{release}, libstdc++
 BuildRequires: libstdc++-devel gcc-c++
+AutoReq: false
+
 %description python
 This package allows you to call OpenSSL functions from python scripts.
 
@@ -78,9 +83,6 @@
 sslarch=%{_os}-%{_arch}
 %ifarch %ix86
 sslarch=linux-elf
-if ! echo %{_target} | grep -q i686 ; then
-        sslflags="no-asm 386"
-fi
 %endif
 %ifarch x86_64
 sslarch=linux-x86_64
@@ -97,8 +99,9 @@
 	${sslarch}
 
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
+make depend
 %make
-%make do_linux-shared
+
 make rehash
 make test
 
@@ -108,14 +111,13 @@
 	pushd $shlib
 		objs=`ar t ../lib${shlib}.a | xargs -n 1 find . -name`
 		%{__cc} -shared -o ../lib${shlib}.so.%{version} \
-			-Wl,-soname=lib${shlib}.so.${majorver} $objs && \
-		ln -sf lib${shlib}.so.%{version} ../lib${shlib}.so
+			-Wl,-soname=lib${shlib}.so.${majorver} $objs
 	popd
 done
 
 # Build a copy of swig with which to build the extensions.
 pushd SWIG-%{swig_version}
-autoconf
+./autogen.sh
 CFLAGS="%{optflags}" \
 CCFLAGS="%{optflags}" \
 FFLAGS="%{optflags}" \
@@ -152,6 +154,9 @@
 install -m 644 libcrypto.a $RPM_BUILD_ROOT/%{_libdir}
 install -m 644 libssl.a $RPM_BUILD_ROOT/%{_libdir}
 
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs/Makefile
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs/make-dummy-cert
+
 if [ "/usr/lib" != "%{_libdir}" ]; then
 	%{__mv} %{buildroot}/usr/lib/* %{buildroot}/%{_libdir}
 	rmdir %{buildroot}/usr/lib/
@@ -222,7 +227,7 @@
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssl/openssl.cnf
 %dir %{_sysconfdir}/ssl
 %dir %{_sysconfdir}/ssl/private
-%dir %{_sysconfdir}/ssl/certs
+%{_sysconfdir}/ssl/certs
 %{_mandir}/man1/*
 
 %files support
@@ -235,6 +240,7 @@
 %{_bindir}/c_name
 %exclude %{_bindir}/der_chop
 %{_bindir}/c_rehash
+%{_bindir}/openssl_fips_fingerprint
 		
 %files devel
 %defattr(-,root,root)
@@ -254,6 +260,11 @@
 
 
 %changelog
+* Sun Nov 14 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.9.7e-1jh
+- update to openssl 0.9.7e and swig 1.3.22
+- add Makefile and make-dummy-certs to ease dummy certificate creation
+- don't use no-asm and 386 flags
+
 * Mon Nov  1 2004 Jaakko Heinonen <jh at tinysofa dot org>
 - multilib fixes
 


From svn at tinysofa.org  Sun Nov 14 22:15:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 14 Nov 2004 17:15:50 -0500 (EST)
Subject: [tinysofa-svn] r5094 - tinysofa/releases/1.1/httpd/current/specs
Message-ID: <20041114221550.C566E3440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-14 17:15:50 -0500 (Sun, 14 Nov 2004)
New Revision: 5094

Modified:
   tinysofa/releases/1.1/httpd/current/specs/httpd.spec
Log:
- fix openssl location


Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec
===================================================================
--- tinysofa/releases/1.1/httpd/current/specs/httpd.spec	2004-11-14 22:15:43 UTC (rev 5093)
+++ tinysofa/releases/1.1/httpd/current/specs/httpd.spec	2004-11-14 22:15:50 UTC (rev 5094)
@@ -348,7 +348,7 @@
   install -m 644 $RPM_SOURCE_DIR/mod_ssl-Makefile.${ext} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/ssl.${ext}/Makefile.${ext}
 done
-ln -s ../../../usr/share/ssl/certs/Makefile $RPM_BUILD_ROOT/etc/httpd/conf
+ln -s ../../../etc/ssl/certs/Makefile $RPM_BUILD_ROOT/etc/httpd/conf
 
 # for holding mod_dav lock database
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav


From svn at tinysofa.org  Sun Nov 14 22:22:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 14 Nov 2004 17:22:03 -0500 (EST)
Subject: [tinysofa-svn] r5095 - tinysofa/releases/1.1/dovecot/current/specs
Message-ID: <20041114222203.635663440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-14 17:22:02 -0500 (Sun, 14 Nov 2004)
New Revision: 5095

Modified:
   tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec
Log:
- fix openssl location


Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec
===================================================================
--- tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec	2004-11-14 22:15:50 UTC (rev 5094)
+++ tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec	2004-11-14 22:22:02 UTC (rev 5095)
@@ -37,7 +37,7 @@
 %build
 %configure \
 	--with-ssl=openssl \
-	--with-ssldir=/usr/share/ssl \
+	--with-ssldir=%{_sysconfdir}/ssl \
 	--with-ldap
 
 %make
@@ -50,7 +50,7 @@
 	%{buildroot}%{_sysconfdir} \
 	%{buildroot}%{_initrddir} \
 	%{buildroot}%{_sysconfdir}/pam.d \
-	%{buildroot}%{_datadir}/ssl/{certs,private} \
+	%{buildroot}%{_sysconfdir}/ssl/{certs,private} \
 	%{buildroot}%{_localstatedir}/run/dovecot \
 	%{buildroot}%{_localstatedir}/run/dovecot-login
 
@@ -62,8 +62,8 @@
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/dovecot
 
 # generate ghost .pem file
-touch %{buildroot}%{_datadir}/ssl/{certs,private}/dovecot.pem
-chmod 600 %{buildroot}%{_datadir}/ssl/{certs,private}/dovecot.pem
+touch %{buildroot}%{_sysconfdir}/ssl/{certs,private}/dovecot.pem
+chmod 600 %{buildroot}%{_sysconfdir}/ssl/{certs,private}/dovecot.pem
 
 # the dovecot make install installs docs.  blah.
 rm -rf %{buildroot}%{_docdir}/%{name}
@@ -78,8 +78,8 @@
 %service_post dovecot
 
 # create a ssl cert
-if [ ! -f %{_datadir}/ssl/certs/dovecot.pem ]; then
-	pushd %{_datadir}/ssl &>/dev/null
+if [ ! -f %{_sysconfdir}/ssl/certs/dovecot.pem ]; then
+	pushd %{_sysconfdir}/ssl &>/dev/null
 	umask 077
 	cat << EOF | openssl req -new -x509 -days 365 -nodes -out certs/dovecot.pem -keyout private/dovecot.pem &>/dev/null
 --
@@ -117,8 +117,8 @@
 %config(noreplace) %{_sysconfdir}/dovecot.conf
 %config %{_initrddir}/dovecot
 %config %{_sysconfdir}/pam.d/dovecot
-%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_datadir}/ssl/certs/dovecot.pem
-%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_datadir}/ssl/private/dovecot.pem
+%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssl/certs/dovecot.pem
+%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssl/private/dovecot.pem
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/*
 %{_sbindir}/dovecot


From svn at tinysofa.org  Mon Nov 15 06:22:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 01:22:35 -0500 (EST)
Subject: [tinysofa-svn] 
	r5096 - in tinysofa/releases/1.1/db4/current: sources specs
Message-ID: <20041115062235.C45903440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 01:22:34 -0500 (Mon, 15 Nov 2004)
New Revision: 5096

Added:
   tinysofa/releases/1.1/db4/current/sources/db-4.2.52-disable-pthreadsmutexes.patch
   tinysofa/releases/1.1/db4/current/sources/db_stat_wrapper
Modified:
   tinysofa/releases/1.1/db4/current/specs/db4.spec
Log:
- fix mutex usage with non-nptl version

Added: tinysofa/releases/1.1/db4/current/sources/db-4.2.52-disable-pthreadsmutexes.patch
===================================================================
--- tinysofa/releases/1.1/db4/current/sources/db-4.2.52-disable-pthreadsmutexes.patch	2004-11-14 22:22:02 UTC (rev 5095)
+++ tinysofa/releases/1.1/db4/current/sources/db-4.2.52-disable-pthreadsmutexes.patch	2004-11-15 06:22:34 UTC (rev 5096)
@@ -0,0 +1,75 @@
+--- db-4.2.52/dist/aclocal/options.ac.orig	2003-11-17 21:58:48.000000000 +0200
++++ db-4.2.52/dist/aclocal/options.ac	2004-05-04 01:58:26.420494088 +0300
+@@ -137,6 +137,16 @@
+ 	[db_cv_mingw="$enable_mingw"], [db_cv_mingw="no"])
+ AC_MSG_RESULT($db_cv_mingw)
+ 
++AC_MSG_CHECKING(if --disable-pthreadsmutexes option specified)
++AC_ARG_ENABLE(pthreadsmutexes,
++	AC_HELP_STRING([--disable-pthreadsmutexes],
++	    [Do not use POSIX pthreads mutexes.]),, enableval="yes")
++db_cv_pthreadsmutexes="$enableval"
++case "$enableval" in
++ no) AC_MSG_RESULT(yes);;
++yes) AC_MSG_RESULT(no);;
++esac
++
+ AC_MSG_CHECKING(if --enable-posixmutexes option specified)
+ AC_ARG_ENABLE(posixmutexes,
+ 	[AC_HELP_STRING([--enable-posixmutexes],
+--- db-4.2.52/dist/aclocal/mutex.ac.orig	2003-06-16 17:54:39.000000000 +0300
++++ db-4.2.52/dist/aclocal/mutex.ac	2004-05-04 02:07:52.189484128 +0300
+@@ -198,28 +198,31 @@
+ # Try with and without the -lpthread library.  If the user specified we use
+ # POSIX pthreads mutexes, and we fail to find the full interface, try and
+ # configure for just intra-process support.
+-if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
+-	AM_PTHREADS_SHARED("POSIX/pthreads")
+-fi
+-if test "$db_cv_mutex" = no -o \
+-    "$db_cv_mutex" = "posix_only" -o "$db_cv_mutex" = "posix_library_only"; then
+-	LIBS="$LIBS -lpthread"
+-	AM_PTHREADS_SHARED("POSIX/pthreads/library")
+-	LIBS="$orig_libs"
+-fi
+-if test "$db_cv_mutex" = "posix_only"; then
+-	AM_PTHREADS_PRIVATE("POSIX/pthreads/private")
+-fi
+-if test "$db_cv_mutex" = "posix_only" -o \
+-    "$db_cv_mutex" = "posix_library_only"; then
+-	LIBS="$LIBS -lpthread"
+-	AM_PTHREADS_PRIVATE("POSIX/pthreads/library/private")
+-	LIBS="$orig_libs"
+-fi
+-
+-if test "$db_cv_mutex" = "posix_only" -o \
+-    "$db_cv_mutex" = "posix_library_only"; then
+-	AC_MSG_ERROR([unable to find POSIX 1003.1 mutex interfaces])
++if test "$db_cv_pthreadsmutexes" = yes; then
++	if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
++		AM_PTHREADS_SHARED("POSIX/pthreads")
++	fi
++	if test "$db_cv_mutex" = no -o \
++	    "$db_cv_mutex" = "posix_only" -o \
++	    "$db_cv_mutex" = "posix_library_only"; then
++		LIBS="$LIBS -lpthread"
++		AM_PTHREADS_SHARED("POSIX/pthreads/library")
++		LIBS="$orig_libs"
++	fi
++	if test "$db_cv_mutex" = "posix_only"; then
++		AM_PTHREADS_PRIVATE("POSIX/pthreads/private")
++	fi
++	if test "$db_cv_mutex" = "posix_only" -o \
++	    "$db_cv_mutex" = "posix_library_only"; then
++		LIBS="$LIBS -lpthread"
++		AM_PTHREADS_PRIVATE("POSIX/pthreads/library/private")
++		LIBS="$orig_libs"
++	fi
++
++	if test "$db_cv_mutex" = "posix_only" -o \
++	    "$db_cv_mutex" = "posix_library_only"; then
++		AC_MSG_ERROR([unable to find POSIX 1003.1 mutex interfaces])
++	fi
+ fi
+ 
+ # msemaphore: HPPA only

Added: tinysofa/releases/1.1/db4/current/sources/db_stat_wrapper
===================================================================
--- tinysofa/releases/1.1/db4/current/sources/db_stat_wrapper	2004-11-14 22:22:02 UTC (rev 5095)
+++ tinysofa/releases/1.1/db4/current/sources/db_stat_wrapper	2004-11-15 06:22:34 UTC (rev 5096)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if getconf GNU_LIBPTHREAD_VERSION | grep -Eq '^NPTL'; then
+    if test -x @BINDIR@/@DB_STAT_NAME at .tls; then
+	exec @BINDIR@/@DB_STAT_NAME at .tls $*
+    fi
+fi
+
+exec @BINDIR@/@DB_STAT_NAME at .nontls $*

Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec
===================================================================
--- tinysofa/releases/1.1/db4/current/specs/db4.spec	2004-11-14 22:22:02 UTC (rev 5095)
+++ tinysofa/releases/1.1/db4/current/specs/db4.spec	2004-11-15 06:22:34 UTC (rev 5096)
@@ -13,15 +13,17 @@
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
 Version: 4.2.52
-Release: 4ts
+Release: 5jh
 Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz
 Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz
 Source2: nptl-abi-note.S
+Source3: db_stat_wrapper
 Patch0: db-4.1.25-no-jni-includes.patch
 Patch1: db-4.2.52-java.patch
 Patch2: patch.4.2.52.1
 Patch3: patch.4.2.52.2
 Patch4: db-4.2.52-gcj.patch
+Patch5: db-4.2.52-disable-pthreadsmutexes.patch
 Patch10: http://www.sleepycat.com/update/1.85/patch.1.1
 Patch11: http://www.sleepycat.com/update/1.85/patch.1.2
 Patch12: http://www.sleepycat.com/update/1.85/patch.1.3
@@ -95,6 +97,7 @@
 %patch2 -p0 -b .4.2.52.1
 %patch3 -p0 -b .4.2.52.2
 %patch4 -p1 -b .gcj
+%patch5 -p1 -b .disable-pthreadsmutexes
 pushd dist
 libtoolize --copy --force
 cp -f %{_datadir}/aclocal/libtool.m4 aclocal/libtool.ac
@@ -165,7 +168,12 @@
 	pushd dist/$1
 	# Force the threading model used, for selecting whether or not we will
 	# depend on NPTL-specific features.
-	echo ${2:+db_cv_mutex=$2} > config.cache
+	local mutexes_arg=""
+	if test -n "$2" ; then
+		mutexes_arg="--enable-posixmutexes --with-mutex=$2"
+	else
+		mutexes_arg="--disable-pthreadsmutexes"
+	fi
 	if test -n "$nptl_lo" ; then
 		/bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS \
 			-o $nptl_lo -c $nptl_s
@@ -177,6 +185,7 @@
 	%configure -C \
 		--enable-compat185 --enable-dump185 \
 		--enable-shared --enable-static --enable-rpc \
+		$mutexes_arg \
 		--enable-cxx \
 %ifarch %{java_arches}
 		--enable-java \
@@ -195,10 +204,10 @@
 	perl -pi -e 's/-shared -nostdlib/-shared/' libtool
 
 	make libdb=%{_libdb_a} libcxx=%{_libcxx_a} %{?_smp_mflags} \
-		 LIBSO_LIBS='$(LIBS)'" $nptl_lo" \
-		LIBXSO_LIBS='$(LIBS)'" $nptl_lo" \
-		LIBJSO_LIBS='$(LIBS)'" $nptl_lo" \
-		LIBTSO_LIBS='$(LIBS)'" $nptl_lo"
+		 LIBSO_LIBS='$(LIBS)'" $nptl_lo -lpthread" \
+		LIBXSO_LIBS='$(LIBS)'" $nptl_lo -lpthread" \
+		LIBJSO_LIBS='$(LIBS)'" $nptl_lo -lpthread" \
+		LIBTSO_LIBS='$(LIBS)'" $nptl_lo -lpthread"
 
 	# XXX hack around libtool not creating ./libs/libdb_java-X.Y.lai
 	LDBJ=./.libs/libdb_java-%{__soversion}.la
@@ -220,7 +229,7 @@
 build dist-tls POSIX/pthreads/library
 unset nptl_s nptl_lo
 %endif
-build dist-notls POSIX/pthreads/library/private
+build dist-notls
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
@@ -234,6 +243,7 @@
 chmod +x $RPM_BUILD_ROOT/%{_libdir}/*.so*
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/tls
 mv $RPM_BUILD_ROOT/%{_libdir}/libdb*%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/tls/
+mv $RPM_BUILD_ROOT/%{_bindir}/db_stat $RPM_BUILD_ROOT/%{_bindir}/db_stat.tls
 %endif
 %makeinstall -C dist/dist-notls
 
@@ -273,7 +283,22 @@
 	ln -s db4/$i $RPM_BUILD_ROOT%{_includedir}
 done
 
+# Make sure that -ldb, -ldb_cxx, -ldb_tcl and -ldb_java are functional.
+ln -sf libdb-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/libdb.so
+ln -sf libdb_cxx-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/libdb_cxx.so
+ln -sf libdb_tcl-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/libdb_tcl.so
 %ifarch %{java_arches}
+ln -sf libdb_java-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/libdb_java.so
+%endif
+
+%ifarch %{nptl_arches}
+mv $RPM_BUILD_ROOT/%{_bindir}/db_stat $RPM_BUILD_ROOT/%{_bindir}/db_stat.nontls
+install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/db_stat
+sed -i -e 's, at BINDIR@,%{_bindir},' $RPM_BUILD_ROOT/%{_bindir}/db_stat
+sed -i -e 's, at DB_STAT_NAME@,db_stat,' $RPM_BUILD_ROOT/%{_bindir}/db_stat
+%endif
+
+%ifarch %{java_arches}
 # Move java jar file to the correct place
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
 mv $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_datadir}/java
@@ -315,7 +340,7 @@
 %{_bindir}/db*_load
 %{_bindir}/db*_printlog
 %{_bindir}/db*_recover
-%{_bindir}/db*_stat
+%{_bindir}/db*_stat*
 %{_bindir}/db*_upgrade
 %{_bindir}/db*_verify
 
@@ -348,6 +373,9 @@
 
 
 %changelog
+* Sun Nov 14 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.2.52-5jh
+- fix mutex usage with non-nptl version
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 4.2.52-4ts
 - current (4.2.52-4jh) integrated as 4.2.52-4ts for release 1.1
 


From svn at tinysofa.org  Mon Nov 15 07:05:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 02:05:29 -0500 (EST)
Subject: [tinysofa-svn] r5097 - tinysofa/releases/1.1/openssl/current/specs
Message-ID: <20041115070529.BE8533440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 02:05:21 -0500 (Mon, 15 Nov 2004)
New Revision: 5097

Modified:
   tinysofa/releases/1.1/openssl/current/specs/openssl.spec
Log:
- minor cleanup


Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec
===================================================================
--- tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-11-15 06:22:34 UTC (rev 5096)
+++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-11-15 07:05:21 UTC (rev 5097)
@@ -129,7 +129,7 @@
 # Build the python extensions.
 pushd m2crypto-%{m2crypto_version}/SWIG
 export PATH=`pwd`/../../bin/:$PATH
-make -f Makefile.py22\
+%make \
 	INCLUDE="-I. -I../../include -I../.." \
 	LIBS="-L${TOPDIR} -lssl -lcrypto -lc" \
 	PYINCLUDE="-DHAVE_CONFIG_H -I%{py_incdir} -I%{py_incdir}/config" \


From svn at tinysofa.org  Mon Nov 15 08:15:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 03:15:20 -0500 (EST)
Subject: [tinysofa-svn] r5098 - contrib/1.1/subversion/current/specs
Message-ID: <20041115081520.BCBC13440EC@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 03:15:19 -0500 (Mon, 15 Nov 2004)
New Revision: 5098

Modified:
   contrib/1.1/subversion/current/specs/subversion.spec
Log:
- BR: openssl-devel


Modified: contrib/1.1/subversion/current/specs/subversion.spec
===================================================================
--- contrib/1.1/subversion/current/specs/subversion.spec	2004-11-15 07:05:21 UTC (rev 5097)
+++ contrib/1.1/subversion/current/specs/subversion.spec	2004-11-15 08:15:19 UTC (rev 5098)
@@ -19,6 +19,7 @@
 BuildPreReq: autoconf, libtool, python, python-devel, texinfo, gettext
 BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5, swig-python, swig-perl
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1
+BuildPreReq: openssl-devel
 BuildPreReq: perl-devel, cyrus-sasl-devel ,gcc-c++
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 


From svn at tinysofa.org  Mon Nov 15 09:38:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 04:38:20 -0500 (EST)
Subject: [tinysofa-svn] r5099 - in tinysofa/releases/1.1: bash/current/specs
	gettext/current/specs ghostscript/current/specs groff/current/specs
Message-ID: <20041115093820.67A833440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 04:38:19 -0500 (Mon, 15 Nov 2004)
New Revision: 5099

Modified:
   tinysofa/releases/1.1/bash/current/specs/bash.spec
   tinysofa/releases/1.1/gettext/current/specs/gettext.spec
   tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec
   tinysofa/releases/1.1/groff/current/specs/groff.spec
Log:
- limit the number of concurrent jobs with make


Modified: tinysofa/releases/1.1/bash/current/specs/bash.spec
===================================================================
--- tinysofa/releases/1.1/bash/current/specs/bash.spec	2004-11-15 08:15:19 UTC (rev 5098)
+++ tinysofa/releases/1.1/bash/current/specs/bash.spec	2004-11-15 09:38:19 UTC (rev 5099)
@@ -125,7 +125,7 @@
 	export PATH=.:$PATH
 fi
 %configure --with-bash-malloc=no
-%make CPPFLAGS=`getconf LFS_CFLAGS`
+%make CPPFLAGS=`getconf LFS_CFLAGS` -j1
 #make check
 
 

Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec
===================================================================
--- tinysofa/releases/1.1/gettext/current/specs/gettext.spec	2004-11-15 08:15:19 UTC (rev 5098)
+++ tinysofa/releases/1.1/gettext/current/specs/gettext.spec	2004-11-15 09:38:19 UTC (rev 5099)
@@ -50,7 +50,7 @@
 %build
 %configure --without-included-gettext \
         --enable-shared --with-pic-=yes
-%make
+%make -j1
 
 
 %install

Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec
===================================================================
--- tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec	2004-11-15 08:15:19 UTC (rev 5098)
+++ tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec	2004-11-15 09:38:19 UTC (rev 5099)
@@ -47,7 +47,7 @@
 
 %build
 %configure
-%make
+%make -j1
 
 
 %install

Modified: tinysofa/releases/1.1/groff/current/specs/groff.spec
===================================================================
--- tinysofa/releases/1.1/groff/current/specs/groff.spec	2004-11-15 08:15:19 UTC (rev 5098)
+++ tinysofa/releases/1.1/groff/current/specs/groff.spec	2004-11-15 09:38:19 UTC (rev 5099)
@@ -48,7 +48,7 @@
 PATH=$PATH:/usr/X11R6/bin
 %configure --enable-japanese --enable-multibyte
 
-%make
+%make -j1
 
 
 %install


From svn at tinysofa.org  Mon Nov 15 09:54:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 04:54:59 -0500 (EST)
Subject: [tinysofa-svn] r5100 - tinysofa/releases/1.1
Message-ID: <20041115095459.85EEE3440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 04:54:59 -0500 (Mon, 15 Nov 2004)
New Revision: 5100

Removed:
   tinysofa/releases/1.1/links/
Log:
- remove links (Bug ID: #27)



From svn at tinysofa.org  Mon Nov 15 10:02:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 05:02:58 -0500 (EST)
Subject: [tinysofa-svn] 
	r5101 - in tinysofa/releases/1.1: . elinks elinks/current
	elinks/current/sources elinks/current/specs
Message-ID: <20041115100258.EA7753440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 05:02:58 -0500 (Mon, 15 Nov 2004)
New Revision: 5101

Added:
   tinysofa/releases/1.1/elinks/
   tinysofa/releases/1.1/elinks/current/
   tinysofa/releases/1.1/elinks/current/sources/
   tinysofa/releases/1.1/elinks/current/sources/elinks-0.4.2-getaddrinfo.patch
   tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.1-utf_8_io-default.patch
   tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.2-xterm.patch
   tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.3.tar.bz2
   tinysofa/releases/1.1/elinks/current/sources/elinks-convert_string.patch
   tinysofa/releases/1.1/elinks/current/sources/elinks-noegd.patch
   tinysofa/releases/1.1/elinks/current/sources/elinks-pkgconfig.patch
   tinysofa/releases/1.1/elinks/current/sources/elinks-stdin.patch
   tinysofa/releases/1.1/elinks/current/sources/elinks-sysname.patch
   tinysofa/releases/1.1/elinks/current/sources/manual-0.82-en.tar.bz2
   tinysofa/releases/1.1/elinks/current/specs/
   tinysofa/releases/1.1/elinks/current/specs/elinks.spec
   tinysofa/releases/1.1/elinks/pristine/
   tinysofa/releases/1.1/elinks/releases/
Log:
- add elinks (Bug ID: #27)


Added: tinysofa/releases/1.1/elinks/current/sources/elinks-0.4.2-getaddrinfo.patch
===================================================================
--- tinysofa/releases/1.1/elinks/current/sources/elinks-0.4.2-getaddrinfo.patch	2004-11-15 09:54:59 UTC (rev 5100)
+++ tinysofa/releases/1.1/elinks/current/sources/elinks-0.4.2-getaddrinfo.patch	2004-11-15 10:02:58 UTC (rev 5101)
@@ -0,0 +1,25 @@
+--- elinks-0.4.2/src/lowlevel/dns.c.getaddrinfo	2003-01-26 17:33:30.000000000 +0000
++++ elinks-0.4.2/src/lowlevel/dns.c	2003-06-12 18:03:45.000000000 +0100
+@@ -82,9 +82,21 @@
+ 	 * But we duplicate the code terribly here :|. */
+ 	/* hostent = getipnodebyname(name, AF_INET6, AI_ALL | AI_ADDRCONFIG, NULL); */
+ 	memset(&hint, 0, sizeof(hint));
++	hint.ai_flags = AI_ADDRCONFIG;
+ 	hint.ai_family = AF_UNSPEC;
+ 	hint.ai_socktype = SOCK_STREAM;
+-	if (getaddrinfo(name, NULL, &hint, &ai) != 0) return -1;
++	switch (getaddrinfo(name, NULL, &hint, &ai))
++	{
++	case 0:
++		break;
++	case EAI_BADFLAGS:
++		hint.ai_flags = 0;
++		if (getaddrinfo(name, NULL, &hint, &ai) == 0)
++			break;
++		/* fall through */
++	default:
++		return -1;
++	}
+ 
+ #else
+ 	/* Seems there are problems on Mac, so we first need to try

Added: tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.1-utf_8_io-default.patch
===================================================================
--- tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.1-utf_8_io-default.patch	2004-11-15 09:54:59 UTC (rev 5100)
+++ tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.1-utf_8_io-default.patch	2004-11-15 10:02:58 UTC (rev 5101)
@@ -0,0 +1,12 @@
+diff -Naur elinks-0.9.1.orig/src/config/options.inc elinks-0.9.1/src/config/options.inc
+--- elinks-0.9.1.orig/src/config/options.inc	2004-01-08 23:00:01.000000000 +0100
++++ elinks-0.9.1/src/config/options.inc	2004-05-27 22:05:57.000000000 +0200
+@@ -850,7 +850,7 @@
+ 		"terminal.")),
+ 
+ 	INIT_OPT_BOOL("terminal._template_", N_("I/O in UTF8"),
+-		"utf_8_io", 0, 0,
++		"utf_8_io", 0, 1,
+ 		N_("Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
+ 		"only the subset of UTF8 according to terminal codepage is used.")),
+ 

Added: tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.2-xterm.patch
===================================================================
--- tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.2-xterm.patch	2004-11-15 09:54:59 UTC (rev 5100)
+++ tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.2-xterm.patch	2004-11-15 10:02:58 UTC (rev 5101)
@@ -0,0 +1,13 @@
+--- elinks-0.9.2/src/config/options.c.xterm	2004-10-14 13:32:06.335713304 +0200
++++ elinks-0.9.2/src/config/options.c	2004-10-14 14:10:01.045904792 +0200
+@@ -559,8 +559,9 @@
+ 	get_opt_bool("terminal.linux.m11_hack") = 1;
+ 	get_opt_int("terminal.vt100.type") = 1;
+ 	get_opt_int("terminal.vt110.type") = 1;
+-	get_opt_int("terminal.xterm.type") = 1;
++	get_opt_int("terminal.xterm.type") = 2;
+ 	get_opt_int("terminal.xterm.underline") = 1;
++	get_opt_int("terminal.xterm.colors") = 1;
+ 	get_opt_int("terminal.xterm-color.type") = 1;
+ 	get_opt_bool("terminal.xterm-color.colors") = 1;
+ 	get_opt_int("terminal.xterm-color.underline") = 1;

Added: tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.3.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.3.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.1/elinks/current/sources/elinks-convert_string.patch
===================================================================
--- tinysofa/releases/1.1/elinks/current/sources/elinks-convert_string.patch	2004-11-15 09:54:59 UTC (rev 5100)
+++ tinysofa/releases/1.1/elinks/current/sources/elinks-convert_string.patch	2004-11-15 10:02:58 UTC (rev 5101)
@@ -0,0 +1,147 @@
+--- elinks-0.9.1/ChangeLog.nsswins	2004-01-22 17:58:27.000000000 +0100
++++ elinks-0.9.1/ChangeLog	2004-05-14 16:41:55.149581200 +0200
+@@ -0,0 +1,11 @@
++Fri May 14 17:00:00 2004  Derek Poon <dpoon at ocf.berkeley.edu>:
++
++	* intl/charsets.c, intl/charsets.h, document/html/parser.c,
++	  document/html/renderer.c, document/plain/renderer.c,
++	  viewer/text/form.c:
++
++	Renamed convert_string() function to elinks_convert_string() to
++	avoid clash with the Samba function of the same name.
++	(Hostname lookup would fail if "wins" is listed as a name resolution
++	method in nsswitch.conf.)
++
+--- elinks-0.9.1/src/intl/charsets.c.nsswins	2003-12-29 13:24:31.000000000 +1200
++++ elinks-0.9.1/src/intl/charsets.c	2004-05-14 16:34:30.484180616 +0200
+@@ -571,8 +571,8 @@
+ }
+ 
+ unsigned char *
+-convert_string(struct conv_table *convert_table, unsigned char *chars,
+-	       int charslen, enum convert_string_mode mode)
++elinks_convert_string(struct conv_table *convert_table, unsigned char *chars,
++	              int charslen, enum convert_string_mode mode)
+ {
+ 	unsigned char *buffer;
+ 	int bufferpos = 0;
+--- elinks-0.9.1/src/intl/charsets.h.nsswins	2003-12-29 13:24:31.000000000 +0100
++++ elinks-0.9.1/src/intl/charsets.h	2004-05-14 16:34:48.078505872 +0200
+@@ -32,7 +32,7 @@
+ 
+ struct conv_table *get_translation_table(int, int);
+ unsigned char *get_entity_string(const unsigned char *, const int, const int);
+-unsigned char *convert_string(struct conv_table *, unsigned char *, int, enum convert_string_mode mode);
++unsigned char *elinks_convert_string(struct conv_table *, unsigned char *, int, enum convert_string_mode mode);
+ int get_cp_index(unsigned char *);
+ unsigned char *get_cp_name(int);
+ unsigned char *get_cp_mime_name(int);
+--- elinks-0.9.1/src/document/html/parser.c.nsswins	2004-01-08 22:26:00.000000000 +0100
++++ elinks-0.9.1/src/document/html/parser.c	2004-05-14 16:35:09.440258392 +0200
+@@ -225,7 +225,7 @@
+ 		if (memchr(attr, '&', attrlen)) {
+ 			unsigned char *saved_attr = attr;
+ 
+-			attr = convert_string(NULL, saved_attr, attrlen, CSM_QUERY);
++			attr = elinks_convert_string(NULL, saved_attr, attrlen, CSM_QUERY);
+ 			mem_free(saved_attr);
+ 		}
+ 
+@@ -1911,7 +1911,7 @@
+ 
+ 		while (l && WHITECHAR(s[0])) s++, l--;
+ 		while (l && WHITECHAR(s[l-1])) l--;
+-		q = convert_string(ct, s, l, CSM_DEFAULT);
++		q = elinks_convert_string(ct, s, l, CSM_DEFAULT);
+ 		if (q) add_to_string(&lbl, q), mem_free(q);
+ 	}
+ 
+@@ -3379,7 +3379,7 @@
+ 		unsigned char *alt = get_attr_val(attr, "alt");
+ 
+ 		if (alt) {
+-			label = convert_string(ct, alt, strlen(alt), CSM_DEFAULT);
++			label = elinks_convert_string(ct, alt, strlen(alt), CSM_DEFAULT);
+ 			mem_free(alt);
+ 		} else {
+ 			label = NULL;
+--- elinks-0.9.1/src/document/html/renderer.c.nsswins	2004-01-17 23:30:37.000000000 +0100
++++ elinks-0.9.1/src/document/html/renderer.c	2004-05-14 16:36:02.347215312 +0200
+@@ -835,7 +835,7 @@
+ 	/* XXX: Perhaps doing the whole string at once could be an ugly memory
+ 	 * hit? Dunno, someone should measure that. --pasky */
+ 
+-	buffer = convert_string(convert_table, chars, charslen, CSM_DEFAULT);
++	buffer = elinks_convert_string(convert_table, chars, charslen, CSM_DEFAULT);
+ 	if (buffer) {
+ 		if (*buffer) put_chars(part, buffer, strlen(buffer));
+ 		mem_free(buffer);
+@@ -1109,9 +1109,10 @@
+ 	/* We don't want to recode hidden fields. */
+ 	if (fc->type == FC_TEXT || fc->type == FC_PASSWORD ||
+ 	    fc->type == FC_TEXTAREA) {
+-		unsigned char *dv = convert_string(convert_table,
+-						   fc->default_value,
+-						   strlen(fc->default_value), CSM_QUERY);
++		unsigned char *dv = elinks_convert_string(convert_table,
++							  fc->default_value,
++							  strlen(fc->default_value),
++							  CSM_QUERY);
+ 
+ 		if (dv) {
+ 			if (fc->default_value) mem_free(fc->default_value);
+@@ -1491,7 +1492,7 @@
+ 					  &document->cp_status,
+ 					  document->options.hard_assume);
+ 
+-	document->title = convert_string(convert_table, title.source, title.length, CSM_DEFAULT);
++	document->title = elinks_convert_string(convert_table, title.source, title.length, CSM_DEFAULT);
+ 	done_string(&title);
+ 
+ 	part = format_html_part(start, end, par_format.align,
+--- elinks-0.9.1/src/document/plain/renderer.c.nsswins	2003-12-29 20:44:49.000000000 +0100
++++ elinks-0.9.1/src/document/plain/renderer.c	2004-05-14 16:36:09.177177000 +0200
+@@ -154,7 +154,7 @@
+ 			line[line_pos] = '.';
+ 	}
+ 
+-	line = convert_string(convert_table, line, width, CSM_NONE);
++	line = elinks_convert_string(convert_table, line, width, CSM_NONE);
+ 	if (!line) return 0;
+ 
+ 	/* After conversion, line may have a different length. */
+--- elinks-0.9.1/src/viewer/text/form.c.nsswins	2004-01-08 04:44:01.000000000 +0100
++++ elinks-0.9.1/src/viewer/text/form.c	2004-05-14 16:36:38.375738144 +0200
+@@ -497,8 +497,8 @@
+ 				if (!convert_table)
+ 					convert_table = get_translation_table(cp_from, cp_to);
+ 
+-				p2 = convert_string(convert_table, p,
+-						    strlen(p), CSM_FORM);
++				p2 = elinks_convert_string(convert_table, p,
++							   strlen(p), CSM_FORM);
+ 				mem_free(p);
+ 			}
+ 		} else if (sv->type == FC_TEXT ||
+@@ -506,8 +506,8 @@
+ 			if (!convert_table)
+ 				convert_table = get_translation_table(cp_from, cp_to);
+ 
+-			p2 = convert_string(convert_table, sv->value,
+-					    strlen(sv->value), CSM_FORM);
++			p2 = elinks_convert_string(convert_table, sv->value,
++						   strlen(sv->value), CSM_FORM);
+ 		} else {
+ 			p2 = stracpy(sv->value);
+ 		}
+@@ -606,8 +606,8 @@
+ 					convert_table = get_translation_table(cp_from,
+ 									      cp_to);
+ 
+-				p = convert_string(convert_table, sv->value,
+-						   strlen(sv->value), CSM_FORM);
++				p = elinks_convert_string(convert_table, sv->value,
++							  strlen(sv->value), CSM_FORM);
+ 				if (p) {
+ 					add_to_string(data, p);
+ 					mem_free(p);

Added: tinysofa/releases/1.1/elinks/current/sources/elinks-noegd.patch
===================================================================
--- tinysofa/releases/1.1/elinks/current/sources/elinks-noegd.patch	2004-11-15 09:54:59 UTC (rev 5100)
+++ tinysofa/releases/1.1/elinks/current/sources/elinks-noegd.patch	2004-11-15 10:02:58 UTC (rev 5101)
@@ -0,0 +1,21 @@
+--- elinks-0.9.1/src/ssl/ssl.c.noegd	2004-03-11 17:13:22.000000000 +0000
++++ elinks-0.9.1/src/ssl/ssl.c	2004-03-11 17:13:34.000000000 +0000
+@@ -45,18 +45,6 @@
+ static void
+ init_openssl(struct module *module)
+ {
+-	unsigned char f_randfile[PATH_MAX];
+-
+-	/* In a nutshell, on OS's without a /dev/urandom, the OpenSSL library
+-	 * cannot initialize the PRNG and so every attempt to use SSL fails.
+-	 * It's actually an OpenSSL FAQ, and according to them, it's up to the
+-	 * application coders to seed the RNG. -- William Yodlowsky */
+-	if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
+-		/* Not an EGD, so read and write to it */
+-		if (RAND_load_file(f_randfile, -1))
+-			RAND_write_file(f_randfile);
+-	}
+-
+ 	SSLeay_add_ssl_algorithms();
+ 	context = SSL_CTX_new(SSLv23_client_method());
+ 	SSL_CTX_set_options(context, SSL_OP_ALL);

Added: tinysofa/releases/1.1/elinks/current/sources/elinks-pkgconfig.patch
===================================================================
--- tinysofa/releases/1.1/elinks/current/sources/elinks-pkgconfig.patch	2004-11-15 09:54:59 UTC (rev 5100)
+++ tinysofa/releases/1.1/elinks/current/sources/elinks-pkgconfig.patch	2004-11-15 10:02:58 UTC (rev 5101)
@@ -0,0 +1,22 @@
+--- elinks-0.9.1/configure.in.pkgconfig	2004-01-22 16:57:34.000000000 +0000
++++ elinks-0.9.1/configure.in	2004-03-11 17:15:45.000000000 +0000
+@@ -584,6 +584,11 @@
+ 		openssl_withval=""
+ 	fi
+ 
++	if pkg-config openssl ; then
++		CFLAGS="$CFLAGS_X `pkg-config --cflags openssl`"
++		LIBS="$LIBS_X `pkg-config --libs openssl`"
++		cf_result=yes
++	else
+ 	for ssldir in "$openssl_withval" "" /usr /usr/local/openssl \
+ 			 /usr/lib/openssl /usr/local/ssl \
+ 			 /usr/local/www /usr/lib/ssl /usr/local \
+@@ -611,6 +616,7 @@
+ 			fi
+ 		fi
+ 	done
++	fi
+ 
+ 	if test "$cf_result" != yes; then
+ 		if test "$withval" = yes; then

Added: tinysofa/releases/1.1/elinks/current/sources/elinks-stdin.patch
===================================================================
--- tinysofa/releases/1.1/elinks/current/sources/elinks-stdin.patch	2004-11-15 09:54:59 UTC (rev 5100)
+++ tinysofa/releases/1.1/elinks/current/sources/elinks-stdin.patch	2004-11-15 10:02:58 UTC (rev 5101)
@@ -0,0 +1,13 @@
+--- elinks-0.9.2rc2/src/protocol/file/file.c.stdin	2004-07-12 14:16:57.805669857 +0100
++++ elinks-0.9.2rc2/src/protocol/file/file.c	2004-07-12 14:19:02.274883230 +0100
+@@ -655,7 +655,9 @@
+ 			state = S_OUT_OF_MEM;
+ 
+ 		} else {
+-			state = read_file(stream, stt.st_size, &page);
++			state = read_file(stream,
++					  stt.st_size ? stt.st_size : 1000,
++					  &page);
+ 			close_encoded(stream);
+ 			head = "";
+ 		}

Added: tinysofa/releases/1.1/elinks/current/sources/elinks-sysname.patch
===================================================================
--- tinysofa/releases/1.1/elinks/current/sources/elinks-sysname.patch	2004-11-15 09:54:59 UTC (rev 5100)
+++ tinysofa/releases/1.1/elinks/current/sources/elinks-sysname.patch	2004-11-15 10:02:58 UTC (rev 5101)
@@ -0,0 +1,20 @@
+--- elinks-0.9.1/src/lowlevel/sysname.c.sysname	2003-12-19 18:30:46.000000000 +0000
++++ elinks-0.9.1/src/lowlevel/sysname.c	2004-03-11 17:19:31.000000000 +0000
+@@ -27,7 +27,7 @@
+ 	FILE *f;
+ 	unsigned char *p;
+ 
+-	f = popen("uname -srm", "r");
++	f = popen("uname -s", "r");
+ 	if (!f) return 0;
+ 
+ 	if (fread(system_name, 1, sizeof(system_name) - 1, f) <= 0) {
+@@ -59,7 +59,7 @@
+ 
+ 	if (!uname(&name)) {
+ 		snprintf(system_name, sizeof(system_name),
+-			 "%s %s %s", name.sysname, name.release, name.machine);
++			 "%s", name.sysname);
+ 		return;
+ 	}
+ #endif

Added: tinysofa/releases/1.1/elinks/current/sources/manual-0.82-en.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/elinks/current/sources/manual-0.82-en.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.1/elinks/current/specs/elinks.spec
===================================================================
--- tinysofa/releases/1.1/elinks/current/specs/elinks.spec	2004-11-15 09:54:59 UTC (rev 5100)
+++ tinysofa/releases/1.1/elinks/current/specs/elinks.spec	2004-11-15 10:02:58 UTC (rev 5101)
@@ -0,0 +1,269 @@
+Name: elinks
+Summary: A text-mode Web browser.
+Version: 0.9.3
+Release: 1jh
+Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2
+Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2
+Patch0: elinks-noegd.patch
+Patch1: elinks-0.9.1-utf_8_io-default.patch
+Patch2: elinks-pkgconfig.patch
+Patch3: elinks-convert_string.patch
+Patch4: elinks-0.4.2-getaddrinfo.patch
+Patch5: elinks-sysname.patch
+Patch6: elinks-stdin.patch
+Patch7: elinks-0.9.2-xterm.patch
+Group: main
+URL: http://elinks.or.cz/
+BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRequires: autoconf, automake, openssl-devel, pkgconfig, perl
+BuildRequires: expat-devel, zlib-devel, bzip2-devel
+License: GPL
+Provides: webclient
+Obsoletes: links
+Provides: links
+
+%description
+Links is a text-based Web browser. Links does not display any images,
+but it does support frames, tables and most other HTML tags. Links'
+advantage over graphical browsers is its speed--Links starts and exits
+quickly and swiftly displays Web pages.
+
+
+%prep
+%setup -q -a 1 -n %{name}-%{version}
+
+# Prevent crash when HOME is unset (bug #90663).
+%patch0 -p1 -b .noegd
+
+# UTF-8 by default
+# no UTF-8 default for now
+#%patch1 -p1 -b .utf_8_io-default
+
+%patch2 -p1 -b .pkgconfig
+
+# Avoid symbol clash (bug #131170).
+%patch3 -p1 -b .convert_string
+
+# Make getaddrinfo call use AI_ADDRCONFIG.
+%patch4 -p1 -b .getaddrinfo
+
+# Don't put so much information in the user-agent header string (bug #97273).
+%patch5 -p1 -b .sysname
+
+# Fix elinks -dump -stdin (bug #127624).
+%patch6 -p1 -b .stdin
+
+# Fix xterm terminal: "Linux" driver seems better than "VT100" (#128105)
+%patch7 -p1 -b .xterm
+
+aclocal
+automake -a
+autoconf
+
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
+%configure --without-x
+%make
+
+
+%install
+%makeinstall_std
+ln -s elinks $RPM_BUILD_ROOT%{_bindir}/links
+ln -s elinks.1 $RPM_BUILD_ROOT%{_mandir}/man1/links.1
+
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
+
+%find_lang elinks
+
+
+%clean
+%clean_buildroot
+
+
+%files -f elinks.lang
+%defattr(-,root,root)
+%doc README SITES TODO manual-0.82-en
+%{_bindir}/links
+%{_bindir}/elinks
+%{_mandir}/man1/links.1*
+%{_mandir}/man1/elinks.1*
+%{_mandir}/man5/*
+
+
+%changelog
+* Thu Oct 14 2004 Karel Zak <kzak at redhat.com> 0.9.2-2
+- the "Linux" driver seems better than "VT100" for xterm (#128105)
+
+* Wed Oct  6 2004 Karel Zak <kzak at redhat.com> 0.9.2-1
+- upload new upstream tarball with stable 0.9.2 release
+
+* Mon Sep 20 2004 Jindrich Novy <jnovy at redhat.com> 0.9.2-0.rc7.4
+- 0.9.2rc7.
+- changed summary in spec to get rid of #41732, #61499
+
+* Mon Sep 13 2004 Tim Waugh <twaugh at redhat.com> 0.9.2-0.rc4.3
+- Avoid symbol clash (bug #131170).
+
+* Fri Aug  6 2004 Tim Waugh <twaugh at redhat.com> 0.9.2-0.rc4.2
+- 0.9.2rc4.
+
+* Mon Jul 12 2004 Tim Waugh <twaugh at redhat.com> 0.9.2-0.rc2.2
+- Fix elinks -dump -stdin (bug #127624).
+
+* Thu Jul  1 2004 Tim Waugh <twaugh at redhat.com> 0.9.2-0.rc2.1
+- 0.9.2rc2.
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Jun  2 2004 Tim Waugh <twaugh at redhat.com> 0.9.1-3
+- Build with LFS support (bug #125064).
+
+* Fri May 28 2004 Tim Waugh <twaugh at redhat.com> 0.9.1-2
+- Use UTF-8 by default (bug #76445).
+
+* Thu Mar 11 2004 Tim Waugh <twaugh at redhat.com> 0.9.1-1
+- 0.9.1.
+- Use %%find_lang.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon Dec  8 2003 Tim Waugh <twaugh at redhat.com> 0.4.3-1
+- 0.4.3.
+- Updated pkgconfig patch.
+
+* Mon Aug 11 2003 Tim Waugh <twaugh at redhat.com> 0.4.2-7.1
+- Rebuilt.
+
+* Mon Aug 11 2003 Tim Waugh <twaugh at redhat.com> 0.4.2-7
+- Don't require XFree86-libs (bug #102072).
+
+* Tue Jul 22 2003 Nalin Dahyabhai <nalin at redhat.com> 0.4.2-6.2
+- rebuild
+
+* Thu Jun 12 2003 Tim Waugh <twaugh at redhat.com> 0.4.2-6.1
+- Rebuilt.
+
+* Thu Jun 12 2003 Tim Waugh <twaugh at redhat.com> 0.4.2-6
+- Make getaddrinfo call use AI_ADDRCONFIG.
+- Don't put so much information in the user-agent header string (bug #97273).
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon Jun  2 2003 Tim Waugh <twaugh at redhat.com> 0.4.2-4.1
+- Rebuild again.
+
+* Mon Jun  2 2003 Tim Waugh <twaugh at redhat.com> 0.4.2-4
+- Rebuild.
+
+* Mon May 12 2003 Tim Waugh <twaugh at redhat.com> 0.4.2-3
+- Prevent crash when HOME is unset (bug #90663).
+
+* Sun May 04 2003 Florian La Roche <Florian.LaRoche at redhat.de> 0.4.2-2
+- use relative symlinks to elinks
+
+* Wed Feb  5 2003 Tim Waugh <twaugh at redhat.com> 0.4.2-1
+- 0.4.2 (bug #83273).
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com> 0.3.2-5
+- rebuilt
+
+* Thu Jan 16 2003 Tim Waugh <twaugh at redhat.com>
+- Fix URL (bug #81987).
+
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin at redhat.com> 0.3.2-4
+- rebuild
+
+* Mon Dec 23 2002 Tim Waugh <twaugh at redhat.com> 0.3.2-3
+- Fix bug #62368.
+
+* Thu Dec 12 2002 Nalin Dahyabhai <nalin at redhat.com>
+- use openssl's pkg-config data, if available
+
+* Wed Nov 20 2002 Tim Powers <timp at redhat.com> 0.3.2-2
+- rebuild on all arches
+
+* Tue Aug 20 2002 Jakub Jelinek <jakub at redhat.com> 0.3.2-1
+- update to 0.3.2 to fix the DNS Ctrl-C segfaults
+- update URLs, the project moved
+- include man page
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu Jan 24 2002 Tim Powers <timp at redhat.com>
+- rebuilt against new openssl
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Jan  2 2002 Preston Brown <pbrown at redhat.com> 0.96-4
+- cookie fix
+
+* Thu Sep 13 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.96-3
+- Save some more space in rescue mode
+
+* Wed Jul 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.96-2
+- Add the links manual from links.sourceforge.net (RFE #49228)
+
+* Tue Jul  3 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.96-1
+- update to 0.96
+
+* Fri Jun 22 2001 Nalin Dahyabhai <nalin at redhat.com>
+- actually run make in build phase
+
+* Tue Jun 12 2001 Nalin Dahyabhai <nalin at redhat.com>
+- rebuild in new environment
+
+* Fri Mar  2 2001 Nalin Dahyabhai <nalin at redhat.com>
+- rebuild in new environment
+
+* Tue Jan  9 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.95
+
+* Mon Jan  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.94 final
+
+* Sun Dec 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- pre9
+
+* Mon Dec 10 2000 Preston Brown <pbrown at redhat.com>
+- Upgraded to pre8.
+
+* Tue Dec  5 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.94pre7
+- Minor fixes to the specfile (s/Copyright:/License:/)
+- merge rescue stuff
+
+* Fri Nov 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.94pre5
+
+* Wed Nov 15 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.94pre4
+
+* Tue Oct 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.94pre1
+
+* Wed Aug  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.92 (needed - prior versions won't display XHTML properly)
+
+* Thu Jul 20 2000 Nalin Dahyabhai <nalin at redhat.com>
+- rebuild in new environment to work around bugs
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Thu Jun 15 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.84
+
+* Sun Jun 11 2000 Preston Brown <pbrown at redhat.com>
+- provides virtual package webclient.
+
+* Thu Jan  6 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- initial RPM


From svn at tinysofa.org  Mon Nov 15 10:06:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 05:06:56 -0500 (EST)
Subject: [tinysofa-svn] 
	r5102 - in tinysofa/releases/1.1/mt-st/current: sources specs
Message-ID: <20041115100656.60C353440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 05:06:55 -0500 (Mon, 15 Nov 2004)
New Revision: 5102

Added:
   tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-SDLT.patch
   tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-config-files.patch
   tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.8-redhat.patch
   tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.8.tar.gz
Removed:
   tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.6-redhat.patch
   tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-SDLT220.patch
   tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7.tar.gz
Modified:
   tinysofa/releases/1.1/mt-st/current/specs/mt-st.spec
Log:
- update to 0.8


Deleted: tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.6-redhat.patch
===================================================================
--- tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.6-redhat.patch	2004-11-15 10:02:58 UTC (rev 5101)
+++ tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.6-redhat.patch	2004-11-15 10:06:55 UTC (rev 5102)
@@ -1,28 +0,0 @@
---- mt-st-0.7/Makefile.redhat	2001-11-08 20:18:24.000000000 +0100
-+++ mt-st-0.7/Makefile	2002-06-19 23:32:40.000000000 +0200
-@@ -1,7 +1,8 @@
--CFLAGS=  -Wall -O2
--SBINDIR= /sbin
--BINDIR=  /bin
--MANDIR= /usr/man
-+CFLAGS=  $(RPM_OPT_FLAGS)
-+SBINDIR= $(RPM_BUILD_ROOT)/sbin
-+BINDIR=  $(RPM_BUILD_ROOT)/bin
-+MANDIR= $(RPM_BUILD_ROOT)/$(mandir)
-+CC=gcc
- 
- all:	mt stinit
- 
-@@ -12,9 +13,10 @@
- 	$(CC) $(CFLAGS) -o stinit stinit.c
- 
- install: mt stinit
--	install -s mt $(BINDIR)
-+	mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
-+	install -m 755 mt $(BINDIR)
- 	install -c -m 444 mt.1 $(MANDIR)/man1
--	install -s stinit $(SBINDIR)
-+	install -m 755 stinit $(SBINDIR)
- 	install -c -m 444 stinit.8 $(MANDIR)/man8
- 
- dist:	clean

Added: tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-SDLT.patch
===================================================================
--- tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-SDLT.patch	2004-11-15 10:02:58 UTC (rev 5101)
+++ tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-SDLT.patch	2004-11-15 10:06:55 UTC (rev 5102)
@@ -0,0 +1,11 @@
+--- mt-st-0.7/mt.c.orig	Sat Feb 22 14:48:09 2003
++++ mt-st-0.7/mt.c	Sat Feb 22 14:50:21 2003
+@@ -220,6 +220,8 @@
+     {0x41, "DLT 40GB"},
+     {0x45, "QIC-3095-MC (TR-4)"},
+     {0x47, "TR-5"},
++    {0x48, "Quantum SDLT220"},
++    {0x49, "Quantum SDLT320"},
+     {0x80, "DLT 15GB uncomp. or Ecrix"},
+     {0x81, "DLT 15GB compressed"},
+     {0x82, "DLT 20GB uncompressed"},

Deleted: tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-SDLT220.patch
===================================================================
--- tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-SDLT220.patch	2004-11-15 10:02:58 UTC (rev 5101)
+++ tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-SDLT220.patch	2004-11-15 10:06:55 UTC (rev 5102)
@@ -1,10 +0,0 @@
---- mt-st-0.7/mt.c.foo	Wed Feb 20 12:26:35 2002
-+++ mt-st-0.7/mt.c	Wed Feb 20 12:27:01 2002
-@@ -220,6 +220,7 @@
-     {0x41, "DLT 40GB"},
-     {0x45, "QIC-3095-MC (TR-4)"},
-     {0x47, "TR-5"},
-+    {0x48, "Quantum SDLT220"},
-     {0x80, "DLT 15GB uncomp. or Ecrix"},
-     {0x81, "DLT 15GB compressed"},
-     {0x82, "DLT 20GB uncompressed"},

Added: tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-config-files.patch
===================================================================
--- tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-config-files.patch	2004-11-15 10:02:58 UTC (rev 5101)
+++ tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7-config-files.patch	2004-11-15 10:06:55 UTC (rev 5102)
@@ -0,0 +1,148 @@
+--- mt-st-0.7/stinit.def.examples.orig	2003-05-26 18:35:28.000000000 +0200
++++ mt-st-0.7/stinit.def.examples	2003-05-26 18:36:33.000000000 +0200
+@@ -56,3 +56,145 @@
+ mode3 blocksize=0 density=1   #  800 bpi
+ }
+ 
++# DLT2000 / 2000XT
++manufacturer="QUANTUM" model = "DLT2000" {
++scsi2logical=1
++can-bsr
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++mode1 blocksize=0 density=0x81	# 10GB + compression on DLTtape III, 15+ with DLTtape IIIXT in 2000XT
++mode2 blocksize=0 density=0x80	# 10GB, no compression  on DLTtape III, 15 with DLTtape IIIXT in 2000XT
++mode3 blocksize=0 density=0x18  #  6GB, compression not available, on DLTtape III
++mode4 blocksize=0 density=0x17  #2.6GB, compression not available, on DLTtape III
++}
++
++# DLT4000
++manufacturer="QUANTUM" model = "DLT4000" {
++scsi2logical=1
++can-bsr
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards compatible, use older modes (e.g. from above) as required
++mode1 blocksize=0 density=0x83  # 20GB + compression
++mode2 blocksize=0 density=0x82  # 20GB, no compression
++mode3 blocksize=0 density=0x81	# 10GB + compression (DLT2000 mode) with DLTtape III, 15+ with DLTtape IIIXT in 2000XT
++mode4 blocksize=0 density=0x80	# 10GB, no compression  (DLT2000 mode) with DLTtape III, 15 with DLTtape IIIXT in 2000XT
++}
++
++# DLT7000
++manufacturer="QUANTUM" model = "DLT7000" {
++scsi2logical=1
++can-bsr
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards compatible, use older modes (e.g. from above) as required.
++mode1 blocksize=0 density=0x85  # 35GB + compression
++mode2 blocksize=0 density=0x84  # 35GB, no compression
++mode3 blocksize=0 density=0x83	# 20GB + compression (DLT4000 mode)
++mode4 blocksize=0 density=0x82	# 20GB, no compression (DLT4000 mode)
++}
++
++# DLT8000
++manufacturer="QUANTUM" model = "DLT8000" {
++scsi2logical=1
++can-bsr=1
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards compatible to DLT7000, use older modes (e.g. from above) as required. Modes <10GB (<0x19) not supported!
++mode1 blocksize=0 density=0x89	# 40GB + compression
++mode2 blocksize=0 density=0x88	# 40GB, no compression
++mode3 blocksize=0 density=0x85  # 35GB + compression (DLT7000 mode)
++mode4 blocksize=0 density=0x84  # 35GB, no compression (DLT7000 mode)
++}
++
++
++# SDLT220
++manufacturer="QUANTUM" model = "SuperDLT1" {
++scsi2logical=1
++can-bsr=1
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards read compatible to DLT4000/7000/8000. Mode settings are only required for writing, so no need to define any other modes here.
++mode1 blocksize=0 density=0x48 compression=1	# 110 GB + compression
++mode2 blocksize=0 density=0x48 compression=0	# 110 GB, no ompression
++}
++
++# SDLT320
++manufacturer="QUANTUM" model = "SDLT320" {
++scsi2logical=1
++can-bsr=1
++auto-lock=0
++two-fms=0
++drive-buffering=1
++buffer-writes
++read-ahead=1
++async-writes=1
++can-partitions=0
++fast-mteom=1
++#
++# If your stinit supports the timeouts:
++timeout=3600 # 1 hour
++long-timeout=14400 # 4 hours
++#
++# Drive is backwards write compatible to SDLT220 and read compatible to DLT4000/7000/8000. Mode settings are only required for writing, so we need only the SDL220/320 modes here
++mode1 blocksize=0 density=0x49 compression=1	# 160 GB + compression
++mode2 blocksize=0 density=0x49 compression=0	# 160 GB, no ompression
++mode3 blocksize=0 density=0x48 compression=1	# 110 GB + compression
++mode4 blocksize=0 density=0x48 compression=0	# 110 GB, no ompression
++}
++

Deleted: tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.7.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.8-redhat.patch
===================================================================
--- tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.8-redhat.patch	2004-11-15 10:02:58 UTC (rev 5101)
+++ tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.8-redhat.patch	2004-11-15 10:06:55 UTC (rev 5102)
@@ -0,0 +1,30 @@
+--- mt-st-0.8/Makefile.redhat	2004-04-03 11:52:08.000000000 +0200
++++ mt-st-0.8/Makefile	2004-08-09 14:37:47.240013472 +0200
+@@ -1,7 +1,8 @@
+-CFLAGS=  -Wall -O2
+-SBINDIR= /sbin
+-BINDIR=  /bin
+-MANDIR= /usr/share/man
++CFLAGS=  $(RPM_OPT_FLAGS)
++SBINDIR= $(RPM_BUILD_ROOT)/sbin
++BINDIR=  $(RPM_BUILD_ROOT)/bin
++MANDIR= $(RPM_BUILD_ROOT)/$(mandir)
++CC=gcc
+ 
+ all:	mt stinit
+ 
+@@ -12,11 +13,12 @@
+ 	$(CC) $(CFLAGS) -o stinit stinit.c
+ 
+ install: mt stinit
+-	install -s mt $(BINDIR)
++	mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
++	install -m 755 mt $(BINDIR)
+ 	install -c -m 444 mt.1 $(MANDIR)/man1
+ 	(if [ -f $(MANDIR)/man1/mt.1.gz ] ; then \
+ 	  rm -f $(MANDIR)/man1/mt.1.gz; gzip $(MANDIR)/man1/mt.1; fi)
+-	install -s stinit $(SBINDIR)
++	install -m 755 stinit $(SBINDIR)
+ 	install -c -m 444 stinit.8 $(MANDIR)/man8
+ 	(if [ -f $(MANDIR)/man8/stinit.8.gz ] ; then \
+ 	  rm -f $(MANDIR)/man8/stinit.8.gz; gzip $(MANDIR)/man8/stinit.8; fi)

Added: tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.8.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/mt-st/current/sources/mt-st-0.8.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/mt-st/current/specs/mt-st.spec
===================================================================
--- tinysofa/releases/1.1/mt-st/current/specs/mt-st.spec	2004-11-15 10:02:58 UTC (rev 5101)
+++ tinysofa/releases/1.1/mt-st/current/specs/mt-st.spec	2004-11-15 10:06:55 UTC (rev 5102)
@@ -1,13 +1,14 @@
 Summary: Install mt-st if you need a tool to control tape drives.
 Name: mt-st
-Version: 0.7
-Release: 9ts
-License: BSD
-Group: extra
+Version: 0.8
+Release: 1jh
+License: GPL
+Group: main
 Source: ftp://metalab.unc.edu/pub/Linux/system/backup/mt-st-%{version}.tar.gz
-Patch0: mt-st-0.6-redhat.patch
-Patch1: mt-st-0.7-SDLT220.patch
-BuildRoot: %{_tmppath}/%{name}-root
+Patch0: mt-st-0.8-redhat.patch
+Patch1: mt-st-0.7-SDLT.patch
+Patch2: mt-st-0.7-config-files.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 The mt-st package contains the mt and st tape drive management
@@ -16,22 +17,26 @@
 
 Install mt-st if you need a tool to  manage tape drives.
 
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .redhat
+%patch1 -p1 -b .sdlt
+%patch2 -p1 -b .configfiles
 
+
 %build
-make CFLAGS="$RPM_OPT_FLAGS -Wall"
+%make CFLAGS="$RPM_OPT_FLAGS -Wall"
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
-
 make install mandir=%{_mandir}
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc COPYING README README.stinit mt-st-0.* stinit.def.examples
@@ -39,21 +44,104 @@
 /sbin/stinit
 %{_mandir}/man[18]/*
 
+
 %changelog
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 0.7-9ts
-- current (0.7-9jh) integrated as 0.7-9ts for release 1.1
+* Mon Aug 09 2004 Jindrich Novy <jnovy at redhat.com> 0.8-1
+- updated to 0.8
+- updated .redhat patch
+- license fixup to GPL
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.7-8ts
-- current (0.7-7ts) integrated as 0.7-8ts for release 1.0-U1
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Fri Dec 12 2003 Erlend Midttun <erlendbm at trustix dot org> 0.7-4tr
-- Big rebuild
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 0.7-3tr
-- Big rebuild
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 0.7-2em
-- Rebuilt against glibc 2.3.2.
+* Mon May 26 2003 Than Ngo <than at redhat.com> 0.7-11.1
+- add config file for Quantum DLT drive bug #91550
 
-* Mon Aug 19 2002 Gerald Dachs <gda at trustix dot org> 0.7-1gd
-- .spec is based on RawHide .spec
+* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Sat Feb 22 2003 Than Ngo <than at redhat.com> 0.7-9
+- add density code for Quantum SDLT320 from tibbs at math.uh.edu (#84843)
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 0.7-7
+- rebuild on all arches
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Jun 19 2002 Than Ngo <than at redhat.com> 0.7-5
+- don't forcibly strip binaries
+- clean up a patch file
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Tue Feb 26 2002 Than Ngo <than at redhat.com> 0.7-3
+- rebuild
+
+* Wed Feb 20 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.7-2
+- Add density code 0x48 for Quantum SDLT220 tape drive (#59442)
+
+* Tue Feb 19 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.7-1
+- Update to 0.7
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Tue Apr 24 2001 Than Ngo <than at redhat.com>
+- update to 0.6, supports all ioctls up to kernel 2.4.0
+
+* Thu Aug 17 2000 Jeff Johnson <jbj at redhat.com>
+- summaries from specspo.
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Wed Jun 14 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging.
+
+* Sat Apr 15 2000 Jeff Johnson <jbj at redhat.com>
+- permit leading whitespace in config file.
+- cortrect spelling error.
+
+* Mon Feb  7 2000 Bill Nottingham <notting at redhat.com>
+- handle compressed manpages
+
+* Fri Jan 14 2000 Jeff Johnson <jbj at redhat.com>
+- rebuild for Red Hat 6.2.
+
+* Sun Sep  5 1999 Jeff Johnson <jbj at redhat.com>
+- enable "datcompression" command (#3654).
+
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+- auto rebuild in the new build environment (release 3)
+
+* Wed Feb 10 1999 Preston Brown <pbrown at redhat.com>
+- upgrade to .5b, which fixes some cmd. line arg issues (bugzilla #18)
+
+* Thu Jul 23 1998 Jeff Johnson <jbj at redhat.com>
+- package for 5.2.
+
+* Sun Jul 19 1998 Andrea Borgia <borgia at cs.unibo.it>
+- updated to version 0.5
+- removed the touch to force the build: no binaries are included!
+- added to the docs: README.stinit, stinit.def.examples
+- made buildroot capable
+
+* Mon Apr 27 1998 Prospector System <bugs at redhat.com>
+- translations modified for de, fr, tr
+
+* Mon Oct 20 1997 Donnie Barnes <djb at redhat.com>
+- spec file cleanups
+
+* Thu Jun 19 1997 Erik Troan <ewt at redhat.com>
+- built against glibc


From svn at tinysofa.org  Mon Nov 15 10:17:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 05:17:09 -0500 (EST)
Subject: [tinysofa-svn] 
	r5103 - tinysofa/releases/1.1/nfs-utils/current/specs
Message-ID: <20041115101709.78D333440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 05:17:08 -0500 (Mon, 15 Nov 2004)
New Revision: 5103

Modified:
   tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec
Log:
- don't use _smp_mflags


Modified: tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec
===================================================================
--- tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec	2004-11-15 10:06:55 UTC (rev 5102)
+++ tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec	2004-11-15 10:17:08 UTC (rev 5103)
@@ -96,7 +96,7 @@
 #
 ac_cv_func_innetgr=yes \
 CFLAGS="$RPM_OPT_FLAGS" %configure
-%make all
+make all
 
 
 %install


From svn at tinysofa.org  Mon Nov 15 12:51:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 07:51:57 -0500 (EST)
Subject: [tinysofa-svn] 
	r5104 - in tinysofa/releases/1.1: openswan/current/specs
	pciutils/current/specs
Message-ID: <20041115125157.96A7D3440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 07:51:56 -0500 (Mon, 15 Nov 2004)
New Revision: 5104

Modified:
   tinysofa/releases/1.1/openswan/current/specs/openswan.spec
   tinysofa/releases/1.1/pciutils/current/specs/pciutils.spec
Log:
openswan:
- multilib fix
- make with -j1
pciutils
- make with -j1


Modified: tinysofa/releases/1.1/openswan/current/specs/openswan.spec
===================================================================
--- tinysofa/releases/1.1/openswan/current/specs/openswan.spec	2004-11-15 10:17:08 UTC (rev 5103)
+++ tinysofa/releases/1.1/openswan/current/specs/openswan.spec	2004-11-15 12:51:56 UTC (rev 5104)
@@ -36,14 +36,15 @@
 
 %build
 CFLAGS="${RPM_OPT_FLAGS}" \
-%make \
+%make -j1 \
 	DESTDIR=/ \
-	PUBDIR=/usr/sbin \
-	BINDIR=/usr/lib/ipsec \
+	PUBDIR=%{_sbindir} \
+	BINDIR=%{_libdir}/ipsec \
 	INC_MANDIR=share/man \
 	INC_USRLOCAL=/usr \
 	FINALEXAMPLECONFDIR=/usr/share/doc/freeswan-%{version} \
-	FINALLIBEXECDIR=/usr/lib/ipsec \
+	FINALLIBEXECDIR=%{_libdir}/ipsec \
+	FINALLIBDIR=%{_libdir}/ipsec \
 	RCDIR=%{_initrddir} \
 	programs
 
@@ -52,12 +53,13 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
 
 %makeinstall_std \
-	PUBDIR=/usr/sbin \
-	BINDIR=/usr/lib/ipsec \
+	PUBDIR=%{_sbindir} \
+	BINDIR=%{_libdir}/ipsec \
 	INC_MANDIR=share/man \
 	INC_USRLOCAL=/usr \
 	FINALEXAMPLECONFDIR=/usr/share/doc/%{name}-%{version} \
-	FINALLIBEXECDIR=/usr/lib/ipsec \
+	FINALLIBEXECDIR=%{_libdir}/ipsec \
+	FINALLIBDIR=%{_libdir}/ipsec \
 	RCDIR=%{_initrddir}
 
 # We don't want all users to have the same secrets file :)
@@ -101,16 +103,20 @@
 %files
 %defattr(-,root,root)
 %doc doc/* CHANGES COPYING CREDITS
-/usr/lib/ipsec
+%{_libdir}/ipsec
 %config(noreplace) %attr(600,root,root) /etc/ipsec.secrets
 %config(noreplace) %attr(600,root,root) /etc/ipsec.conf
 %{_initrddir}/ipsec
 %attr(644,root,root) %{_mandir}/*/*
-/usr/sbin/ipsec
-/etc/ipsec.d
+%{_sbindir}/ipsec
+%{_sysconfdir}/ipsec.d
 
 
 %changelog
+* Mon Nov 15 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- multilib fix
+- make with -j1
+
 * Sun Sep 19 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.2.0-1jh
 - 2.2.0
 

Modified: tinysofa/releases/1.1/pciutils/current/specs/pciutils.spec
===================================================================
--- tinysofa/releases/1.1/pciutils/current/specs/pciutils.spec	2004-11-15 10:17:08 UTC (rev 5103)
+++ tinysofa/releases/1.1/pciutils/current/specs/pciutils.spec	2004-11-15 12:51:56 UTC (rev 5104)
@@ -42,7 +42,7 @@
 export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//' |\
 			sed -e 's/-D_LARGE_FILES=1//' |\
 			sed -e 's/-D_LARGEFILE64_SOURCE=1//'` %{?no_stack_protector}"
-%make OPT="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+%make -j1 OPT="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
 
 
 %install


From svn at tinysofa.org  Mon Nov 15 17:38:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 15 Nov 2004 12:38:54 -0500 (EST)
Subject: [tinysofa-svn] 
	r5105 - in tinysofa/releases/1.1/sudo/current: sources specs
Message-ID: <20041115173854.2553F3440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-15 12:38:53 -0500 (Mon, 15 Nov 2004)
New Revision: 5105

Added:
   tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p2.tar.gz
Removed:
   tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p1.tar.gz
Modified:
   tinysofa/releases/1.1/sudo/current/specs/sudo.spec
Log:
- 1.6.8p2, which fixes a security bug with bash scripts (Bug ID: #39)


Deleted: tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p1.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p2.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p2.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/sudo/current/specs/sudo.spec
===================================================================
--- tinysofa/releases/1.1/sudo/current/specs/sudo.spec	2004-11-15 12:51:56 UTC (rev 5104)
+++ tinysofa/releases/1.1/sudo/current/specs/sudo.spec	2004-11-15 17:38:53 UTC (rev 5105)
@@ -1,6 +1,6 @@
 Summary: Allows restricted root access for specified users.
 Name: sudo
-Version: 1.6.8p1
+Version: 1.6.8p2
 Release: 1jh
 License: BSD
 Group: main
@@ -69,12 +69,14 @@
 %exclude %attr(0755,root,root) %{_libdir}/sudo_noexec.la
 
 %changelog
+* Mon Nov 15 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.6.8p2-1jh
+- 1.6.8p2, which fixes a security bug with bash scripts
+
 * Mon Sep 20 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.6.8p1-1jh
 - 1.6.8p1
 - rationalize file permissions
 - spec cleanups
 
-
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.6.7p5-7ts
 - current (1.6.7p5-7jh) integrated as 1.6.7p5-7ts for release 1.1
 


From svn at tinysofa.org  Tue Nov 16 10:48:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 16 Nov 2004 05:48:40 -0500 (EST)
Subject: [tinysofa-svn] r5106 - contrib/1.1/subversion/current/specs
Message-ID: <20041116104840.0E8F23440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-16 05:48:38 -0500 (Tue, 16 Nov 2004)
New Revision: 5106

Modified:
   contrib/1.1/subversion/current/specs/subversion.spec
Log:
- BR: expat-devel, gdbm-devel, httpd-devel


Modified: contrib/1.1/subversion/current/specs/subversion.spec
===================================================================
--- contrib/1.1/subversion/current/specs/subversion.spec	2004-11-15 17:38:53 UTC (rev 5105)
+++ contrib/1.1/subversion/current/specs/subversion.spec	2004-11-16 10:48:38 UTC (rev 5106)
@@ -19,7 +19,7 @@
 BuildPreReq: autoconf, libtool, python, python-devel, texinfo, gettext
 BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5, swig-python, swig-perl
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1
-BuildPreReq: openssl-devel
+BuildPreReq: openssl-devel, expat-devel, gdbm-devel, httpd-devel
 BuildPreReq: perl-devel, cyrus-sasl-devel ,gcc-c++
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 


From svn at tinysofa.org  Tue Nov 16 16:26:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 16 Nov 2004 11:26:31 -0500 (EST)
Subject: [tinysofa-svn] 
	r5107 - in tinysofa/releases/1.1/fcron/current: sources specs
Message-ID: <20041116162631.32C813440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-16 11:26:29 -0500 (Tue, 16 Nov 2004)
New Revision: 5107

Added:
   tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.5.1.src.tar.gz
Removed:
   tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.5.src.tar.gz
Modified:
   tinysofa/releases/1.1/fcron/current/specs/fcron.spec
Log:
- 2.9.5.1 which fixes fcronsighup vulnerabilities

Added: tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.5.1.src.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.5.1.src.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.5.src.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec
===================================================================
--- tinysofa/releases/1.1/fcron/current/specs/fcron.spec	2004-11-16 10:48:38 UTC (rev 5106)
+++ tinysofa/releases/1.1/fcron/current/specs/fcron.spec	2004-11-16 16:26:29 UTC (rev 5107)
@@ -1,7 +1,7 @@
 Summary: The fcron daemon for executing specified programs at set times
 Name: fcron
-Version: 2.9.5
-Release: 2jh
+Version: 2.9.5.1
+Release: 1jh
 License: GPL
 Group: main
 Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz
@@ -134,6 +134,9 @@
 
 
 %changelog
+* Tue Nov 16 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.9.5.1-1jh
+- 2.9.5.1 which fixes fcronsighup vulnerabilities
+
 * Wed Oct 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.9.5-2jh
 - allow root to use crontab as default
 


From svn at tinysofa.org  Tue Nov 16 16:55:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 16 Nov 2004 11:55:37 -0500 (EST)
Subject: [tinysofa-svn] 
	r5110 - in tinysofa/releases/1.1/postfix/current: sources specs
Message-ID: <20041116165537.3DC5B3440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-16 11:55:36 -0500 (Tue, 16 Nov 2004)
New Revision: 5110

Added:
   tinysofa/releases/1.1/postfix/current/sources/postfix-2.0.20-vda.patch
Modified:
   tinysofa/releases/1.1/postfix/current/specs/postfix.spec
Log:
- add vda patch
- rationalize pre, post and postun scripts


Added: tinysofa/releases/1.1/postfix/current/sources/postfix-2.0.20-vda.patch
===================================================================
--- tinysofa/releases/1.1/postfix/current/sources/postfix-2.0.20-vda.patch	2004-11-16 16:34:14 UTC (rev 5109)
+++ tinysofa/releases/1.1/postfix/current/sources/postfix-2.0.20-vda.patch	2004-11-16 16:55:36 UTC (rev 5110)
@@ -0,0 +1,676 @@
+diff -u --new-file --recursive postfix-2.0.20-orig/src/global/mail_params.h postfix-2.0.20/src/global/mail_params.h
+--- postfix-2.0.20-orig/src/global/mail_params.h	2003-03-03 19:07:03.000000000 -0300
++++ postfix-2.0.20/src/global/mail_params.h	2004-04-23 09:48:52.000000000 -0300
+@@ -1423,6 +1423,38 @@
+ #define DEF_VIRT_GID_MAPS		""
+ extern char *var_virt_gid_maps;
+ 
++#define VAR_VIRT_MAILBOX_LIMIT_MAPS	"virtual_mailbox_limit_maps"
++#define DEF_VIRT_MAILBOX_LIMIT_MAPS	""
++extern char *var_virt_mailbox_limit_maps;
++
++#define VAR_VIRT_MAILDIR_LIMIT_MESSAGE	"virtual_maildir_limit_message"
++#define DEF_VIRT_MAILDIR_LIMIT_MESSAGE	"Sorry, the user's maildir has overdrawn his diskspace quota, please try again later."
++extern char *var_virt_maildir_limit_message;
++
++#define VAR_VIRT_MAILBOX_LIMIT_INBOX	"virtual_mailbox_limit_inbox"
++#define DEF_VIRT_MAILBOX_LIMIT_INBOX	0
++extern bool var_virt_mailbox_limit_inbox;
++
++#define VAR_VIRT_MAILBOX_LIMIT_OVERRIDE	"virtual_mailbox_limit_override"
++#define DEF_VIRT_MAILBOX_LIMIT_OVERRIDE	0
++extern bool var_virt_mailbox_limit_override;
++
++#define	VAR_VIRT_MAILDIR_EXTENDED	"virtual_maildir_extended"
++#define DEF_VIRT_MAILDIR_EXTENDED	0
++extern bool var_virt_maildir_extended;
++
++#define VAR_VIRT_CREATE_MAILDIRSIZE	"virtual_create_maildirsize"
++#define DEF_VIRT_CREATE_MAILDIRSIZE	0
++extern bool var_virt_create_maildirsize;
++
++#define VAR_VIRT_OVERQUOTA_BOUNCE	"virtual_overquota_bounce"
++#define DEF_VIRT_OVERQUOTA_BOUNCE	0
++extern bool var_virt_overquota_bounce;
++
++#define VAR_VIRT_MAILDIR_SUFFIX		"virtual_maildir_suffix"
++#define DEF_VIRT_MAILDIR_SUFFIX		""
++extern char *var_virt_maildir_suffix;
++
+ #define VAR_VIRT_MINUID			"virtual_minimum_uid"
+ #define DEF_VIRT_MINUID			100
+ extern int var_virt_minimum_uid;
+diff -u --new-file --recursive postfix-2.0.20-orig/src/util/file_limit.c postfix-2.0.20/src/util/file_limit.c
+--- postfix-2.0.20-orig/src/util/file_limit.c	2000-08-22 18:44:44.000000000 -0300
++++ postfix-2.0.20/src/util/file_limit.c	2004-04-23 09:48:52.000000000 -0300
+@@ -85,7 +85,11 @@
+ #else
+     struct rlimit rlim;
+ 
+-    rlim.rlim_cur = rlim.rlim_max = limit;
++    /* rlim_max can be changed only by a root */
++    if (getrlimit(RLIMIT_FSIZE, &rlim) < 0)
++      msg_fatal("getrlimit: %m");
++    
++    rlim.rlim_cur = limit;
+     if (setrlimit(RLIMIT_FSIZE, &rlim) < 0)
+ 	msg_fatal("setrlimit: %m");
+ #ifdef SIGXFSZ
+diff -u --new-file --recursive postfix-2.0.20-orig/src/virtual/mailbox.c postfix-2.0.20/src/virtual/mailbox.c
+--- postfix-2.0.20-orig/src/virtual/mailbox.c	2002-12-09 13:38:48.000000000 -0200
++++ postfix-2.0.20/src/virtual/mailbox.c	2004-04-23 09:48:52.000000000 -0300
+@@ -56,6 +56,7 @@
+ /* Global library. */
+ 
+ #include <mail_copy.h>
++#include <mail_addr_find.h>
+ #include <mbox_open.h>
+ #include <defer.h>
+ #include <sent.h>
+@@ -73,6 +74,40 @@
+ #define YES	1
+ #define NO	0
+ 
++/* change_mailbox_limit - change limit for mailbox file */
++
++static int change_mailbox_limit(LOCAL_STATE state, USER_ATTR usr_attr)
++{
++    char   *myname = "change_mailbox_limit";
++    const char *limit_res;
++    long    n;
++    int     status = NO;
++    
++    /*
++     * Look up the mailbox limit size. Fall back to virtual_mailbox_limit in
++     * case limit is smaller than message_size_limit.
++     */
++    if (limit_res = mail_addr_find(virtual_mailbox_limit_maps,
++				   state.msg_attr.user, (char **) 0)) {
++	n = atol(limit_res);
++	if ((n > 0) && (n < var_message_limit) && (!var_virt_mailbox_limit_override)) {
++	    msg_warn("recipient %s: mailbox limit is smaller than %s "
++		     "in %s - falling back to %s",
++		     state.msg_attr.user, VAR_MESSAGE_LIMIT,
++		     virtual_mailbox_limit_maps->title,
++		     VAR_VIRT_MAILBOX_LIMIT);
++	} else {
++	    set_file_limit(n);
++	    status = YES;
++	    if (msg_verbose)
++	        msg_info("%s[%d]: set maximum mailbox size %s to %ld",
++			 myname, state.level, usr_attr.mailbox, n);
++	}
++    }
++
++    return (status);
++}
++
+ /* deliver_mailbox_file - deliver to recipient mailbox */
+ 
+ static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr)
+@@ -192,13 +227,21 @@
+      * Look up the mailbox owner rights. Defer in case of trouble.
+      */
+     uid_res = virtual8_maps_find(virtual_uid_maps, state.msg_attr.user);
+-    if (uid_res == 0) {
+-	*statusp = defer_append(BOUNCE_FLAG_KEEP, BOUNCE_ATTR(state.msg_attr),
+-				"recipient %s: uid not found in %s",
+-			      state.msg_attr.user, virtual_uid_maps->title);
+-	RETURN(YES);
+-    }
+-    if ((n = atol(uid_res)) < var_virt_minimum_uid) {
++    if ((uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user,
++ 				     (char **) 0)) == 0) {
++	if ((uid_res = maps_find(virtual_uid_maps,
++				 strchr(state.msg_attr.user, '@'),
++				 DICT_FLAG_FIXED)) == 0) {
++	    *statusp = defer_append(BOUNCE_FLAG_KEEP,
++				    BOUNCE_ATTR(state.msg_attr),
++				    "recipient %s: uid not found in %s",
++				    state.msg_attr.user,
++				    virtual_uid_maps->title);
++	    RETURN(YES);
++	}
++     }
++
++   if ((n = atol(uid_res)) < var_virt_minimum_uid) {
+ 	*statusp = defer_append(BOUNCE_FLAG_KEEP, BOUNCE_ATTR(state.msg_attr),
+ 				"recipient %s: bad uid %s in %s",
+ 		     state.msg_attr.user, uid_res, virtual_uid_maps->title);
+@@ -210,11 +253,17 @@
+      * Look up the mailbox group rights. Defer in case of trouble.
+      */
+     gid_res = virtual8_maps_find(virtual_gid_maps, state.msg_attr.user);
+-    if (gid_res == 0) {
+-	*statusp = defer_append(BOUNCE_FLAG_KEEP, BOUNCE_ATTR(state.msg_attr),
++    if ((gid_res = mail_addr_find(virtual_gid_maps, state.msg_attr.user,
++				  (char **) 0)) == 0) {
++      if ((gid_res = maps_find(virtual_gid_maps,
++			       strchr(state.msg_attr.user, '@'),
++			       DICT_FLAG_FIXED)) == 0) {
++	*statusp = defer_append(BOUNCE_FLAG_KEEP,
++				BOUNCE_ATTR(state.msg_attr),
+ 				"recipient %s: gid not found in %s",
+ 			      state.msg_attr.user, virtual_gid_maps->title);
+ 	RETURN(YES);
++		}		
+     }
+     if ((n = atol(gid_res)) <= 0) {
+ 	*statusp = defer_append(BOUNCE_FLAG_KEEP, BOUNCE_ATTR(state.msg_attr),
+@@ -236,9 +285,17 @@
+ 
+     if (LAST_CHAR(usr_attr.mailbox) == '/')
+ 	*statusp = deliver_maildir(state, usr_attr);
+-    else
+-	*statusp = deliver_mailbox_file(state, usr_attr);
+ 
++    else {
++      int changed_limit;
++      
++      changed_limit = change_mailbox_limit(state, usr_attr);
++      *statusp = deliver_mailbox_file(state, usr_attr);
++      
++      if (changed_limit)
++	set_file_limit(var_virt_mailbox_limit);
++    }
++ 
+     /*
+      * Cleanup.
+      */
+diff -u --new-file --recursive postfix-2.0.20-orig/src/virtual/maildir.c postfix-2.0.20/src/virtual/maildir.c
+--- postfix-2.0.20-orig/src/virtual/maildir.c	2003-02-19 16:15:11.000000000 -0300
++++ postfix-2.0.20/src/virtual/maildir.c	2004-04-23 09:48:52.000000000 -0300
+@@ -38,6 +38,12 @@
+ #include <sys/stat.h>
+ #include <time.h>
+ #include <errno.h>
++#include <sys/types.h>	/* opendir(3), stat(2) */
++#include <sys/stat.h>	/* stat(2) */
++#include <dirent.h>	/* opendir(3) */
++#include <unistd.h>	/* stat(2) */
++#include <stdlib.h>	/* atol(3) */
++#include <string.h>	/* strrchr(3) */
+ 
+ #ifndef EDQUOT
+ #define EDQUOT EFBIG
+@@ -48,8 +54,7 @@
+ #include <msg.h>
+ #include <mymalloc.h>
+ #include <stringops.h>
+-#include <vstream.h>
+-#include <vstring.h>
++#include <vstring_vstream.h>
+ #include <make_dirs.h>
+ #include <set_eugid.h>
+ #include <get_hostname.h>
+@@ -58,6 +63,7 @@
+ /* Global library. */
+ 
+ #include <mail_copy.h>
++#include <mail_addr_find.h>
+ #include <bounce.h>
+ #include <defer.h>
+ #include <sent.h>
+@@ -67,24 +73,156 @@
+ 
+ #include "virtual.h"
+ 
++/* The maximum size of a maildirsize file */
++#define SIZEFILE_MAX 5120
++
++/*
++ * Gives the size of the file according of the Maildir++ extensions
++ * (code taken from courier-imap).
++ *
++ * Arguments :
++ *  n : filename
++ *  
++ * Return the size given in ",S=size" in the filename,
++ *    zero if it cannot find ",S=size" in the filename...
++ *
++ */
++static long maildir_parsequota(const char *n)
++{
++const char *o;
++int	yes;
++long	s;
++	if ((o=strrchr(n, '/')) == 0)	o=n;
++
++	for (; *o; o++)
++		if (*o == ':')	break;
++	yes=0;
++	for ( ; o >= n; --o)
++	{
++		if (*o == '/')	break;
++
++		if (*o == ',' && o[1] == 'S' && o[2] == '=')
++		{
++			yes=1;
++			o += 3;
++			break;
++		}
++	}
++	if (yes)
++	{
++		s=0;
++		while (*o >= '0' && *o <= '9')
++			s= s*10 + (*o++ - '0');
++		return s;
++	}
++	return 0;
++}
++
++/*
++ * Checks directory files for quota (taken from exim)
++ *
++ * This function is called if quota is set for a virtual Maildir box.
++ * It scans the directory and stats all the files in order to get a total
++ * size and count. This is an expensive thing to do. But in this way no
++ * write access is needed in a single file that can be erased or metled
++ * because a lock problem.
++ *
++ * Arguments :
++ *  dirname : the name of the directory
++ *  countptr: where to add the file count (because this function recurses)
++ *  mailplus: is check will look at Maildir++ functionality if configured
++ *
++ * Returns the sum of the sizes of stattable files
++ *    zero if the directory cannot be opened.
++ */
++static long check_dir_size(char *dirname, long *countptr, bool mailplus) 
++{
++   DIR    *dir;
++   long   count = *countptr;
++   long   sum = 0;
++   struct dirent *ent;
++   struct stat   statbuf;
++
++   dir = opendir(dirname);
++   if (dir == NULL) {
++     if (make_dirs(dirname,0700) == 0) {	/* Try to create dirs */
++       dir = opendir(dirname);			/* Reopen the dir */
++       if (dir == NULL) {
++	  msg_warn("check_dir_size: cannot open directory : %s, try twice", dirname);
++	  return 0;
++       }
++     } else {
++       msg_warn("check_dir_size: cannot open directory : %s", dirname);
++       return 0;
++     }
++   }
++
++   while ((ent = readdir(dir)) != NULL) {
++     char *name = ent->d_name;
++     VSTRING *buffer;
++
++     if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) continue;
++     count++;
++   
++     if (var_virt_maildir_extended && mailplus) {
++       /*
++        * Using Maildir++ size computation and check only the 
++        * directory we've has been asked to
++        */
++       sum += maildir_parsequota(name);
++
++     } else {
++
++       buffer = vstring_alloc(1024);
++    
++       vstring_sprintf(buffer,"%s/%s",dirname,name);
++       if (stat(vstring_str(buffer), &statbuf) < 0) {
++	  vstring_free(buffer);
++	  continue;
++       }
++       if ((statbuf.st_mode & S_IFREG) != 0)
++	  sum += statbuf.st_size;
++       else if ((statbuf.st_mode & S_IFDIR) != 0)
++	       sum += check_dir_size(vstring_str(buffer), &count, mailplus);
++       vstring_free(buffer);
++     }
++   }
++   closedir(dir);
++   if (msg_verbose)
++      msg_info("check_dir_size: dir=%s sum=%ld count=%ld", dirname, sum, count);
++   *countptr = count;
++   return sum;
++}
++
+ /* deliver_maildir - delivery to maildir-style mailbox */
+ 
+ int     deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr)
+ {
+-    char   *myname = "deliver_maildir";
+-    char   *newdir;
+-    char   *tmpdir;
+-    char   *curdir;
+-    char   *tmpfile;
+-    char   *newfile;
++    char    *myname = "deliver_maildir";
++    char    *newdir;
++    char    *tmpdir;
++    char    *curdir;
++    char    *tmpfile;
++    char    *newfile;
+     VSTRING *why;
+     VSTRING *buf;
+     VSTREAM *dst;
+     int     mail_copy_status;
+     int     deliver_status;
+     int     copy_flags;
+-    struct stat st;
++    struct  stat st;
+     time_t  starttime = time((time_t *) 0);
++    /* Maildir Quota */
++    const char *limit_res;		/* Limit from map */
++    char    *sizefilename=(char *)0;
++    VSTRING *filequota;			/* Quota in from 'maildirsize' file */
++    VSTREAM *sizefile;
++    long     n;				/* Limit in integer format */
++    long     cur_quota;			/* Current quota */
++    long     saved_size;		/* The quota of the Maildir at all */
++    struct   stat statbuf;		/* To check the size of the mail written */
++    struct   stat sizefile_stat;	/* To check the size of the maildirsize file (cannot be larger than 5k) */
++    time_t   tm;
+ 
+     /*
+      * Make verbose logging easier to understand.
+@@ -107,9 +245,77 @@
+     copy_flags = MAIL_COPY_TOFILE | MAIL_COPY_RETURN_PATH
+ 	| MAIL_COPY_DELIVERED | MAIL_COPY_ORIG_RCPT;
+ 
+-    newdir = concatenate(usr_attr.mailbox, "new/", (char *) 0);
+-    tmpdir = concatenate(usr_attr.mailbox, "tmp/", (char *) 0);
+-    curdir = concatenate(usr_attr.mailbox, "cur/", (char *) 0);
++    /*
++     * Concat the maildir suffix if it is set.
++     */
++    if (*var_virt_maildir_suffix == 0) {
++	newdir = concatenate(usr_attr.mailbox, "new/", (char *) 0);
++        tmpdir = concatenate(usr_attr.mailbox, "tmp/", (char *) 0);
++        curdir = concatenate(usr_attr.mailbox, "cur/", (char *) 0);
++    } else {
++        newdir = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0);
++        tmpdir = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0);
++        curdir = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0);
++        newdir = concatenate(newdir, "new/", (char *) 0);
++        tmpdir = concatenate(tmpdir, "tmp/", (char *) 0);
++        curdir = concatenate(curdir, "cur/", (char *) 0);
++    }
++
++     /*
++     * Find the Maildir limit in the maps. Fall back virtual_mailbox_limit in
++     * case limit is smaller than message_size_limit.
++     */
++    if ((limit_res = mail_addr_find(virtual_mailbox_limit_maps,
++				  state.msg_attr.user, (char **) 0))) {
++       n = atol(limit_res);
++       if(!var_virt_mailbox_limit_override) {
++        if ((n > 0) && (n < var_message_limit)) {
++            msg_warn("(2)recipient %s: maildir limit is smaller than %s "
++	             "in %s - falling back to %s.",
++		     state.msg_attr.user, VAR_MESSAGE_LIMIT,
++		     virtual_mailbox_limit_maps->title,
++		     VAR_VIRT_MAILBOX_LIMIT);
++        } else {
++	    if (msg_verbose)
++	        msg_info("%s[%d]: set maximum mailbox size %s to %ld.",
++			 myname, state.level, usr_attr.mailbox,n);
++        }
++       }
++    } else {
++       /*
++	* There is no limit there... then set n to 0
++	*/
++       n = 0;
++    }
++    
++    /*
++     * Checking quota before delivering the mail
++     */
++    cur_quota = 0;	/* sanity */
++    saved_size = 0;	/* sanity */
++    if ( n != 0 ) {
++            set_eugid(usr_attr.uid, usr_attr.gid);
++	    if (var_virt_mailbox_limit_inbox) {
++		    /*
++		     * Check only inbox
++		     */
++		    saved_size = check_dir_size(newdir, &cur_quota, 1);
++		    cur_quota = 0;
++		    saved_size += check_dir_size(curdir, &cur_quota, 1);
++		    cur_quota = 0;
++		    /* Checked without Maildir++ file format */
++		    saved_size += check_dir_size(tmpdir, &cur_quota, 0);
++	    } else {
++		    /*
++		     * Check all boxes. 
++		     * This will use "old" stat() call instead of fast
++		     * Maildir++ support because we cannot afford the
++		     * time to test all filename types...
++		     */
++		    saved_size = check_dir_size(usr_attr.mailbox, &cur_quota, 0);
++	    }
++            set_eugid(var_owner_uid, var_owner_gid);
++    }
+ 
+     /*
+      * Create and write the file as the recipient, so that file quota work.
+@@ -183,6 +389,39 @@
+ 	newfile = concatenate(newdir, STR(buf), (char *) 0);
+ 	if ((mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr),
+ 					dst, copy_flags, "\n", why)) == 0) {
++	  /*
++	   * Add a ",S=<sizeoffile>" to the file newly written according to
++	   * Maildir++ specifications : http://www.inter7.com/courierimap/README.maildirquota.html
++	   * This needs a stat(2) of the tempfile and modification of the
++	   * name of the file.
++	   */
++	  if (var_virt_maildir_extended) {
++	    /* Check size of the new mail created */
++	    if (stat(tmpfile, &statbuf) == 0) {
++	      /* We can stat it then append the size of the file to newfile */
++	      vstring_sprintf(buf,",S=%ld", (long) statbuf.st_size);
++	      newfile = concatenate(newfile, STR(buf), (char *) 0);
++	      if ( n != 0 )
++		saved_size += (long) statbuf.st_size;	/* Adding to the current quota */
++	    }
++	  } else {
++	    if ( n != 0 ) {
++	      if (stat(tmpfile, &statbuf) == 0) saved_size += (long) statbuf.st_size;
++	    }
++	  }
++	  /*
++	   * Now we have the maildir size in saved_file, compare to the value
++	   * and evenualy issue a message that we overdrawn the max size
++	   */
++	  if (saved_size > n) {
++		    mail_copy_status = MAIL_COPY_STAT_WRITE;
++ 		    vstring_sprintf(why,"%s",var_virt_maildir_limit_message);
++                    if ( statbuf.st_size > n || var_virt_overquota_bounce )
++                        errno = EFBIG;
++                    else
++ 		        errno = EDQUOT;
++	  } else {
++	    /* Deliver to curdir */
+ 	    if (sane_link(tmpfile, newfile) < 0
+ 		&& (errno != ENOENT
+ 		    || (make_dirs(curdir, 0700), make_dirs(newdir, 0700)) < 0
+@@ -190,6 +429,49 @@
+ 		vstring_sprintf(why, "link to %s: %m", newfile);
+ 		mail_copy_status = MAIL_COPY_STAT_WRITE;
+ 	    }
++	    if(var_virt_create_maildirsize) {
++	      time(&tm);
++		if (*var_virt_maildir_suffix == 0) {
++		  sizefilename = concatenate(usr_attr.mailbox, "maildirsize", (char *) 0);
++		} else {
++		  sizefilename = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0);
++		  sizefilename = concatenate(sizefilename, "maildirsize", (char *) 0);
++ 		}
++                // Make sure the quota in file is the same as in maildirsize file
++                sizefile = vstream_fopen(sizefilename, O_RDONLY, 0);
++                if ( sizefile ) {
++                    filequota = vstring_alloc(128);
++                    vstring_get_null_bound(filequota, sizefile, 127);
++                    vstream_fclose(sizefile);
++                    if ( atol(vstring_export(filequota)) != n)
++                        unlink(sizefilename);
++                }
++                // Open maildirsize to append this transaction
++                sizefile = vstream_fopen(sizefilename, O_WRONLY | O_APPEND, 0644);
++                // If the open fails (maildirsize doesn't exist), or it's too large
++		// try to overwrite it
++                if( ! sizefile || ( stat(sizefilename, &sizefile_stat) != 0) || 
++				(int)sizefile_stat.st_size>SIZEFILE_MAX ||
++		    (int)sizefile_stat.st_mtime + 15*60 < tm ) {
++		  // If the file exists, sizefile has been open above; close it.
++		  if (sizefile) {
++		    vstream_fclose(sizefile);
++		    sizefile = vstream_fopen( sizefilename, O_WRONLY | O_TRUNC, 0644);
++		    } else
++		      sizefile = vstream_fopen( sizefilename, O_WRONLY | O_CREAT, 0644);
++		  // If the create works, write the file, otherwise just give up.
++		  if( sizefile ) {
++		    vstream_fprintf(sizefile, "%dS\n%d 1\n", (int)n, (int)saved_size);
++		    vstream_fclose(sizefile);
++                    }
++                } else {
++		  // We openned maildirsize, append our transaction and close it.
++		  vstream_fprintf(sizefile, "%d 1\n", (int)statbuf.st_size);
++		  vstream_fclose(sizefile);
++                }
++            }
++	  }
++	  
+ 	}
+ 	if (unlink(tmpfile) < 0)
+ 	    msg_warn("remove %s: %m", tmpfile);
+@@ -204,7 +486,7 @@
+     if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
+ 	deliver_status = DEL_STAT_DEFER;
+     } else if (mail_copy_status != 0) {
+-	deliver_status = (errno == EDQUOT || errno == EFBIG ?
++	deliver_status = (errno == EFBIG ?
+ 			  bounce_append : defer_append)
+ 	    (BOUNCE_FLAG_KEEP, BOUNCE_ATTR(state.msg_attr),
+ 	     "maildir delivery failed: %s", vstring_str(why));
+@@ -217,6 +499,9 @@
+     myfree(newdir);
+     myfree(tmpdir);
+     myfree(curdir);
++    if(var_virt_create_maildirsize && errno != EFBIG && errno != EDQUOT )
++    if (sizefilename)
++	myfree(sizefilename);
+     myfree(tmpfile);
+     if (newfile)
+ 	myfree(newfile);
+diff -u --new-file --recursive postfix-2.0.20-orig/src/virtual/virtual.c postfix-2.0.20/src/virtual/virtual.c
+--- postfix-2.0.20-orig/src/virtual/virtual.c	2003-06-05 12:40:46.000000000 -0300
++++ postfix-2.0.20/src/virtual/virtual.c	2004-04-23 09:48:52.000000000 -0300
+@@ -68,8 +68,10 @@
+ /* .fi
+ /*	Mailbox ownership is controlled by the \fBvirtual_uid_maps\fR
+ /*	and \fBvirtual_gid_maps\fR lookup tables, which are indexed
+-/*	with the full recipient address. Each table provides
+-/*	a string with the numerical user and group ID, respectively.
++/*	with the full recipient address (\fIuser at domain\fR),
++/*	user name (\fIuser\fR) or domain name (\fI at domain\fR).
++/*	Each table provides a string with the numerical user and group ID,
++/*	respectively.
+ /*
+ /*	The \fBvirtual_minimum_uid\fR parameter imposes a lower bound on
+ /*	numerical user ID values that may be specified in any
+@@ -299,10 +301,18 @@
+ char   *var_virt_mailbox_maps;
+ char   *var_virt_uid_maps;
+ char   *var_virt_gid_maps;
++char	 *var_virt_mailbox_limit_maps;
+ int     var_virt_minimum_uid;
+ char   *var_virt_mailbox_base;
+ char   *var_virt_mailbox_lock;
+ int     var_virt_mailbox_limit;
++char   *var_virt_maildir_limit_message;
++bool	  var_virt_mailbox_limit_inbox;
++bool	  var_virt_mailbox_limit_override;
++bool	  var_virt_maildir_extended;
++char   *var_virt_maildir_suffix;
++bool	  var_virt_create_maildirsize;
++bool	var_virt_overquota_bounce;
+ char   *var_mail_spool_dir;		/* XXX dependency fix */
+ 
+  /*
+@@ -311,6 +321,7 @@
+ MAPS   *virtual_mailbox_maps;
+ MAPS   *virtual_uid_maps;
+ MAPS   *virtual_gid_maps;
++MAPS	 *virtual_mailbox_limit_maps;
+ 
+  /*
+   * Bit masks.
+@@ -413,15 +424,19 @@
+ 
+     virtual_mailbox_maps =
+ 	virtual8_maps_create(VAR_VIRT_MAILBOX_MAPS, var_virt_mailbox_maps,
+-			     DICT_FLAG_LOCK | DICT_FLAG_PARANOID);
++			     DICT_FLAG_LOCK );
+ 
+     virtual_uid_maps =
+ 	virtual8_maps_create(VAR_VIRT_UID_MAPS, var_virt_uid_maps,
+-			     DICT_FLAG_LOCK | DICT_FLAG_PARANOID);
++			     DICT_FLAG_LOCK );
+ 
+     virtual_gid_maps =
+ 	virtual8_maps_create(VAR_VIRT_GID_MAPS, var_virt_gid_maps,
+-			     DICT_FLAG_LOCK | DICT_FLAG_PARANOID);
++			     DICT_FLAG_LOCK );
++
++	 virtual_mailbox_limit_maps =
++   virtual8_maps_create(VAR_VIRT_MAILBOX_LIMIT_MAPS, var_virt_mailbox_limit_maps,
++			     DICT_FLAG_LOCK );
+ 
+     virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock);
+ }
+@@ -456,13 +471,24 @@
+ 	VAR_VIRT_MAILBOX_LIMIT, DEF_VIRT_MAILBOX_LIMIT, &var_virt_mailbox_limit, 0, 0,
+ 	0,
+     };
++    static CONFIG_BOOL_TABLE bool_table[] = {
++      VAR_VIRT_MAILBOX_LIMIT_INBOX, DEF_VIRT_MAILBOX_LIMIT_INBOX, &var_virt_mailbox_limit_inbox,
++      VAR_VIRT_MAILBOX_LIMIT_OVERRIDE, DEF_VIRT_MAILBOX_LIMIT_OVERRIDE, &var_virt_mailbox_limit_override,
++      VAR_VIRT_MAILDIR_EXTENDED, DEF_VIRT_MAILDIR_EXTENDED, &var_virt_maildir_extended,
++      VAR_VIRT_CREATE_MAILDIRSIZE, DEF_VIRT_CREATE_MAILDIRSIZE, &var_virt_create_maildirsize,
++      VAR_VIRT_OVERQUOTA_BOUNCE, DEF_VIRT_OVERQUOTA_BOUNCE, &var_virt_overquota_bounce,
++      0,
++    };
+     static CONFIG_STR_TABLE str_table[] = {
+ 	VAR_MAIL_SPOOL_DIR, DEF_MAIL_SPOOL_DIR, &var_mail_spool_dir, 0, 0,
+ 	VAR_VIRT_MAILBOX_MAPS, DEF_VIRT_MAILBOX_MAPS, &var_virt_mailbox_maps, 0, 0,
+ 	VAR_VIRT_UID_MAPS, DEF_VIRT_UID_MAPS, &var_virt_uid_maps, 0, 0,
+ 	VAR_VIRT_GID_MAPS, DEF_VIRT_GID_MAPS, &var_virt_gid_maps, 0, 0,
++	VAR_VIRT_MAILBOX_LIMIT_MAPS, DEF_VIRT_MAILBOX_LIMIT_MAPS, &var_virt_mailbox_limit_maps, 0, 0,
+ 	VAR_VIRT_MAILBOX_BASE, DEF_VIRT_MAILBOX_BASE, &var_virt_mailbox_base, 1, 0,
+ 	VAR_VIRT_MAILBOX_LOCK, DEF_VIRT_MAILBOX_LOCK, &var_virt_mailbox_lock, 1, 0,
++	VAR_VIRT_MAILDIR_LIMIT_MESSAGE, DEF_VIRT_MAILDIR_LIMIT_MESSAGE, &var_virt_maildir_limit_message, 1, 0,
++	VAR_VIRT_MAILDIR_SUFFIX, DEF_VIRT_MAILDIR_SUFFIX, &var_virt_maildir_suffix, 0, 0,
+ 	0,
+     };
+ 
+@@ -472,5 +498,6 @@
+ 		       MAIL_SERVER_PRE_INIT, pre_init,
+ 		       MAIL_SERVER_POST_INIT, post_init,
+ 		       MAIL_SERVER_PRE_ACCEPT, pre_accept,
++		       MAIL_SERVER_BOOL_TABLE, bool_table,
+ 		       0);
+ }
+diff -u --new-file --recursive postfix-2.0.20-orig/src/virtual/virtual.h postfix-2.0.20/src/virtual/virtual.h
+--- postfix-2.0.20-orig/src/virtual/virtual.h	2002-10-25 22:04:39.000000000 -0300
++++ postfix-2.0.20/src/virtual/virtual.h	2004-04-23 09:48:52.000000000 -0300
+@@ -32,6 +32,7 @@
+ extern MAPS *virtual_mailbox_maps;
+ extern MAPS *virtual_uid_maps;
+ extern MAPS *virtual_gid_maps;
++extern MAPS *virtual_mailbox_limit_maps;
+ 
+  /*
+   * User attributes: these control the privileges for delivery to external

Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-11-16 16:34:14 UTC (rev 5109)
+++ tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-11-16 16:55:36 UTC (rev 5110)
@@ -1,7 +1,7 @@
 Summary: The Postfix mailer daemon
 Name: postfix
 Version: 2.0.20
-Release: 1jh
+Release: 2jh
 License: IBM Public Licence
 Group: main
 Source: ftp://ftp.sunet.se/pub/unix/mail/postfix/official/postfix-%{version}.tar.gz
@@ -38,15 +38,14 @@
 Patch15: postfix-2.0.13-sasl-postfix.patch
 Patch16: postfix-2.0.19-sql-libs.patch
 Patch17: postfix-2.1.1-pie.patch
+Patch18: postfix-2.0.20-vda.patch
 URL: http://www.postfix.org
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 %service_requires
 BuildRequires: openssl-devel >= %{version_ssl}
 BuildRequires: cyrus-sasl-devel
 BuildRequires: mysql-devel, postgresql-devel >= 7.4-1tr, openldap-devel
-BuildRequires: mysql-libs
-BuildRequires: pcre-devel, db4-devel, zlib-devel
-BuildRequires: pam-devel
+BuildRequires: pcre-devel, db4-devel, zlib-devel, pam-devel
 Requires: findutils, db4, zlib, pam
 # only needs /usr/bin/cmp from diffutils
 Requires: /usr/bin/cmp
@@ -124,7 +123,8 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1 -b .pie
+%patch17 -p1 -b .pie~
+%patch18 -p1 -b .vda~
 
 
 %build
@@ -145,7 +145,7 @@
 	ln -fs lib$i.a libpostfix-$i.so.1;
 done
 cd ..
-make LD_LIBRARY_PATH=`pwd`/lib
+%make -j1 LD_LIBRARY_PATH=`pwd`/lib
 
 
 %install
@@ -255,10 +255,6 @@
 
 
 %pre
-if [ -x /etc/init.d/postfix ]; then
-	/etc/init.d/postfix stop >/dev/null 2>&1 || :
-fi
-# Dynamically add the postfix user BEFORE installing package
 if [ -z "`getent group postfix`" ]; then
         /usr/sbin/groupadd -g 102 postfix
 fi
@@ -266,7 +262,7 @@
         /usr/sbin/groupadd -g 107 postdrop
 fi
 if [ -z "`getent passwd postfix`" ]; then
-        /usr/sbin/useradd -d /no/dir -s /no/shell \
+        /usr/sbin/useradd -d /no/dir -s /sbin/nologin \
         -g postfix -u 102  postfix
 fi
 
@@ -276,15 +272,16 @@
 %service_post -o postfix
 /etc/postfix/postfix-dynupdate normal
 /etc/postfix/post-install upgrade-source
-/etc/init.d/postfix start >/dev/null 2>&1 || :
+if [ $1 -le 1 ]; then
+	/etc/init.d/postfix start >/dev/null 2>&1 || :
+fi
 
 %preun
 %service_preun postfix
 
 %postun
+/sbin/ldconfig
 %service_postun postfix
-#refresh dynamic libraries
-/sbin/ldconfig
 
 %post mysql
 /etc/postfix/postfix-dynupdate mysql-post >/dev/null 2>&1 || :
@@ -326,6 +323,7 @@
   /etc/init.d/postfix try-restart >/dev/null 2>&1 || :
 fi
 
+
 %clean
 %clean_buildroot
 
@@ -475,7 +473,12 @@
 %attr(755,root,root) %{_bindir}/rmail
 %attr(644,root,root) %{_mandir}/man8/rmail.8*
 
+
 %changelog
+* Sun Nov 14 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.0.20-2jh
+- add vda patch
+- rationalize pre, post and postun scripts
+
 * Sun Oct 24 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.0.20-1jh
 - 2.0.20
 - multilib fixes


From svn at tinysofa.org  Tue Nov 16 19:12:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 16 Nov 2004 14:12:46 -0500 (EST)
Subject: [tinysofa-svn] r5111 - tinysofa/releases/1.1/autoconf/current/specs
Message-ID: <20041116191246.C8FDC3440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-16 14:12:46 -0500 (Tue, 16 Nov 2004)
New Revision: 5111

Modified:
   tinysofa/releases/1.1/autoconf/current/specs/autoconf.spec
Log:
- spec cleanup


Modified: tinysofa/releases/1.1/autoconf/current/specs/autoconf.spec
===================================================================
--- tinysofa/releases/1.1/autoconf/current/specs/autoconf.spec	2004-11-16 16:55:36 UTC (rev 5110)
+++ tinysofa/releases/1.1/autoconf/current/specs/autoconf.spec	2004-11-16 19:12:46 UTC (rev 5111)
@@ -7,8 +7,8 @@
 Source: ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-%{version}.tar.bz2
 Requires: gawk, m4, mktemp, perl
 BuildRequires: texinfo, m4
-Prereq: htmlinfo
-BuildRoot: %{_tmppath}/%{name}-root
+%info_requires
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArchitectures: noarch
 
 %description
@@ -17,13 +17,13 @@
 packages, since the person building the package is allowed to 
 specify various configuration options.
 
-You should install Autoconf if you are developing software and you'd
+You should install Autoconf if you are developing software and you would
 like to use it to create shell scripts which will configure your 
 source code packages. If you are installing Autoconf, you will also
 need to install the GNU m4 package.
 
-Note that the Autoconf package is not required for the end user who
-may be configuring software with an Autoconf-generated script; 
+Note that the Autoconf package is not required for the end-user who
+may be configuring software with an Autoconf-generated script;
 Autoconf is only required for the generation of the scripts, not
 their use.
 
@@ -34,46 +34,39 @@
 
 %build
 %configure
-make
-cd doc
-makeinfo --html --no-split autoconf.texi
+%make
 
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/share/html/autoconf
 %makeinstall
+%install_info doc/%{name}.texi
 
-install -m644 doc/autoconf.html $RPM_BUILD_ROOT/usr/share/html/autoconf/
+%nuke_info
 
-# nuke info pages
-rm -rf $RPM_BUILD_ROOT/usr/share/info
 
 %post
-/usr/sbin/htmlinfo_update.sh
+%info_post
 
 %postun
-/usr/sbin/htmlinfo_update.sh
+%info_postun
 
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
 
 %files
 %defattr(-,root,root)
-/usr/bin/autoconf
-/usr/bin/autoheader
-/usr/bin/autom4te
-/usr/bin/autoreconf
-/usr/bin/autoscan
-/usr/bin/autoupdate
-/usr/bin/ifnames
-/usr/share/autoconf
+%{_bindir}/*
+%{_datadir}/%{name}
 %{_mandir}/man1/*
-/usr/share/html/autoconf
+%{_htmldir}/%{name}
 
+
 %changelog
+* Tue Nov 16 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- spec cleanup
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.59-6ts
 - current (2.59-6jh) integrated as 2.59-6ts for release 1.1
 


From svn at tinysofa.org  Tue Nov 16 19:26:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 16 Nov 2004 14:26:01 -0500 (EST)
Subject: [tinysofa-svn] r5112 - tinysofa/releases/1.1/automake/current/specs
Message-ID: <20041116192601.1685A3440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-16 14:26:00 -0500 (Tue, 16 Nov 2004)
New Revision: 5112

Modified:
   tinysofa/releases/1.1/automake/current/specs/automake.spec
Log:
- update to 1.9.3
- spec cleanup


Modified: tinysofa/releases/1.1/automake/current/specs/automake.spec
===================================================================
--- tinysofa/releases/1.1/automake/current/specs/automake.spec	2004-11-16 19:12:46 UTC (rev 5111)
+++ tinysofa/releases/1.1/automake/current/specs/automake.spec	2004-11-16 19:26:00 UTC (rev 5112)
@@ -1,132 +1,245 @@
+%define api_version 1.9
 Summary: A GNU tool for automatically creating Makefiles.
 Name: automake
-Version: 1.8.5
-Release: 2ts
+Version: %{api_version}.3
+Release: 1jh
 License: GPL
 Group: development
-Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
-URL: http://www.gnu.org/software/automake/
-BuildRequires: texinfo, autoconf
-Requires: perl
-Prereq: htmlinfo
+Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
+URL: http://sources.redhat.com/automake
+Requires: perl, autoconf >= 2.58
+Buildrequires: autoconf >= 2.58
+%info_requires
 BuildArchitectures: noarch
-BuildRoot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
-Automake is an experimental Makefile generator. Automake was inspired
-by the 4.4BSD make and include files, but aims to be portable and to
-conform to the GNU standards for Makefile variables and targets.
+Automake is a tool for automatically generating `Makefile.in'
+files compliant with the GNU Coding Standards.
 
 You should install Automake if you are developing software and would
-like to use its capabilities of automatically generating GNU
-standard Makefiles. if you install Automake, you will also need to
-install GNU's Autoconf package.
+like to use its ability to automatically generate GNU standard
+Makefiles. If you install Automake, you will also need to install
+GNU's Autoconf package.
 
+
 %prep
-%setup -q
+%setup -q -n automake-%{version}
 
+
 %build
-
 %configure
+%make
+%make check || make check VERBOSE=yes
 
-make
-pushd doc
-makeinfo --html --no-split %{name}.texi
-popd
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/share/html/%{name}
-mkdir -p $RPM_BUILD_ROOT/usr/share/aclocal
-install -m 644  doc/%{name}.html $RPM_BUILD_ROOT/usr/share/html/%{name}/
-rm -rf $RPM_BUILD_ROOT/usr/share/info
+%makeinstall
+%install_info doc/%{name}.texi
 
+# create this dir empty so we can own it
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
+
+%nuke_info
+
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post
-/usr/sbin/htmlinfo_update.sh
+%info_post
 
 %postun
-/usr/sbin/htmlinfo_update.sh
+%info_postun
 
+
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
-/usr/bin/*
-%dir /usr/share/aclocal
-/usr/share/aclocal-*
-/usr/share/automake-*
-/usr/share/html/%{name}
+%doc AUTHORS README THANKS
+%{_bindir}/*
+%{_datadir}/automake-%{api_version}
+%{_datadir}/aclocal-%{api_version}
+%dir %{_datadir}/aclocal
+%{_htmldir}/%{name}
 
+
 %changelog
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.8.5-2ts
-- current (1.8.5-2jh) integrated as 1.8.5-2ts for release 1.1
+* Tue Nov 16 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.9.3-1jh
+- tinysofa
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.8.5-1ts
-- current (1.8.5-1ok) integrated as 1.8.5-1ts for release 1.0-U1
+* Mon Nov  1 2004 Daniel Reed <djr at redhat.com> 1.9.3-1
+- version bump
+  - Dependency tracking using mode "dashmstdout" or "dashXmstdout" did not work for libtool objects compiled with --tag (i.e., compiled with Libtool 1.5 or later). The compilation would succeed, but `depcomp' would emit a warning and not output any dependency information.
+  - Ignore comments from augmented variables ...
+  - `install-sh -d a/b/' failed to create `a/b/' because of the trailing `/'.
+  - _PROGRAMS now always create programs. Before 1.9 it would mistakenly create a libtool library if the name of the program ended in `.la'.
+  - `compile' now handles `*.obj' objects.
+  - `aclocal' recognizes AC_DEFUN_ONCE.
 
-* Tue May 18 2004 Omar Kilani <omar at tinysofa dot org> 1.8.5-1ok
-- New upstream: 1.8.5.
+* Tue Sep 28 2004 Warren Togami <wtogami at redhat.com> - 1.9.2-3
+- trim docs
 
-* Thu May 13 2004 Omar Kilani <omar at tinysofa dot org> 1.8.4-2ok
-- Make /usr/share/aclocal.
-- Own /usr/share/aclocal.
+* Mon Sep 20 2004 Daniel Reed <djr at redhat.com> - 1.9.2-1
+- version bump
+  - Sort rm commands output for mostlyclean-generic, clean-generic, distclean-generic and maintainer-clean-generic, so that the produced Makefile is not sensitive to the way Perl sorts its hashes.
+  - Support `+' in the name of directories given to `include'.
+  - Preserve spaces in the arguments of `compile'.
+  - `missing' will no longer try to emulate a tool that is run with `--version' or `--help' as argument.
+  - There is a new chapter about the history of Automake.
 
-* Tue May 11 2004 Omar Kilani <omar at tinysofa dot org> 1.8.4-1ts
-- Add BuildRequires autoconf.
+* Wed Aug 11 2004 Daniel Reed <djr at redhat.com> - 1.9.1-1
+- version bump
+  - Adjust #line directives in `parser.h' (when ylwrap is not used). (PR/432)
+  - Fix definition of YLWRAP when ylwrap is installed in a default aux directory found in a parent package.
+  - Properly recognize AC_CANONICAL_BUILD and AC_CANONICAL_TARGET.
 
-* Mon Apr 26 2004 Omar Kilani <omar at tinysofa dot org> 1.8.4-1ts
-- New upstream: 1.8.4.
+* Fri Jul 30 2004 Daniel Reed <djr at redhat.com> - 1.9-1
+- version bump
 
-* Wed Mar 31 2004 Omar Kilani <omar at tinysofa dot org> 1.8.3-1ts
-- New upstream.
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue Feb 10 2004 Chr. Toldnes <christht at trustix dot org> 1.8.2-2ct
-- automake.texi had moved to doc
+* Mon May 17 2004 Jens Petersen <petersen at redhat.com> - 1.8.5-1
+- update to 1.8.5
 
-* Sat Feb  7 2004 Omar Kilani <ok at trustix dot org> 1.8.2-1ok
-- New upstream.
+* Thu May 13 2004 Jens Petersen <petersen at redhat.com> - 1.8.4-1
+- update to 1.8.4
 
-* Sun Dec  7 2003 Erlend Midttun <erlendbm at trustix dot org> 1.7.9-1tr
-- New upstream.
+* Fri Mar 12 2004 Jens Petersen <petersen at redhat.com> - 1.8.3-1
+- update to 1.8.3 bugfix release
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 1.7.5-2tr
-- Big rebuild
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Thu May 22 2003 Erlend Midttun <erlendbm at trustix dot com> 1.7.5-1em
-- New upstream
+* Tue Jan 13 2004 Jens Petersen <petersen at redhat.com> - 1.8.2-1
+- 1.8.2 bugfix release
+- do not pass VERBOSE=xNO to "make check" as non-empty means be verbose
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 1.6.2-3em
-- Rebuilt against glibc 2.3.2.
+* Thu Dec 11 2003 Jens Petersen <petersen at redhat.com> - 1.8-1
+- update to 1.8 release
+- require autoconf 2.58 or later
+- don't use %%configure for now to prevent very recent configure from running
+  "config.sub noarch-redhat-linux"
 
-* Thu Oct 24 2002 Christian H. Toldnes <chrsitht at trustix dot com> 1.6.2-2ct
-- Replaced info with htmlinfo.
-- new buildreq and prereq.
+* Mon Nov 10 2003 Jens Petersen <petersen at redhat.com> - 1.7.9-1
+- update to 1.7.9 bugfix release
+- require autoconf 2.54 or later
 
-* Thu Jul 18 2002 Nico Erfurth <masta at trustix dot org> 1.6.2-1ne
-- Updated to 1.6.2
-- Patches removed, the new package includes them
+* Tue Oct  7 2003 Jens Petersen <petersen at redhat.com> - 1.7.8-1
+- update to 1.7.8 bugfix release
 
-* Thu May 30 2002 Christian H. Toldnes <christht at trustix dot com>
-- Rebuild with -1ct releasetag.
+* Wed Sep 10 2003 Jens Petersen <petersen at redhat.com> - 1.7.7-1
+- update to 1.7.7 bugfix release
 
-* Fri Feb 01 2002 Erlend Midttun <erlendbm at trustix dot com>
-- New upstream version: 1.5
+* Fri Jul 11 2003 Jens Petersen <petersen at redhat.com> - 1.7.6-1
+- update to 1.7.6 bugfix release
 
-* Fri Jun  1 2001 Oystein Viggen <oysteivi at trustix dot com>
-- New upstream version: 1.4-p2
+* Tue May 20 2003 Jens Petersen <petersen at redhat.com> - 1.7.5-1
+- update to 1.7.5 bugfix release
 
-* Tue Apr 17 2001 Erlend Midttun <erlendbm at trustix dot com>
-- God alone knows how this used to build, but it does now.
+* Thu Apr 24 2003 Jens Petersen <petersen at redhat.com> - 1.7.4-1
+- update to 1.7.4
 
-* Wed Mar 01 2000 Lars Gaarden <larsg at trustix dot com>
-- /usr/share/info/dir should not be part of the package
+* Thu Mar  6 2003 Jens Petersen <petersen at redhat.com> - 1.7.3-1
+- update to 1.7.3
+- python dir lib64 patch no longer needed
+- build requires Autoconf 2.54 or later
 
-* Mon Feb 28 2000 Lars Gaarden <larsg at trustix dot com>
-- moved info files to /usr/share/info, FHS
+* Mon Jan 27 2003 Jens Petersen <petersen at redhat.com> - 1.6.3-5
+- patch from 1.7-branch to try python distutils for setting pythondir (#80994)
 
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Thu Dec 12 2002 Elliot Lee <sopwith at redhat.com> 1.6.3-3
+- Fix unpackaged file
+
+* Tue Dec  3 2002 Jens Petersen <petersen at redhat.com> 1.6.3-2
+- add "--without check" rpmbuild option to switch "make check" off
+- exclude info dir file
+- don't gzip info files explicitly
+
+* Mon Nov 18 2002 Jens Petersen <petersen at redhat.com>
+- use api_version in version
+
+* Mon Jul 29 2002 Jens Petersen <petersen at redhat.com> 1.6.3-1
+- bug fix release 1.6.3
+
+* Thu Jul 11 2002 Jens Petersen <petersen at redhat.com> 1.6.2-2
+- add buildrequires autoconf 2.52 or greater [reported by Edward Avis]
+
+* Wed Jun 19 2002 Jens Petersen <petersen at redhat.com> 1.6.2-1
+- 1.6.2 (bug fix release)
+- do "make check" after building
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com> 1.6.1-2
+- automated rebuild
+
+* Tue Apr 23 2002 Jens Petersen <petersen at redhat.com> 1.6.1-1
+- 1.6.1
+
+* Tue Mar 12 2002 Jens Petersen <petersen at redhat.com> 1.6-1
+- new package based on automake15
+- 1.6
+
+* Wed Jan 23 2002 Jens Petersen <petersen at redhat.com> 1.5-8
+- better aclocal versioning
+
+* Wed Jan 23 2002 Jens Petersen <petersen at redhat.com> 1.5-7
+- don't version datadir/automake
+
+* Tue Jan 15 2002 Jens Petersen <petersen at redhat.com> 1.5-6
+- version suffix programs and data directories
+- own symlinks to programs and /usr/share/aclocal
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com> 1.5-5
+- automated rebuild
+
+* Wed Jan  9 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.5-4
+- Completely back out the fix for #56624 for now, it causes more problems
+  than it fixes in either form.
+
+* Wed Jan  9 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.5-3
+- Don't use AS_DIRNAME, it doesn't work.
+
+* Tue Jan  7 2002 Jens Petersen <petersen at redhat.com> 1.5-2
+- Patch depout.m4 to handle makefiles passed to make with "-f" (#56624)
+
+* Tue Sep 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.5-1
+- Update to 1.5 - much better to coexist with autoconf 2.52...
+- Fix specfile
+- No patches
+
+* Fri Aug 24 2001 Jens Petersen <petersen at redhat.com> - 1.4p5-2
+- dont raise error when there is source in a subdirectory (bug #35156).
+  This was preventing automake from working in binutuls/gas 
+  [patch from HJ Lu <hjl at gnu.org>]
+- format long lines of output properly with backslash + newlines as in 1.4
+  (bug #35259) [patch from HJ Lu <hjl at gnu.org>]
+
+* Sat Jul 21 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- 1.4-p5, fixes #48788
+
+* Tue Jun 12 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- add the patch from #20559
+- really update to 1.4-p4
+
+* Mon Jun 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 1.4-p4
+
+* Sat May 12 2001 Owen Taylor <otaylor at redhat.com>
+- Version 1.4-p1 to work with libtool-1.4
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Mon Jun  5 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging.
+
+* Fri Feb 04 2000 Nalin Dahyabhai <nalin at redhat.com>
+- fix bug #8870
+
 * Sat Aug 21 1999 Jeff Johnson <jbj at redhat.com>
 - revert to pristine automake-1.4.
 


From svn at tinysofa.org  Wed Nov 17 10:51:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 17 Nov 2004 05:51:02 -0500 (EST)
Subject: [tinysofa-svn] r5113 - tinysofa/releases/1.1/automake/current/specs
Message-ID: <20041117105102.C1E6A3440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-17 05:51:01 -0500 (Wed, 17 Nov 2004)
New Revision: 5113

Modified:
   tinysofa/releases/1.1/automake/current/specs/automake.spec
Log:
- disable tests as default


Modified: tinysofa/releases/1.1/automake/current/specs/automake.spec
===================================================================
--- tinysofa/releases/1.1/automake/current/specs/automake.spec	2004-11-16 19:26:00 UTC (rev 5112)
+++ tinysofa/releases/1.1/automake/current/specs/automake.spec	2004-11-17 10:51:01 UTC (rev 5113)
@@ -30,7 +30,7 @@
 %build
 %configure
 %make
-%make check || make check VERBOSE=yes
+#make check || make check VERBOSE=yes
 
 
 %install


From svn at tinysofa.org  Wed Nov 17 19:13:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 17 Nov 2004 14:13:29 -0500 (EST)
Subject: [tinysofa-svn] r5114 - contrib/1.1/subversion/current/specs
Message-ID: <20041117191329.223F13440FD@minbar.tinysofa.org>

Author: jh
Date: 2004-11-17 14:13:27 -0500 (Wed, 17 Nov 2004)
New Revision: 5114

Modified:
   contrib/1.1/subversion/current/specs/subversion.spec
Log:
- BR: zlib-devel


Modified: contrib/1.1/subversion/current/specs/subversion.spec
===================================================================
--- contrib/1.1/subversion/current/specs/subversion.spec	2004-11-17 10:51:01 UTC (rev 5113)
+++ contrib/1.1/subversion/current/specs/subversion.spec	2004-11-17 19:13:27 UTC (rev 5114)
@@ -19,7 +19,7 @@
 BuildPreReq: autoconf, libtool, python, python-devel, texinfo, gettext
 BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5, swig-python, swig-perl
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1
-BuildPreReq: openssl-devel, expat-devel, gdbm-devel, httpd-devel
+BuildPreReq: openssl-devel, expat-devel, gdbm-devel, httpd-devel, zlib-devel
 BuildPreReq: perl-devel, cyrus-sasl-devel ,gcc-c++
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 


From svn at tinysofa.org  Thu Nov 18 15:05:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 18 Nov 2004 10:05:47 -0500 (EST)
Subject: [tinysofa-svn] 
	r5115 - in tinysofa/releases/1.1: filesystem/current/specs
	setup/current/sources setup/current/specs
Message-ID: <20041118150547.94B943440F5@minbar.tinysofa.org>

Author: jh
Date: 2004-11-18 10:05:46 -0500 (Thu, 18 Nov 2004)
New Revision: 5115

Added:
   tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-no-dir.patch
Removed:
   tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-ftp.patch
Modified:
   tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec
   tinysofa/releases/1.1/setup/current/specs/setup.spec
Log:
setup:
- change /no/dir to /var/empty
- change /bin/false and /no/shell to /sbin/nologin
filesystem:
- add /var/empty


Modified: tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec
===================================================================
--- tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec	2004-11-17 19:13:27 UTC (rev 5114)
+++ tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec	2004-11-18 15:05:46 UTC (rev 5115)
@@ -96,6 +96,7 @@
 mkdir -p $RPM_BUILD_ROOT/usr/tmp
 mkdir -p $RPM_BUILD_ROOT/var
 mkdir -p $RPM_BUILD_ROOT/var/cache
+mkdir -p $RPM_BUILD_ROOT/var/empty
 mkdir -p $RPM_BUILD_ROOT/var/lib
 mkdir -p $RPM_BUILD_ROOT/var/lock
 mkdir -p $RPM_BUILD_ROOT/var/lock/subsys
@@ -170,6 +171,7 @@
 %dir /usr/tmp
 %dir /var
 %dir /var/cache
+%dir /var/empty
 %dir /var/lib
 %dir %attr(775,root,uucp) /var/lock
 %dir /var/lock/subsys
@@ -187,6 +189,9 @@
 %endif
 
 %changelog
+* Wed Nov 17 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- add /var/empty
+
 * Sat Oct 30 2004 Jaakko Heinonen <jh at tinysofa dot org>
 - add support for multilib arches
 - define /mnt/* as %%ghost to avoid upgrade problems

Deleted: tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-ftp.patch
===================================================================
--- tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-ftp.patch	2004-11-17 19:13:27 UTC (rev 5114)
+++ tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-ftp.patch	2004-11-18 15:05:46 UTC (rev 5115)
@@ -1,11 +0,0 @@
---- setup-2.2.5/passwd.orig	2004-07-28 22:50:57.000000000 +0300
-+++ setup-2.2.5/passwd	2004-07-28 22:51:07.000000000 +0300
-@@ -16,7 +16,7 @@
- gopher:x:30:30:gopher:/usr/lib/gopher-data:
- nscd:x:35:35:nscd user:/no/dir:/bin/false
- ntp:x:38:38:NTP user:/no/dir:/bin/false
--ftp:x:50:50:FTP User:/home/ftp:/bin/bash
-+ftp:x:50:50:FTP User:/srv/ftp:/sbin/nologin
- syslog:x:60:60:Syslog user:/no/dir:/bin/false
- named:x:98:98:named user:/no/dir:/bin/false
- nobody:x:99:99:Nobody:/:

Added: tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-no-dir.patch
===================================================================
--- tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-no-dir.patch	2004-11-17 19:13:27 UTC (rev 5114)
+++ tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-no-dir.patch	2004-11-18 15:05:46 UTC (rev 5115)
@@ -0,0 +1,39 @@
+--- setup-2.2.5/passwd.no-dir	2004-11-17 23:48:35.987515832 +0200
++++ setup-2.2.5/passwd	2004-11-17 23:48:46.379935944 +0200
+@@ -11,21 +11,21 @@
+ news:x:13:13:news:/var/spool/news:
+ uucp:x:14:14:uucp:/var/spool/uucp:
+ games:x:20:20:games:/usr/games:
+-squid:x:23:23:squid user:/no/dir:/bin/false
++squid:x:23:23:squid user:/var/empty:/sbin/nologin
+ postgres:x:26:26:PostgreSQL user:/var/lib/pgsql:/bin/bash
+ gopher:x:30:30:gopher:/usr/lib/gopher-data:
+-nscd:x:35:35:nscd user:/no/dir:/bin/false
+-ntp:x:38:38:NTP user:/no/dir:/bin/false
+-ftp:x:50:50:FTP User:/home/ftp:/bin/bash
+-syslog:x:60:60:Syslog user:/no/dir:/bin/false
+-named:x:98:98:named user:/no/dir:/bin/false
++nscd:x:35:35:nscd user:/var/empty:/sbin/nologin
++ntp:x:38:38:NTP user:/var/empty:/sbin/nologin
++ftp:x:50:50:FTP User:/srv/ftp:/sbin/nologin
++syslog:x:60:60:Syslog user:/var/empty:/sbin/nologin
++named:x:98:98:named user:/var/empty:/sbin/nologin
+ nobody:x:99:99:Nobody:/:
+-mysql:x:101:101:MySQL user:/no/dir:/bin/false
+-postfix:x:102:102:Postfix user:/no/dir:/no/shell
+-sshd:x:103:103:SSHD user:/no/dir:/no/shell
+-mailman:x:105:105:Mailman user:/var/mailman:/bin/false
+-fcron:x:108:108:Fcron user:/no/dir:/no/shell
+-httpd:x:109:109:httpd user:/no/dir:/bin/false
+-cyrus:x:110:110:Cyrus user:/no/dir:/bin/false
+-slapd:x:111:111:OpenLDAP user:/no/dir:/bin/false
+-tftpd:x:112:112:tftpd user:/tftpboot:/bin/false
++mysql:x:101:101:MySQL user:/var/empty:/sbin/nologin
++postfix:x:102:102:Postfix user:/var/empty:/sbin/nologin
++sshd:x:103:103:SSHD user:/var/empty:/sbin/nologin
++mailman:x:105:105:Mailman user:/var/mailman:/sbin/nologin
++fcron:x:108:108:Fcron user:/var/empty:/sbin/nologin
++httpd:x:109:109:httpd user:/var/empty:/sbin/nologin
++cyrus:x:110:110:Cyrus user:/var/empty:/sbin/nologin
++slapd:x:111:111:OpenLDAP user:/var/empty:/sbin/nologin
++tftpd:x:112:112:tftpd user:/srv/tftpboot:/sbin/nologin

Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec
===================================================================
--- tinysofa/releases/1.1/setup/current/specs/setup.spec	2004-11-17 19:13:27 UTC (rev 5114)
+++ tinysofa/releases/1.1/setup/current/specs/setup.spec	2004-11-18 15:05:46 UTC (rev 5115)
@@ -1,14 +1,14 @@
 Summary: A set of system configuration and setup files.
 Name: setup
 Version: 2.2.5
-Release: 8ts
+Release: 9jh
 License: public domain
 Group: main
 Source: setup-%{version}.tar.gz
 Patch: setup-2.2.5-sieve.patch
 Patch1: setup-profile.patch
 Patch2: setup-2.2.5-sbin-bash.patch
-Patch3: setup-2.2.5-ftp.patch
+Patch3: setup-2.2.5-no-dir.patch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
 Conflicts: initscripts < 4.26
@@ -67,6 +67,10 @@
 
 
 %changelog
+* Wed Nov 17 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.2.5-9jh
+- change /no/dir to /var/empty
+- change /bin/false and /no/shell to /sbin/nologin
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.2.5-8ts
 - current (2.2.5-8jh) integrated as 2.2.5-8ts for release 1.1
 


From svn at tinysofa.org  Thu Nov 18 15:20:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 18 Nov 2004 10:20:53 -0500 (EST)
Subject: [tinysofa-svn] 
	r5116 - tinysofa/releases/1.1/automake/current/sources
Message-ID: <20041118152053.DFD3D3440F5@minbar.tinysofa.org>

Author: jh
Date: 2004-11-18 10:20:53 -0500 (Thu, 18 Nov 2004)
New Revision: 5116

Added:
   tinysofa/releases/1.1/automake/current/sources/automake-1.9.3.tar.bz2
Removed:
   tinysofa/releases/1.1/automake/current/sources/automake-1.8.5.tar.bz2
Log:
- update the source file


Deleted: tinysofa/releases/1.1/automake/current/sources/automake-1.8.5.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/automake/current/sources/automake-1.9.3.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/automake/current/sources/automake-1.9.3.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Thu Nov 18 15:24:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 18 Nov 2004 10:24:28 -0500 (EST)
Subject: [tinysofa-svn] r5117 - tinysofa/releases/1.1/httpd/current/sources
Message-ID: <20041118152428.CC2B23440F5@minbar.tinysofa.org>

Author: jh
Date: 2004-11-18 10:24:28 -0500 (Thu, 18 Nov 2004)
New Revision: 5117

Added:
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.46-dumpcerts.patch
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.46-testhook.patch
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.50-reclaim.patch
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52-CAN-2004-0942.patch
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52.tar.gz
Removed:
   tinysofa/releases/1.1/httpd/current/sources/CAN-2004-0751.patch
   tinysofa/releases/1.1/httpd/current/sources/CAN-2004-0809.patch
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-fdsetsize.patch
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-rewritessl.patch
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-suexeclibs.patch
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.49-eocbucket.patch
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.50-userdir.patch
Log:
- get httpd sources up to date


Deleted: tinysofa/releases/1.1/httpd/current/sources/CAN-2004-0751.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/CAN-2004-0751.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/CAN-2004-0751.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -1,22 +0,0 @@
-===================================================================
-RCS file: /home/cvspublic/httpd-2.0/modules/ssl/ssl_engine_io.c,v
-retrieving revision 1.100.2.15
-retrieving revision 1.100.2.16
-diff -u -r1.100.2.15 -r1.100.2.16
---- httpd-2.0/modules/ssl/ssl_engine_io.c	2004/08/23 14:59:52	1.100.2.15
-+++ httpd-2.0/modules/ssl/ssl_engine_io.c	2004/08/27 09:03:24	1.100.2.16
-@@ -562,8 +562,12 @@
-         *len = bytes;
-         if (inctx->mode == AP_MODE_SPECULATIVE) {
-             /* We want to rollback this read. */
--            inctx->cbuf.value -= bytes;
--            inctx->cbuf.length += bytes;
-+            if (inctx->cbuf.length > 0) {
-+                inctx->cbuf.value -= bytes;
-+                inctx->cbuf.length += bytes;
-+            } else {
-+                char_buffer_write(&inctx->cbuf, buf, (int)bytes);
-+            }
-             return APR_SUCCESS;
-         }
-         /* This could probably be *len == wanted, but be safe from stray

Deleted: tinysofa/releases/1.1/httpd/current/sources/CAN-2004-0809.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/CAN-2004-0809.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/CAN-2004-0809.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -1,27 +0,0 @@
-===================================================================
-RCS file: /home/cvspublic/httpd-2.0/modules/dav/fs/lock.c,v
-retrieving revision 1.32
-retrieving revision 1.33
-diff -u -r1.32 -r1.33
---- httpd-2.0/modules/dav/fs/lock.c	2004/09/12 22:14:57	1.32
-+++ httpd-2.0/modules/dav/fs/lock.c	2004/09/12 22:24:05	1.33
-@@ -1469,13 +1469,13 @@
- 	}
- 	if (dav_fs_do_refresh(dp_scan, ltl, new_time)) {
- 	    /* the lock was refreshed. return the lock. */
--	    newlock = dav_fs_alloc_lock(lockdb, ip->key, dp->locktoken);
-+	    newlock = dav_fs_alloc_lock(lockdb, ip->key, dp_scan->locktoken);
- 	    newlock->is_locknull = !resource->exists;
--	    newlock->scope = dp->f.scope;
--	    newlock->type = dp->f.type;
--	    newlock->depth = dp->f.depth;
--	    newlock->timeout = dp->f.timeout;
--	    newlock->owner = dp->owner;
-+	    newlock->scope = dp_scan->f.scope;
-+	    newlock->type = dp_scan->f.type;
-+	    newlock->depth = dp_scan->f.depth;
-+	    newlock->timeout = dp_scan->f.timeout;
-+	    newlock->owner = dp_scan->owner;
-             newlock->auth_user = dp_scan->auth_user;
- 
- 	    newlock->next = *locks;

Added: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.46-dumpcerts.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.46-dumpcerts.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.46-dumpcerts.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -0,0 +1,61 @@
+
+This patch uses the test_config hook added in the -testhook patch to 
+add the feature that:
+
+   httpd -t -DDUMP_CERTS
+
+dumps the list of configured certificate files to stdout.
+
+Upstream-HEAD: needed
+Upstream-2.0: omit
+Upstream-Status: Depends on the test_config hook in HEAD
+
+--- httpd-2.0.46/modules/ssl/mod_ssl.c.dumpcerts
++++ httpd-2.0.46/modules/ssl/mod_ssl.c
+@@ -425,6 +425,7 @@
+     ssl_io_filter_register(p);
+ 
+     ap_hook_pre_connection(ssl_hook_pre_connection,NULL,NULL, APR_HOOK_MIDDLE);
++    ap_hook_test_config   (ssl_hook_ConfigTest,    NULL,NULL, APR_HOOK_MIDDLE);
+     ap_hook_post_config   (ssl_init_Module,        NULL,NULL, APR_HOOK_MIDDLE);
+     ap_hook_http_method   (ssl_hook_http_method,   NULL,NULL, APR_HOOK_MIDDLE);
+     ap_hook_default_port  (ssl_hook_default_port,  NULL,NULL, APR_HOOK_MIDDLE);
+--- httpd-2.0.46/modules/ssl/ssl_engine_config.c.dumpcerts
++++ httpd-2.0.46/modules/ssl/ssl_engine_config.c
+@@ -1406,2 +1406,26 @@
+ }
+ 
++void ssl_hook_ConfigTest(apr_pool_t *pconf, server_rec *s)
++{
++    
++    if (!ap_exists_config_define("DUMP_CERTS"))
++        return;
++
++    /* Dump the filenames of all configured server certificates to
++     * stdout. */
++    while (s) {
++        SSLSrvConfigRec *sc = mySrvConfig(s);
++
++        if (sc && sc->server && sc->server->pks) {
++            modssl_pk_server_t *const pks = sc->server->pks;
++            int i;
++
++            for (i = 0; (i < SSL_AIDX_MAX) && pks->cert_files[i]; i++) {
++                printf("%s\n", pks->cert_files[i]);
++            }
++        }
++
++        s = s->next;
++    }
++
++}
+--- httpd-2.0.46/modules/ssl/ssl_private.h.dumpcerts
++++ httpd-2.0.46/modules/ssl/ssl_private.h
+@@ -607,6 +607,7 @@
+ int          ssl_hook_Access(request_rec *);
+ int          ssl_hook_Fixup(request_rec *);
+ int          ssl_hook_ReadReq(request_rec *);
++void         ssl_hook_ConfigTest(apr_pool_t *pconf, server_rec *s);
+ 
+ /*  OpenSSL callbacks */
+ RSA         *ssl_callback_TmpRSA(SSL *, int, int);

Added: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.46-testhook.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.46-testhook.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.46-testhook.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -0,0 +1,53 @@
+
+Adds test_config hook from HEAD, allows hooking into the httpd -t process.
+
+Upstream-HEAD: committed
+Upstream-Status: used by the -dumpcerts patch, may be OK for 2.0
+
+--- httpd-2.0.46/include/http_config.h.testhook
++++ httpd-2.0.46/include/http_config.h
+@@ -996,6 +996,13 @@
+ AP_DECLARE_HOOK(int,pre_config,(apr_pool_t *pconf,apr_pool_t *plog,
+                                 apr_pool_t *ptemp))
+ 
++/**
++ * Run the test_config function for each module; this hook is run
++ * only if the server was invoked to test the configuration syntax.
++ * @param pconf The config pool
++ * @param s The list of server_recs
++ */
++AP_DECLARE_HOOK(void,test_config,(apr_pool_t *pconf, server_rec *s))
+ 
+ /**
+  * Run the post_config function for each module
+--- httpd-2.0.46/server/main.c.testhook
++++ httpd-2.0.46/server/main.c
+@@ -583,6 +583,7 @@
+     ap_fini_vhost_config(pconf, server_conf);
+     apr_hook_sort_all();
+     if (configtestonly) {
++        ap_run_test_config(pconf, server_conf);
+         ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "Syntax OK");
+         destroy_and_exit_process(process, 0);
+     }
+--- httpd-2.0.46/server/config.c.testhook
++++ httpd-2.0.46/server/config.c
+@@ -115,6 +115,7 @@
+            APR_HOOK_LINK(handler)
+            APR_HOOK_LINK(quick_handler)
+            APR_HOOK_LINK(optional_fn_retrieve)
++           APR_HOOK_LINK(test_config)
+ )
+ 
+ AP_IMPLEMENT_HOOK_RUN_ALL(int, header_parser,
+@@ -130,6 +131,10 @@
+                            apr_pool_t *ptemp, server_rec *s),
+                           (pconf, plog, ptemp, s), OK, DECLINED)
+ 
++AP_IMPLEMENT_HOOK_VOID(test_config,
++                       (apr_pool_t *pconf, server_rec *s),
++                       (pconf, s))
++
+ /* During the course of debugging I expanded this macro out, so
+  * rather than remove all the useful information there is in the
+  * following lines, I'm going to leave it here in case anyone

Deleted: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-fdsetsize.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-fdsetsize.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-fdsetsize.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -1,27 +0,0 @@
-
-- remove FD_SETSIZE check since the fd is only ever poll()ed not
-select()ed... Jeff Trawick.
-
---- httpd-2.0.50/os/unix/unixd.c.fdsetsize
-+++ httpd-2.0.50/os/unix/unixd.c
-@@ -462,19 +462,12 @@
- {
-     apr_socket_t *csd;
-     apr_status_t status;
--    int sockdes;
- 
-     *accepted = NULL;
-     status = apr_accept(&csd, lr->sd, ptrans);
-     if (status == APR_SUCCESS) { 
-         *accepted = csd;
--        apr_os_sock_get(&sockdes, csd);
--#ifdef TPF
--        if (sockdes == 0) {                  /* 0 is invalid socket for TPF */
--            return APR_EINTR;
--        }
--#endif
--        return status;
-+        return APR_SUCCESS;
-     }
- 
-     if (APR_STATUS_IS_EINTR(status)) {

Deleted: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-rewritessl.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-rewritessl.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-rewritessl.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -1,56 +0,0 @@
-
-Add %{HTTPS} and %{SSL:...} lookups.  Former relies on sslishttps patch.
-
---- httpd-2.0.48/modules/mappers/mod_rewrite.c.rewritessl
-+++ httpd-2.0.48/modules/mappers/mod_rewrite.c
-@@ -116,6 +116,8 @@
- #include "http_protocol.h"
- #include "mod_rewrite.h"
- 
-+#include "../ssl/mod_ssl.h"
-+
- #if !defined(OS2) && !defined(WIN32) && !defined(BEOS)  && !defined(NETWARE)
- #include "unixd.h"
- #define MOD_REWRITE_SET_MUTEX_PERMS /* XXX Apache should define something */
-@@ -332,6 +334,9 @@
-     return (void *)a;
- }
- 
-+/* Optional functions imported from mod_ssl when loaded: */
-+static APR_OPTIONAL_FN_TYPE(ssl_var_lookup) *rewrite_ssl_lookup = NULL;
-+static APR_OPTIONAL_FN_TYPE(ssl_is_https) *rewrite_is_https = NULL;
- 
- /*
- **
-@@ -1051,6 +1056,10 @@
-             }
-         }
-     }
-+
-+    rewrite_ssl_lookup = APR_RETRIEVE_OPTIONAL_FN(ssl_var_lookup);
-+    rewrite_is_https = APR_RETRIEVE_OPTIONAL_FN(ssl_is_https);
-+
-     return OK;
- }
- 
-@@ -3909,6 +3918,10 @@
-         if (result == NULL) {
-             result = getenv(var+4);
-         }
-+    } 
-+    else if (strlen(var) > 4 && !strncasecmp(var, "SSL:", 4) && rewrite_ssl_lookup) {
-+        result = rewrite_ssl_lookup(r->pool, r->server, r->connection, r,
-+                                    var + 4);
-     }
- 
- #define LOOKAHEAD(subrecfunc) \
-@@ -3957,6 +3970,9 @@
-         if (r->finfo.valid & APR_FINFO_GROUP) {
-             apr_group_name_get((char **)&result, r->finfo.group, r->pool);
-         }
-+    } else if (strcasecmp(var, "HTTPS") == 0) {
-+        int flag = rewrite_is_https && rewrite_is_https(r->connection);
-+        result = apr_pstrdup(r->pool, flag ? "on" : "off");
-     }
- 
-     if (result == NULL) {

Deleted: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-suexeclibs.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-suexeclibs.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.48-suexeclibs.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -1,9 +0,0 @@
---- httpd-2.0.48/support/Makefile.in.suexeclibs
-+++ httpd-2.0.48/support/Makefile.in
-@@ -61,5 +61,5 @@
- # since LD_* environment variables are ignored in setuid programs.
- suexec_OBJECTS = suexec.lo
- suexec: $(suexec_OBJECTS)
--	$(LINK) -static $(suexec_OBJECTS) $(PROGRAM_LDADD)
-+	$(LINK) $(suexec_OBJECTS)
- 

Deleted: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.49-eocbucket.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.49-eocbucket.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.49-eocbucket.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -1,37 +0,0 @@
-
-Fix EOC bucket handling.
-
---- httpd-2.0.49/server/core.c.eocbucket	2004-03-08 17:54:20.000000000 -0500
-+++ httpd-2.0.49/server/core.c	2004-03-29 14:50:15.000000000 -0500
-@@ -3848,12 +3848,9 @@
-         APR_BRIGADE_FOREACH(e, b) {
-             /* keep track of the last bucket processed */
-             last_e = e;
--            if (APR_BUCKET_IS_EOS(e)) {
-+            if (APR_BUCKET_IS_EOS(e) || AP_BUCKET_IS_EOC(e)) {
-                 break;
-             }
--            if (AP_BUCKET_IS_EOC(e)) {
--                apr_bucket_delete(e);
--            }
-             else if (APR_BUCKET_IS_FLUSH(e)) {
-                 if (e != APR_BRIGADE_LAST(b)) {
-                     more = apr_brigade_split(b, APR_BUCKET_NEXT(e));
-@@ -4009,7 +4006,8 @@
-         /* Completed iterating over the brigade, now determine if we want
-          * to buffer the brigade or send the brigade out on the network.
-          *
--         * Save if we haven't accumulated enough bytes to send, and:
-+         * Save if we haven't accumulated enough bytes to send, the
-+         * connection is not about to be closed, and:
-          *
-          *   1) we didn't see a file, we don't have more passes over the
-          *      brigade to perform,  AND we didn't stop at a FLUSH bucket.
-@@ -4020,6 +4018,7 @@
-          *       with the hope of concatenating with another response)
-          */
-         if (nbytes + flen < AP_MIN_BYTES_TO_WRITE
-+            && !AP_BUCKET_IS_EOC(last_e)
-             && ((!fd && !more && !APR_BUCKET_IS_FLUSH(last_e))
-                 || (APR_BUCKET_IS_EOS(last_e)
-                     && c->keepalive == AP_CONN_KEEPALIVE))) {

Added: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.50-reclaim.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.50-reclaim.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.50-reclaim.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -0,0 +1,165 @@
+
+This fixes the child reclaim timing logic, #119128.
+
+The current timing was rather too exponential because of
+missing waittime = 0 when it was ported from 1.3.
+
+This is Jeff Trawick's version of the patch
+
+Upstream-HEAD: committed
+Upstream-2.0: needed
+Upstream-Status: Regression since 1.3, should be in 2.0
+Upstream-Msgid: <20040813135123.GA18095 at redhat.com>
+
+--- httpd-2.0.50/server/mpm_common.c.reclaim	2004-09-14 11:06:18.000000000 +0100
++++ httpd-2.0.50/server/mpm_common.c	2004-09-14 14:30:43.000000000 +0100
+@@ -61,22 +61,55 @@
+ #ifdef AP_MPM_WANT_RECLAIM_CHILD_PROCESSES
+ void ap_reclaim_child_processes(int terminate)
+ {
+-    int i;
+-    long int waittime = 1024 * 16;      /* in usecs */
++    apr_time_t waittime = 1024 * 16;
+     apr_status_t waitret;
+-    int tries;
++    int i;
+     int not_dead_yet;
+     int max_daemons;
++    apr_time_t starttime = apr_time_now();
++    /* this table of actions and elapsed times tells what action is taken
++     * at which elapsed time from starting the reclaim
++     */
++    struct {
++        enum {DO_NOTHING, SEND_SIGTERM, SEND_SIGKILL, GIVEUP} action;
++        apr_time_t action_time;
++    } action_table[] = {
++        {DO_NOTHING, 0}, /* dummy entry for iterations where we reap
++                          * children but take no action against
++                          * stragglers
++                          */
++        {SEND_SIGTERM, apr_time_from_sec(3)},
++        {SEND_SIGTERM, apr_time_from_sec(5)},
++        {SEND_SIGTERM, apr_time_from_sec(7)},
++        {SEND_SIGKILL, apr_time_from_sec(9)},
++        {GIVEUP,       apr_time_from_sec(10)}
++    };
++    int cur_action;      /* index of action we decided to take this
++                          * iteration
++                          */
++    int next_action = 1; /* index of first real action */
+ 
+     ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons);
+ 
+-    for (tries = terminate ? 4 : 1; tries <= 9; ++tries) {
+-        /* don't want to hold up progress any more than
+-         * necessary, but we need to allow children a few moments to exit.
+-         * Set delay with an exponential backoff.
+-         */
++    do {
+         apr_sleep(waittime);
++        /* don't let waittime get longer than 1 second; otherwise, we don't
++         * react quickly to the last child exiting, and taking action can
++         * be delayed
++         */
+         waittime = waittime * 4;
++        if (waittime > apr_time_from_sec(1)) {
++            waittime = apr_time_from_sec(1);
++        }
++
++        /* see what action to take, if any */
++        if (action_table[next_action].action_time <= apr_time_now() - starttime) {
++            cur_action = next_action;
++            ++next_action;
++        }
++        else {
++            cur_action = 0; /* nothing to do */
++        }
+ 
+         /* now see who is done */
+         not_dead_yet = 0;
+@@ -95,32 +128,28 @@
+             }
+ 
+             ++not_dead_yet;
+-            switch (tries) {
+-            case 1:     /*  16ms */
+-            case 2:     /*  82ms */
+-            case 3:     /* 344ms */
+-            case 4:     /*  16ms */
++            switch(action_table[cur_action].action) {
++            case DO_NOTHING:
+                 break;
+-
+-            case 5:     /*  82ms */
+-            case 6:     /* 344ms */
+-            case 7:     /* 1.4sec */
++                
++            case SEND_SIGTERM:
+                 /* ok, now it's being annoying */
+                 ap_log_error(APLOG_MARK, APLOG_WARNING,
+                              0, ap_server_conf,
+-                             "child process %ld still did not exit, "
++                             "child process %" APR_PID_T_FMT
++                             " still did not exit, "
+                              "sending a SIGTERM",
+-                             (long)pid);
++                             pid);
+                 kill(pid, SIGTERM);
+                 break;
+-
+-            case 8:     /*  6 sec */
+-                /* die child scum */
++                
++            case SEND_SIGKILL:
+                 ap_log_error(APLOG_MARK, APLOG_ERR,
+                              0, ap_server_conf,
+-                             "child process %ld still did not exit, "
++                             "child process %" APR_PID_T_FMT
++                             "  still did not exit, "
+                              "sending a SIGKILL",
+-                             (long)pid);
++                             pid);
+ #ifndef BEOS
+                 kill(pid, SIGKILL);
+ #else
+@@ -133,8 +162,8 @@
+                 kill_thread(pid);
+ #endif
+                 break;
+-
+-            case 9:     /* 14 sec */
++                
++            case GIVEUP:
+                 /* gave it our best shot, but alas...  If this really
+                  * is a child we are trying to kill and it really hasn't
+                  * exited, we will likely fail to bind to the port
+@@ -142,9 +171,10 @@
+                  */
+                 ap_log_error(APLOG_MARK, APLOG_ERR,
+                              0, ap_server_conf,
+-                             "could not make child process %ld exit, "
++                             "could not make child process %" APR_PID_T_FMT
++                             " exit, "
+                              "attempting to continue anyway",
+-                             (long)pid);
++                             pid);
+                 break;
+             }
+         }
+@@ -153,11 +183,8 @@
+         apr_proc_other_child_refresh_all(APR_OC_REASON_RESTART);
+ #endif
+ 
+-        if (!not_dead_yet) {
+-            /* nothing left to wait for */
+-            break;
+-        }
+-    }
++    } while (not_dead_yet > 0 &&
++             action_table[cur_action].action != GIVEUP);
+ }
+ #endif /* AP_MPM_WANT_RECLAIM_CHILD_PROCESSES */
+ 
+
+
+

Deleted: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.50-userdir.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.50-userdir.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.50-userdir.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -1,11 +0,0 @@
---- httpd-2.0.50/modules/mappers/mod_userdir.c.userdir
-+++ httpd-2.0.50/modules/mappers/mod_userdir.c
-@@ -350,7 +350,7 @@
- 
-     ap_hook_translate_name(translate_userdir,aszPre,aszSucc,APR_HOOK_MIDDLE);
- #ifdef HAVE_UNIX_SUEXEC
--    ap_hook_get_suexec_identity(get_suexec_id_doer,NULL,NULL,APR_HOOK_MIDDLE);
-+    ap_hook_get_suexec_identity(get_suexec_id_doer,NULL,NULL,APR_HOOK_FIRST);
- #endif
- }
- 

Added: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52-CAN-2004-0942.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52-CAN-2004-0942.patch	2004-11-18 15:20:53 UTC (rev 5116)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52-CAN-2004-0942.patch	2004-11-18 15:24:28 UTC (rev 5117)
@@ -0,0 +1,110 @@
+
+Fix for memory consumption DoS, CVE CAN-2004-0942:
+
+  * server/protocol.c (ap_rgetline_core): Don't trim trailing whitespace
+  from the buffer here.
+  (ap_get_mime_headers_core): Trim trailing whitespace here, after
+  reading a complete field including continuation lines.  Also simplify
+  code to remove whitespace between field-name and colon.
+
+Upstream-HEAD: committed
+Upstream-2.0: committed
+
+--- httpd-2.0.52/server/protocol.c.can0942
++++ httpd-2.0.52/server/protocol.c
+@@ -305,35 +305,13 @@
+         }
+     }
+ 
+-    /* We now go backwards over any CR (if present) or white spaces.
+-     *
+-     * Trim any extra trailing spaces or tabs except for the first
+-     * space or tab at the beginning of a blank string.  This makes
+-     * it much easier to check field values for exact matches, and
+-     * saves memory as well.  Terminate string at end of line.
+-     */
+-    pos = last_char;
+-    if (pos > *s && *(pos - 1) == APR_ASCII_CR) {
+-        --pos;
++    /* Now NUL-terminate the string at the end of the line; 
++     * if the last-but-one character is a CR, terminate there */
++    if (last_char > *s && last_char[-1] == APR_ASCII_CR) {
++        last_char--;
+     }
+-
+-    /* Trim any extra trailing spaces or tabs except for the first
+-     * space or tab at the beginning of a blank string.  This makes
+-     * it much easier to check field values for exact matches, and
+-     * saves memory as well.
+-     */
+-    while (pos > ((*s) + 1)
+-           && (*(pos - 1) == APR_ASCII_BLANK || *(pos - 1) == APR_ASCII_TAB)) {
+-        --pos;
+-    }
+-
+-    /* Since we want to remove the LF from the line, we'll go ahead
+-     * and set this last character to be the term NULL and reset
+-     * bytes_handled accordingly.
+-     */
+-    *pos = '\0';
+-    last_char = pos;
+-    bytes_handled = pos - *s;
++    *last_char = '\0';
++    bytes_handled = last_char - *s;
+ 
+     /* If we're folding, we have more work to do.
+      *
+@@ -751,7 +729,7 @@
+                 last_len += len;
+                 folded = 1;
+             }
+-            else {
++            else /* not a continuation line */ {
+ 
+                 if (r->server->limit_req_fields
+                     && (++fields_read > r->server->limit_req_fields)) {
+@@ -774,29 +752,26 @@
+                                                "</pre>\n", NULL));
+                     return;
+                 }
++                
++                tmp_field = value - 1; /* last character of field-name */
++
++                *value++ = '\0'; /* NUL-terminate at colon */
+ 
+-                *value = '\0';
+-                tmp_field = value;  /* used to trim the whitespace between key
+-                                     * token and separator
+-                                     */
+-                ++value;
+                 while (*value == ' ' || *value == '\t') {
+                     ++value;            /* Skip to start of value   */
+                 }
+ 
+-                /* This check is to avoid any invalid memory reference while
+-                 * traversing backwards in the key. To avoid a case where
+-                 * the header starts with ':' (or with just some white
+-                 * space and the ':') followed by the value
+-                 */
+-                if (tmp_field > last_field) {
+-                    --tmp_field;
+-                    while ((tmp_field > last_field) &&
+-                           (*tmp_field == ' ' || *tmp_field == '\t')) {
+-                        --tmp_field;   /* Removing LWS between key and ':' */
+-                    }
+-                    ++tmp_field;
+-                    *tmp_field = '\0';
++                /* Strip LWS after field-name: */
++                while (tmp_field > last_field 
++                       && (*tmp_field == ' ' || *tmp_field == '\t')) {
++                    *tmp_field-- = '\0';
++                }
++                
++                /* Strip LWS after field-value: */
++                tmp_field = last_field + last_len - 1;
++                while (tmp_field > value
++                       && (*tmp_field == ' ' || *tmp_field == '\t')) {
++                    *tmp_field-- = '\0';
+                 }
+ 
+                 apr_table_addn(r->headers_in, last_field, value);

Added: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Fri Nov 19 11:35:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 19 Nov 2004 06:35:34 -0500 (EST)
Subject: [tinysofa-svn] r5118 - contrib/1.1/icewm/current/sources
Message-ID: <20041119113534.7E9563440F5@minbar.tinysofa.org>

Author: jh
Date: 2004-11-19 06:35:32 -0500 (Fri, 19 Nov 2004)
New Revision: 5118

Modified:
   contrib/1.1/icewm/current/sources/icewm-preferences
Log:
- add more icon paths to default config


Modified: contrib/1.1/icewm/current/sources/icewm-preferences
===================================================================
--- contrib/1.1/icewm/current/sources/icewm-preferences	2004-11-18 15:24:28 UTC (rev 5117)
+++ contrib/1.1/icewm/current/sources/icewm-preferences	2004-11-19 11:35:32 UTC (rev 5118)
@@ -405,7 +405,7 @@
 # NestedThemeMenuMinNumber=15 # [0-1234]
 
 #  Icon search path (colon separated)
-IconPath="/usr/share/pixmaps:/usr/share/icons"
+IconPath="/usr/share/icewm/icons:/usr/share/pixmaps:/usr/share/icons"
 
 #  Mailbox path (use $MAIL instead)
 #MailBoxPath=""


From svn at tinysofa.org  Fri Nov 19 11:41:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 19 Nov 2004 06:41:51 -0500 (EST)
Subject: [tinysofa-svn] r5119 - contrib/1.1/gpgme/current/specs
Message-ID: <20041119114151.C2D353440F5@minbar.tinysofa.org>

Author: jh
Date: 2004-11-19 06:41:51 -0500 (Fri, 19 Nov 2004)
New Revision: 5119

Modified:
   contrib/1.1/gpgme/current/specs/gpgme.spec
Log:
- correct group


Modified: contrib/1.1/gpgme/current/specs/gpgme.spec
===================================================================
--- contrib/1.1/gpgme/current/specs/gpgme.spec	2004-11-19 11:35:32 UTC (rev 5118)
+++ contrib/1.1/gpgme/current/specs/gpgme.spec	2004-11-19 11:41:51 UTC (rev 5119)
@@ -5,7 +5,7 @@
 Release: 2gd
 URL: http://www.gnupg.org/gpgme.html
 Source: ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/%{name}-%{version}.tar.gz
-Group: Development/Libraries
+Group: contrib
 Copyright: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}
 BuildRequires: gnupg


From svn at tinysofa.org  Fri Nov 19 11:49:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 19 Nov 2004 06:49:10 -0500 (EST)
Subject: [tinysofa-svn] 
	r5120 - in contrib/1.1: . patchutils patchutils/current
	patchutils/current/sources patchutils/current/specs
Message-ID: <20041119114910.692A23440F5@minbar.tinysofa.org>

Author: jh
Date: 2004-11-19 06:49:09 -0500 (Fri, 19 Nov 2004)
New Revision: 5120

Added:
   contrib/1.1/patchutils/
   contrib/1.1/patchutils/current/
   contrib/1.1/patchutils/current/sources/
   contrib/1.1/patchutils/current/sources/patchutils-0.2.30.tar.bz2
   contrib/1.1/patchutils/current/specs/
   contrib/1.1/patchutils/current/specs/patchutils.spec
   contrib/1.1/patchutils/pristine/
   contrib/1.1/patchutils/releases/
Log:
- add patchutils to contrib


Added: contrib/1.1/patchutils/current/sources/patchutils-0.2.30.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/patchutils/current/sources/patchutils-0.2.30.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/patchutils/current/specs/patchutils.spec
===================================================================
--- contrib/1.1/patchutils/current/specs/patchutils.spec	2004-11-19 11:41:51 UTC (rev 5119)
+++ contrib/1.1/patchutils/current/specs/patchutils.spec	2004-11-19 11:49:09 UTC (rev 5120)
@@ -0,0 +1,149 @@
+Summary: A collection of programs for manipulating patch files
+Name: patchutils
+Version: 0.2.30
+Release: 1jh
+License: GPL
+Group: contrib
+URL: http://cyberelk.net/tim/patchutils/
+Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+Obsoletes: interdiff
+Provides: interdiff
+
+%description
+This is a collection of programs that can manipulate patch files in
+a variety of ways, such as interpolating between two pre-patches, 
+combining two incremental patches, fixing line numbers in hand-edited 
+patches, and simply listing the files modified by a patch.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure
+make
+make check
+
+
+%install
+%makeinstall
+
+
+%clean
+%clean_buildroot
+
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog README COPYING BUGS NEWS
+%{_bindir}/*
+%{_mandir}/*/*
+
+
+%changelog
+* Thu Jul 22 2004 Tim Waugh <twaugh at redhat.com> 0.2.30-1
+- 0.2.30.
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Apr 16 2004 Tim Waugh <twaugh at redhat.com> 0.2.29-2
+- Fix no-newline handling in filterdiff.
+
+* Mon Apr  5 2004 Tim Waugh <twaugh at redhat.com> 0.2.29-1
+- 0.2.29.
+
+* Wed Mar 10 2004 Tim Waugh <twaugh at redhat.com> 0.2.28-1
+- 0.2.28.
+
+* Thu Feb 26 2004 Tim Waugh <twaugh at redhat.com> 0.2.27-1
+- 0.2.27.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon Jan 12 2004 Tim Waugh <twaugh at redhat.com> 0.2.26-1
+- 0.2.26.
+
+* Tue Jan  6 2004 Tim Waugh <twaugh at redhat.com>
+- Ship AUTHORS and ChangeLog as well (bug #112936).
+
+* Mon Dec 15 2003 Tim Waugh <twaugh at redhat.com> 0.2.25-1
+- 0.2.25.
+
+* Wed Sep  3 2003 Tim Waugh <twaugh at redhat.com>
+- Remove buildroot before installing.
+
+* Thu Jul 31 2003 Tim Waugh <twaugh at redhat.com> 0.2.24-2
+- Add support for -H in lsdiff/grepdiff (from CVS).
+
+* Fri Jul 25 2003 Tim Waugh <twaugh at redhat.com> 0.2.24-1
+- 0.2.24 (fixes bug #100795).
+
+* Wed Jun 5 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu Jun  5 2003 Tim Waugh <twaugh at redhat.com> 0.2.23-2
+- Added patch from CVS which adds timestamp removal to filterdiff.
+
+* Thu Jun  5 2003 Tim Waugh <twaugh at redhat.com> 0.2.23-1.1
+- Rebuilt.
+
+* Thu Jun  5 2003 Tim Waugh <twaugh at redhat.com> 0.2.23-1
+- 0.2.23.  Fixes bug #92320.
+
+* Sat Mar  8 2003 Tim Waugh <twaugh at redhat.com> 0.2.22-1
+- 0.2.22.
+
+* Thu Jan 23 2003 Tim Waugh <twaugh at redhat.com> 0.2.19-1
+- 0.2.19, incorporating all patches.
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com> 0.2.18-3
+- rebuilt
+
+* Wed Jan 22 2003 Tim Waugh <twaugh at redhat.com>
+- Apply editdiff patch from 0.2.19pre2.
+
+* Wed Jan 22 2003 Tim Waugh <twaugh at redhat.com> 0.2.18-2
+- Bug-fix for rediff.
+
+* Mon Dec 16 2002 Tim Waugh <twaugh at redhat.com> 0.2.18-1
+- Fix file_exists().
+- 0.2.18.
+
+* Wed Oct 16 2002 Tim Waugh <twaugh at redhat.com> 0.2.17-1
+- 0.2.17.
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Sat May 18 2002 Tim Waugh <twaugh at redhat.com> 0.2.14-1
+- 0.2.14.
+
+* Thu May  9 2002 Tim Waugh <twaugh at redhat.com> 0.2.13-1
+- 0.2.13.
+
+* Tue Apr 23 2002 Tim Waugh <twaugh at redhat.com> 0.2.13-0.pre1.1
+- 0.2.13pre1 (now handles diffutils 2.8.1 output).
+- Run tests after build step.
+
+* Fri Apr 19 2002 Tim Waugh <twaugh at redhat.com> 0.2.12-1
+- 0.2.12.
+
+* Wed Mar 20 2002 Tim Waugh <twaugh at redhat.com> 0.2.11-2
+- Fix handling of context diffs so that it handles GNU diff's output
+  style.
+
+* Mon Mar 14 2002 Tim Waugh <twaugh at redhat.com> 0.2.11-1
+- 0.2.11.
+
+* Mon Mar 04 2002 Florian La Roche <Florian.LaRoche at redhat.de>
+- I need this. :-)
+
+* Tue Nov 27 2001 Tim Waugh <twaugh at redhat.com>
+- Initial spec file.


From svn at tinysofa.org  Sun Nov 21 22:25:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 21 Nov 2004 17:25:46 -0500 (EST)
Subject: [tinysofa-svn] r5122 - contrib/1.1/xorg-x11/current/sources
Message-ID: <20041121222546.D2E803440F5@minbar.tinysofa.org>

Author: gda
Date: 2004-11-21 17:25:46 -0500 (Sun, 21 Nov 2004)
New Revision: 5122

Removed:
   contrib/1.1/xorg-x11/current/sources/xorg-CAN-2004-0687-0688.patch
Log:
security patches

Deleted: contrib/1.1/xorg-x11/current/sources/xorg-CAN-2004-0687-0688.patch
===================================================================
--- contrib/1.1/xorg-x11/current/sources/xorg-CAN-2004-0687-0688.patch	2004-11-21 22:23:36 UTC (rev 5121)
+++ contrib/1.1/xorg-x11/current/sources/xorg-CAN-2004-0687-0688.patch	2004-11-21 22:25:46 UTC (rev 5122)
@@ -1,498 +0,0 @@
-Index: xc/extras/Xpm/lib/Attrib.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/Attrib.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 Attrib.c
---- xc/extras/Xpm/lib/Attrib.c	15 Feb 2001 07:59:10 -0000	1.1.1.1
-+++ xc/extras/Xpm/lib/Attrib.c	31 Aug 2004 23:28:59 -0000
-@@ -35,7 +35,7 @@
- #include "XpmI.h"
- 
- /* 3.2 backward compatibility code */
--LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
-+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
- 				 XpmColor ***oldct));
- 
- LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
-@@ -46,11 +46,14 @@
- static int
- CreateOldColorTable(ct, ncolors, oldct)
-     XpmColor *ct;
--    int ncolors;
-+    unsigned int ncolors;
-     XpmColor ***oldct;
- {
-     XpmColor **colorTable, **color;
-     int a;
-+
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) 
-+	return XpmNoMemory;
- 
-     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
-     if (!colorTable) {
-Index: xc/extras/Xpm/lib/CrDatFrI.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/CrDatFrI.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 CrDatFrI.c
---- xc/extras/Xpm/lib/CrDatFrI.c	19 Jan 2002 11:08:43 -0000	1.1.1.2
-+++ xc/extras/Xpm/lib/CrDatFrI.c	31 Aug 2004 23:28:59 -0000
-@@ -124,6 +124,8 @@
-      */
-     header_nlines = 1 + image->ncolors;
-     header_size = sizeof(char *) * header_nlines;
-+    if (header_size >= SIZE_MAX / sizeof(char *))
-+	return (XpmNoMemory);
-     header = (char **) XpmCalloc(header_size, sizeof(char *));
-     if (!header)
- 	return (XpmNoMemory);
-Index: xc/extras/Xpm/lib/WrFFrI.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/WrFFrI.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 WrFFrI.c
---- xc/extras/Xpm/lib/WrFFrI.c	19 Jan 2002 11:08:43 -0000	1.1.1.2
-+++ xc/extras/Xpm/lib/WrFFrI.c	31 Aug 2004 23:28:59 -0000
-@@ -248,6 +248,8 @@
-     unsigned int x, y, h;
- 
-     h = height - 1;
-+    if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) 
-+	return XpmNoMemory;    
-     p = buf = (char *) XpmMalloc(width * cpp + 3);
-     if (!buf)
- 	return (XpmNoMemory);
-Index: xc/extras/Xpm/lib/XpmI.h
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/XpmI.h,v
-retrieving revision 1.6
-diff -u -r1.6 XpmI.h
---- xc/extras/Xpm/lib/XpmI.h	13 Feb 2004 22:40:56 -0000	1.6
-+++ xc/extras/Xpm/lib/XpmI.h	31 Aug 2004 23:28:59 -0000
-@@ -86,6 +86,18 @@
- 		boundCheckingCalloc((long)(nelem),(long) (elsize))
- #endif
- 
-+#if defined(SCO) || defined(__USLC__)
-+#include <stdint.h>	/* For SIZE_MAX */
-+#endif
-+#include <limits.h>
-+#ifndef SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else 
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #define XPMMAXCMTLEN BUFSIZ
- typedef struct {
-     unsigned int type;
-@@ -187,9 +199,9 @@
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
- 
-Index: xc/extras/Xpm/lib/create.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/create.c,v
-retrieving revision 1.3
-diff -u -r1.3 create.c
---- xc/extras/Xpm/lib/create.c	13 Feb 2004 22:40:56 -0000	1.3
-+++ xc/extras/Xpm/lib/create.c	31 Aug 2004 23:28:59 -0000
-@@ -1,3 +1,4 @@
-+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
- /*
-  * Copyright (C) 1989-95 GROUPE BULL
-  *
-@@ -816,6 +817,9 @@
- 
-     ErrorStatus = XpmSuccess;
- 
-+    if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) 
-+	return (XpmNoMemory);
-+
-     /* malloc pixels index tables */
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
-     if (!image_pixels)
-@@ -988,6 +992,8 @@
- 	return (XpmNoMemory);
- 
- #if !defined(FOR_MSW) && !defined(AMIGA)
-+    if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
-+	return XpmNoMemory;
-     /* now that bytes_per_line must have been set properly alloc data */
-     (*image_return)->data =
- 	(char *) XpmMalloc((*image_return)->bytes_per_line * height);
-@@ -2055,6 +2061,9 @@
- 	xpmGetCmt(data, &colors_cmt);
- 
-     /* malloc pixels index tables */
-+    if (ncolors >= SIZE_MAX / sizeof(Pixel)) 
-+	return XpmNoMemory;
-+
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
-     if (!image_pixels)
- 	RETURN(XpmNoMemory);
-@@ -2309,7 +2318,8 @@
- 	    }
- 	    obm = SelectObject(*dc, image->bitmap);
- #endif
--
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
- 
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
-@@ -2414,6 +2424,9 @@
- 	{
- 	    char *s;
- 	    char buf[BUFSIZ];
-+
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
- 
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
-Index: xc/extras/Xpm/lib/data.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/data.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 data.c
---- xc/extras/Xpm/lib/data.c	19 Jan 2002 11:08:44 -0000	1.1.1.2
-+++ xc/extras/Xpm/lib/data.c	31 Aug 2004 23:28:59 -0000
-@@ -375,7 +375,7 @@
- {
-     if (!data->type)
- 	*cmt = NULL;
--    else if (data->CommentLength) {
-+    else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) {
- 	*cmt = (char *) XpmMalloc(data->CommentLength + 1);
- 	strncpy(*cmt, data->Comment, data->CommentLength);
- 	(*cmt)[data->CommentLength] = '\0';
-Index: xc/extras/Xpm/lib/hashtab.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/hashtab.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 hashtab.c
---- xc/extras/Xpm/lib/hashtab.c	15 Feb 2001 07:59:10 -0000	1.1.1.1
-+++ xc/extras/Xpm/lib/hashtab.c	31 Aug 2004 23:28:59 -0000
-@@ -135,7 +135,7 @@
-     xpmHashTable *table;
- {
-     xpmHashAtom *atomTable = table->atomTable;
--    int size = table->size;
-+    unsigned int size = table->size;
-     xpmHashAtom *t, *p;
-     int i;
-     int oldSize = size;
-@@ -144,6 +144,8 @@
-     HASH_TABLE_GROWS
- 	table->size = size;
-     table->limit = size / 3;
-+    if (size >= SIZE_MAX / sizeof(*atomTable)) 
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
-@@ -204,6 +206,8 @@
-     table->size = INITIAL_HASH_SIZE;
-     table->limit = table->size / 3;
-     table->used = 0;
-+    if (table->size >= SIZE_MAX / sizeof(*atomTable))
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
-Index: xc/extras/Xpm/lib/parse.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/parse.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 parse.c
---- xc/extras/Xpm/lib/parse.c	19 Jan 2002 11:08:44 -0000	1.1.1.2
-+++ xc/extras/Xpm/lib/parse.c	31 Aug 2004 23:28:59 -0000
-@@ -1,3 +1,4 @@
-+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
- /*
-  * Copyright (C) 1989-95 GROUPE BULL
-  *
-@@ -44,6 +45,24 @@
- #include <ctype.h>
- #include <string.h>
- 
-+#ifdef HAS_STRLCAT
-+# define STRLCAT(dst, src, dstsize) { \
-+  	if (strlcat(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+  	if (strlcpy(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+#else
-+# define STRLCAT(dst, src, dstsize) { \
-+	if ((strlen(dst) + strlen(src)) < (dstsize)) \
-+ 	    strcat(dst, src); \
-+	else return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+	if (strlen(src) < (dstsize)) \
-+ 	    strcpy(dst, src); \
-+	else return (XpmFileInvalid); }
-+#endif
-+
- LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
- 			 unsigned int height, unsigned int ncolors,
- 			 unsigned int cpp, XpmColor *colorTable,
-@@ -66,7 +85,7 @@
-     unsigned int *extensions;
- {
-     unsigned int l;
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ + 1];
- 
-     if (!data->format) {		/* XPM 2 or 3 */
- 
-@@ -175,10 +194,10 @@
-     XpmColor **colorTablePtr;
-     xpmHashTable *hashtable;
- {
--    unsigned int key = 0, l, a, b;
-+    unsigned int key = 0, l, a, b, len;
-     unsigned int curkey;		/* current color key */
-     unsigned int lastwaskey;		/* key read */
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ+1];
-     char curbuf[BUFSIZ];		/* current buffer */
-     char **sptr, *s;
-     XpmColor *color;
-@@ -186,6 +205,8 @@
-     char **defaults;
-     int ErrorStatus;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	return (XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	return (XpmNoMemory);
-@@ -197,6 +218,10 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -234,13 +259,14 @@
- 		}
- 		if (!lastwaskey && key < NKEYS) {	/* open new key */
- 		    if (curkey) {	/* flush string */
--			s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+			len = strlen(curbuf) + 1;
-+			s = (char *) XpmMalloc(len);
- 			if (!s) {
- 			    xpmFreeColorTable(colorTable, ncolors);
- 			    return (XpmNoMemory);
- 			}
- 			defaults[curkey] = s;
--			strcpy(s, curbuf);
-+			memcpy(s, curbuf, len);
- 		    }
- 		    curkey = key + 1;	/* set new key  */
- 		    *curbuf = '\0';	/* reset curbuf */
-@@ -251,9 +277,9 @@
- 			return (XpmFileInvalid);
- 		    }
- 		    if (!lastwaskey)
--			strcat(curbuf, " ");	/* append space */
-+			STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */
- 		    buf[l] = '\0';
--		    strcat(curbuf, buf);/* append buf */
-+		    STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */
- 		    lastwaskey = 0;
- 		}
- 	    }
-@@ -261,12 +287,13 @@
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmFileInvalid);
- 	    }
--	    s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = defaults[curkey] = (char *) XpmMalloc(len);
- 	    if (!s) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	}
-     } else {				/* XPM 1 */
- 	/* get to the beginning of the first string */
-@@ -279,6 +306,10 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -307,16 +338,17 @@
- 	    *curbuf = '\0';		/* init curbuf */
- 	    while ((l = xpmNextWord(data, buf, BUFSIZ))) {
- 		if (*curbuf != '\0')
--		    strcat(curbuf, " ");/* append space */
-+		    STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */
- 		buf[l] = '\0';
--		strcat(curbuf, buf);	/* append buf */
-+		STRLCAT(curbuf, buf, sizeof(curbuf));	/* append buf */
- 	    }
--	    s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = (char *) XpmMalloc(len);
- 	    if (!s) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	    color->c_color = s;
- 	    *curbuf = '\0';		/* reset curbuf */
- 	    if (a < ncolors - 1)
-@@ -341,6 +373,9 @@
-     unsigned int *iptr, *iptr2;
-     unsigned int a, x, y;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	width * height >= SIZE_MAX / sizeof(unsigned int)) 
-+	return XpmNoMemory;
- #ifndef FOR_MSW
-     iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
- #else
-@@ -364,6 +399,9 @@
- 	{
- 	    unsigned short colidx[256];
- 
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
-+
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -441,6 +479,9 @@
- 	{
- 	    char *s;
- 	    char buf[BUFSIZ];
-+
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
- 
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
-Index: xc/extras/Xpm/lib/scan.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/scan.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 scan.c
---- xc/extras/Xpm/lib/scan.c	19 Jan 2002 11:08:44 -0000	1.1.1.2
-+++ xc/extras/Xpm/lib/scan.c	31 Aug 2004 23:28:59 -0000
-@@ -107,7 +107,8 @@
- LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
- 				  XpmAttributes *attributes));
- 
--LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
-+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, 
-+			     unsigned int ncolors, 
- 			     Pixel *pixels, unsigned int mask,
- 			     unsigned int cpp, XpmAttributes *attributes));
- 
-@@ -232,11 +233,17 @@
-     else
- 	cpp = 0;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	width * height >= SIZE_MAX / sizeof(unsigned int))
-+	RETURN(XpmNoMemory);
-     pmap.pixelindex =
- 	(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
-     if (!pmap.pixelindex)
- 	RETURN(XpmNoMemory);
- 
-+    if (pmap.size >= SIZE_MAX / sizeof(Pixel)) 
-+	RETURN(XpmNoMemory);
-+
-     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
-     if (!pmap.pixels)
- 	RETURN(XpmNoMemory);
-@@ -301,7 +308,8 @@
-      * get rgb values and a string of char, and possibly a name for each
-      * color
-      */
--
-+    if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	RETURN(XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	RETURN(XpmNoMemory);
-@@ -360,6 +368,8 @@
- 
-     /* first get a character string */
-     a = 0;
-+    if (cpp >= SIZE_MAX - 1)
-+	return (XpmNoMemory);
-     if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
- 	return (XpmNoMemory);
-     *s++ = printable[c = a % MAXPRINTABLE];
-@@ -407,7 +417,7 @@
- ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
-     Display *display;
-     XpmColor *colors;
--    int ncolors;
-+    unsigned int ncolors;
-     Pixel *pixels;
-     unsigned int mask;
-     unsigned int cpp;
-@@ -451,6 +461,8 @@
-     }
- 
-     /* first get character strings and rgb values */
-+    if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
-+	return (XpmNoMemory);
-     xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
-     if (!xcolors)
- 	return (XpmNoMemory);
-Index: xc/lib/Xpm/Imakefile
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/Xpm/Imakefile,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 Imakefile
---- xc/lib/Xpm/Imakefile	15 Feb 2001 07:56:01 -0000	1.1.1.1
-+++ xc/lib/Xpm/Imakefile	31 Aug 2004 23:28:59 -0000
-@@ -42,11 +42,16 @@
- SPRINTFDEF = -DVOID_SPRINTF
- #endif
- 
-+#if HasStrlcat
-+STRLCATDEF = -DHAS_STRLCAT
-+#endif
-+
- #if defined(Win32Architecture)
- ZPIPEDEF = -DNO_ZPIPE
- #endif
- 
--DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(ZPIPEDEF) $(ZFILEDEF)
-+DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(STRLCATDEF) \
-+		$(ZPIPEDEF) $(ZFILEDEF)
- 
- HEADERS = xpm.h
- 


From svn at tinysofa.org  Mon Nov 22 12:21:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 22 Nov 2004 07:21:45 -0500 (EST)
Subject: [tinysofa-svn] r5123 - tinysofa/releases/1.1/texinfo/current/specs
Message-ID: <20041122122145.6D36B3440F5@minbar.tinysofa.org>

Author: jh
Date: 2004-11-22 07:21:44 -0500 (Mon, 22 Nov 2004)
New Revision: 5123

Modified:
   tinysofa/releases/1.1/texinfo/current/specs/texinfo.spec
Log:
- spec cleanup


Modified: tinysofa/releases/1.1/texinfo/current/specs/texinfo.spec
===================================================================
--- tinysofa/releases/1.1/texinfo/current/specs/texinfo.spec	2004-11-21 22:25:46 UTC (rev 5122)
+++ tinysofa/releases/1.1/texinfo/current/specs/texinfo.spec	2004-11-22 12:21:44 UTC (rev 5123)
@@ -9,7 +9,7 @@
 # Not used
 Patch3: texinfo-4.1-zlib.patch
 Prereq: htmlinfo
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel, libtermcap-devel
 
 # Redifine this to "dir" in the info directory isn't compressed
@@ -30,6 +30,7 @@
 online and print documentation from the same source file and/or if you
 are going to write documentation for the GNU Project.
 
+
 %prep
 %setup -q
 %patch1 -p1
@@ -37,35 +38,39 @@
 
 %build
 %configure
-make 
+%make 
 rm -f util/install-info ||:
 make -C util LIBS=%{_libdir}/libz.a
 cd doc
 ../makeinfo/makeinfo --html --no-split texinfo.txi
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{usr/share/html/texinfo}
+mkdir -p $RPM_BUILD_ROOT/%{_htmldir}/texinfo
 
 %makeinstall
 
-install -m755 -d $RPM_BUILD_ROOT/usr/share/html/texinfo/
-install -m644 doc/texinfo.html $RPM_BUILD_ROOT/usr/share/html/texinfo/
+install -m644 doc/texinfo.html $RPM_BUILD_ROOT/%{_htmldir}/texinfo
 
-rm -rf $RPM_BUILD_ROOT/usr/share/info
+%nuke_info
 
 %find_lang %{name}
+rm -fr $RPM_BUILD_ROOT/usr/share/locale
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post
-/usr/sbin/htmlinfo_update.sh
+%info_post
 
 %postun
-/usr/sbin/htmlinfo_update.sh
+%info_postun
 
-%files -f %{name}.lang
+
+#%files -f %{name}.lang
+%files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog INSTALL INTRODUCTION NEWS README TODO
 %doc info/README
@@ -91,7 +96,11 @@
 %exclude %{_datadir}/texinfo/texinfo.xsl
 %exclude %{_datadir}/texinfo/texinfo.cat
 
+
 %changelog
+* Mon Nov 22 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- spec cleanup
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 4.7-3ts
 - current (4.7-3jh) integrated as 4.7-3ts for release 1.1
 


From svn at tinysofa.org  Thu Nov 25 07:05:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 25 Nov 2004 02:05:16 -0500 (EST)
Subject: [tinysofa-svn] 
	r5125 - in tinysofa/releases/1.1/cyrus-imapd/current: sources specs
Message-ID: <20041125070516.A531D34410E@minbar.tinysofa.org>

Author: jh
Date: 2004-11-25 02:05:14 -0500 (Thu, 25 Nov 2004)
New Revision: 5125

Added:
   tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.9-imap_err.patch
   tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.9.tar.gz
Removed:
   tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.8.tar.gz
Modified:
   tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec
Log:
- 2.2.9, which fixes several critical vulnerabilities (Bug ID: #45)

Deleted: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.8.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.9-imap_err.patch
===================================================================
--- tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.9-imap_err.patch	2004-11-24 21:23:10 UTC (rev 5124)
+++ tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.9-imap_err.patch	2004-11-25 07:05:14 UTC (rev 5125)
@@ -0,0 +1,10 @@
+--- /tmp/imap_err.et	2004-11-25 08:27:24.339546896 +0200
++++ cyrus-imapd-2.2.9/imap/imap_err.et	2004-11-25 08:27:56.558899289 +0200
+@@ -118,7 +118,6 @@
+ ec IMAP_ANNOTATION_BADVALUE,
+    "Invalid annotation value"
+ 
+-# following used only proxy/db operations
+ ec IMAP_BAD_SERVER,
+    "Invalid server requested"
+ 

Added: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.9.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.9.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec
===================================================================
--- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec	2004-11-24 21:23:10 UTC (rev 5124)
+++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec	2004-11-25 07:05:14 UTC (rev 5125)
@@ -1,6 +1,6 @@
 Summary: A high-performance mail store with IMAP and POP3 support.
 Name: cyrus-imapd
-Version: 2.2.8
+Version: 2.2.9
 Release: 1jh
 License: BSD
 Group: extra
@@ -16,6 +16,7 @@
 Source14: cyrus-imapd-rc
 
 Patch1: cyrus-imapd-2.0.5-pollute.patch
+Patch2: cyrus-imapd-2.2.9-imap_err.patch
 
 # Not applied:
 Patch6: mysql+ldapauxprop.patch
@@ -58,6 +59,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 %patch7 -p1
 
 find doc -name CVS -type d | xargs -r rm -fr
@@ -229,6 +231,9 @@
 %{_includedir}/cyrus
 
 %changelog
+* Wed Nov 24 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.2.9-1jh
+- 2.2.9, which fixes several critical vulnerabilities
+
 * Sun Oct 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.2.8-1jh
 - 2.2.8
 - link with -pie


From svn at tinysofa.org  Thu Nov 25 07:40:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 25 Nov 2004 02:40:13 -0500 (EST)
Subject: [tinysofa-svn] r5126 - in contrib/1.1/star/current: sources specs
Message-ID: <20041125074013.9118A34410E@minbar.tinysofa.org>

Author: jh
Date: 2004-11-25 02:40:13 -0500 (Thu, 25 Nov 2004)
New Revision: 5126

Added:
   contrib/1.1/star/current/sources/star-1.5a54.tar.bz2
Removed:
   contrib/1.1/star/current/sources/star-1.5a49.tar.bz2
Modified:
   contrib/1.1/star/current/specs/star.spec
Log:
- 1.5a54


Deleted: contrib/1.1/star/current/sources/star-1.5a49.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/1.1/star/current/sources/star-1.5a54.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/star/current/sources/star-1.5a54.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/star/current/specs/star.spec
===================================================================
--- contrib/1.1/star/current/specs/star.spec	2004-11-25 07:05:14 UTC (rev 5125)
+++ contrib/1.1/star/current/specs/star.spec	2004-11-25 07:40:13 UTC (rev 5126)
@@ -3,7 +3,7 @@
 %endif
 Summary:	An archiving tool with ACL support
 Name:		star
-Version:	1.5a49
+Version:	1.5a54
 Release: 1jh
 URL:		http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html
 Source:		ftp://ftp.fokus.gmd.de/pub/unix/star/alpha/%{name}-%{version}.tar.bz2
@@ -55,7 +55,6 @@
 
 
 %install
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf -- "%{buildroot}"
 %{__mkdir_p} %{buildroot}%{_mandir}/man1
 %makeinstall RPM_INSTALLDIR=%{buildroot} PARCH=%{_target_cpu} K_ARCH=%{_target_cpu} < /dev/null
 %{__rm} -rf %{buildroot}/usr/share/man
@@ -95,6 +94,9 @@
 
 
 %changelog
+* Thu Nov 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.5a54-1jh
+- 1.5a54
+
 * Sat Oct  2 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.5a49-1jh
 - 1.5a49
 - add spax manual page


From svn at tinysofa.org  Thu Nov 25 11:02:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 25 Nov 2004 06:02:32 -0500 (EST)
Subject: [tinysofa-svn] r5127 - in contrib/1.1: . bsdtar bsdtar/current
	bsdtar/current/sources bsdtar/current/specs
Message-ID: <20041125110232.8AB4934410E@minbar.tinysofa.org>

Author: jh
Date: 2004-11-25 06:02:31 -0500 (Thu, 25 Nov 2004)
New Revision: 5127

Added:
   contrib/1.1/bsdtar/
   contrib/1.1/bsdtar/current/
   contrib/1.1/bsdtar/current/sources/
   contrib/1.1/bsdtar/current/sources/bsdtar-1.01.020.tar.gz
   contrib/1.1/bsdtar/current/sources/libarchive-1.01.020.tar.gz
   contrib/1.1/bsdtar/current/specs/
   contrib/1.1/bsdtar/current/specs/bsdtar.spec
   contrib/1.1/bsdtar/pristine/
   contrib/1.1/bsdtar/releases/
Log:
- add bsdtar


Added: contrib/1.1/bsdtar/current/sources/bsdtar-1.01.020.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/bsdtar/current/sources/bsdtar-1.01.020.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/bsdtar/current/sources/libarchive-1.01.020.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/bsdtar/current/sources/libarchive-1.01.020.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/bsdtar/current/specs/bsdtar.spec
===================================================================
--- contrib/1.1/bsdtar/current/specs/bsdtar.spec	2004-11-25 07:40:13 UTC (rev 5126)
+++ contrib/1.1/bsdtar/current/specs/bsdtar.spec	2004-11-25 11:02:31 UTC (rev 5127)
@@ -0,0 +1,55 @@
+Summary: A FreeBSD file archiving program
+Name: bsdtar
+Version: 1.01.020
+Release: 1jh
+License: BSD
+Group: main
+Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
+Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz
+BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+
+%description
+The tar program saves many files together in one archive and can
+restore individual files (or all of the files) from that archive. Tar
+can also be used to add supplemental files to an archive and to update
+or list files in the archive. Bsdtar supports natively gzip and bzip2
+compressions, POSIX-standard formats, including ustar, pax interchange
+format and the POSIX cpio format. It can also store ACLs using a standard
+method for incorporating vendor-specific extensions for POSIX pax format.
+
+
+%prep
+%setup -q -a 1
+
+
+%build
+pushd libarchive-%{version}
+%configure --prefix=$PWD
+%make
+popd
+
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{version}"
+export LDFLAGS="$LDFLAGS -Llibarchive-%{version}"
+%configure
+%make
+
+
+%install
+%makeinstall
+
+
+%clean
+%clean_buildroot
+
+
+%files
+%defattr(-,root,root)
+%{_bindir}/bsdtar
+%{_mandir}/man1/bsdtar.1*
+
+
+%changelog
+* Thu Nov 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.01.020-1jh
+- intial spec file


From svn at tinysofa.org  Thu Nov 25 19:42:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 25 Nov 2004 14:42:08 -0500 (EST)
Subject: [tinysofa-svn] r5128 - tinysofa/releases/1.1/postfix/current/specs
Message-ID: <20041125194208.61A65344118@minbar.tinysofa.org>

Author: jh
Date: 2004-11-25 14:42:06 -0500 (Thu, 25 Nov 2004)
New Revision: 5128

Modified:
   tinysofa/releases/1.1/postfix/current/specs/postfix.spec
Log:
- multilib fixes


Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-11-25 11:02:31 UTC (rev 5127)
+++ tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-11-25 19:42:06 UTC (rev 5128)
@@ -1,7 +1,7 @@
 Summary: The Postfix mailer daemon
 Name: postfix
 Version: 2.0.20
-Release: 2jh
+Release: 3jh
 License: IBM Public Licence
 Group: main
 Source: ftp://ftp.sunet.se/pub/unix/mail/postfix/official/postfix-%{version}.tar.gz
@@ -43,7 +43,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 %service_requires
 BuildRequires: openssl-devel >= %{version_ssl}
-BuildRequires: cyrus-sasl-devel
+BuildRequires: cyrus-sasl-devel findutils perl
 BuildRequires: mysql-devel, postgresql-devel >= 7.4-1tr, openldap-devel
 BuildRequires: pcre-devel, db4-devel, zlib-devel, pam-devel
 Requires: findutils, db4, zlib, pam
@@ -253,7 +253,11 @@
 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/sasl/postfix.conf
 install -m 640 %{SOURCE9} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/postfix
 
+# fix libdir for multilib arches
+find $RPM_BUILD_ROOT/%{_sysconfdir} -type f -name '*.cf'| \
+	xargs perl -pi -e 's|/usr/lib|%{_libdir}|g'
 
+
 %pre
 if [ -z "`getent group postfix`" ]; then
         /usr/sbin/groupadd -g 102 postfix
@@ -475,6 +479,9 @@
 
 
 %changelog
+* Thu Nov 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.0.20-3jh
+- multilib fixes
+
 * Sun Nov 14 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.0.20-2jh
 - add vda patch
 - rationalize pre, post and postun scripts


From svn at tinysofa.org  Fri Nov 26 13:46:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 26 Nov 2004 08:46:34 -0500 (EST)
Subject: [tinysofa-svn] 
	r5129 - in tinysofa/releases/1.1/gzip/current: sources specs
Message-ID: <20041126134634.C9B6434410E@minbar.tinysofa.org>

Author: jh
Date: 2004-11-26 08:46:33 -0500 (Fri, 26 Nov 2004)
New Revision: 5129

Added:
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-zforce.patch
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4a-dirinfo.patch
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-openbsd-owl-tmp.diff
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-rsync.patch
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-stderr.patch
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.1-zgreppipe.patch
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.3-window-size.patch
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.3.tar.gz
Removed:
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-basename.patch
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-gzexe.patch
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-mktemp.patch
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4a.tar.gz
   tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4b.patch
Modified:
   tinysofa/releases/1.1/gzip/current/specs/gzip.spec
Log:
- update to 1.3.3


Deleted: tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-basename.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-basename.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-basename.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -1,22 +0,0 @@
---- gzip-1.2.4/gzip.h.orig	Wed Nov  1 23:02:14 1995
-+++ gzip-1.2.4/gzip.h	Wed Nov  1 23:02:20 1995
-@@ -301,7 +301,7 @@
- extern void flush_window  OF((void));
- extern void write_buf     OF((int fd, voidp buf, unsigned cnt));
- extern char *strlwr       OF((char *s));
--extern char *basename     OF((char *fname));
-+extern char *basename     OF((const char *fname));
- extern void make_simple_name OF((char *name));
- extern char *add_envopt   OF((int *argcp, char ***argvp, char *env));
- extern void error         OF((char *m));
---- gzip-1.2.4/util.c.orig	Wed Nov  1 23:03:32 1995
-+++ gzip-1.2.4/util.c	Wed Nov  1 23:03:37 1995
-@@ -179,7 +179,7 @@
-  * case sensitive, force the base name to lower case.
-  */
- char *basename(fname)
--    char *fname;
-+    const char *fname;
- {
-     char *p;
- 

Deleted: tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-gzexe.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-gzexe.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-gzexe.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -1,29 +0,0 @@
---- gzip-1.2.4/gzexe.in.ewt	Sun Sep 14 14:44:55 1997
-+++ gzip-1.2.4/gzexe.in	Sun Sep 14 14:45:16 1997
-@@ -91,7 +91,7 @@
-     sed 1q $0 > $tmp
-     sed "s|^if tail|if $tail|" >> $tmp <<'EOF'
- skip=18
--if tail +$skip $0 | "BINDIR"/gzip -cd > /tmp/gztmp$$; then
-+if tail +$skip $0 | "/bin"/gzip -cd > /tmp/gztmp$$; then
-   /bin/chmod 700 /tmp/gztmp$$
-   prog="`echo $0 | /bin/sed 's|^.*/||'`"
-   if /bin/ln /tmp/gztmp$$ "/tmp/$prog" 2>/dev/null; then
-@@ -107,7 +107,7 @@
-   echo Cannot decompress $0; exit 1
- fi; exit $res
- EOF
--    "BINDIR"/gzip -cv9 "$i" >> $tmp || {
-+    "/bin"/gzip -cv9 "$i" >> $tmp || {
-       /bin/rm -f $tmp
-       echo ${x}: compression not possible for $i, file unchanged.
-       res=1
-@@ -120,7 +120,7 @@
-     if sed -e 1d -e 2q "$i" | grep "^skip=[0-9]*$" >/dev/null; then
-       eval `sed -e 1d -e 2q "$i"`
-     fi
--    if tail +$skip "$i" | "BINDIR"/gzip -cd > $tmp; then
-+    if tail +$skip "$i" | "/bin"/gzip -cd > $tmp; then
-       :
-     else
-       echo ${x}: $i probably not in gzexe format, file unchanged.

Deleted: tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-mktemp.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-mktemp.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-mktemp.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -1,43 +0,0 @@
---- gzip-1.2.4/gzexe.in.ewt	Wed Jan 28 15:30:41 1998
-+++ gzip-1.2.4/gzexe.in	Wed Jan 28 15:37:14 1998
-@@ -90,18 +90,22 @@
-   if test $decomp -eq 0; then
-     sed 1q $0 > $tmp
-     sed "s|^if tail|if $tail|" >> $tmp <<'EOF'
--skip=18
--if tail +$skip $0 | "/bin"/gzip -cd > /tmp/gztmp$$; then
--  /bin/chmod 700 /tmp/gztmp$$
-+skip=22
-+tmpfile=`mktemp /tmp/gz$$.XXXXXX` || {
-+	echo 'cannot create a temporary file' >&2
-+	exit 1
-+}
-+if tail +$skip $0 | "/bin"/gzip -cd > $tmpfile; then
-+  /bin/chmod 700 $tmpfile
-   prog="`echo $0 | /bin/sed 's|^.*/||'`"
--  if /bin/ln /tmp/gztmp$$ "/tmp/$prog" 2>/dev/null; then
--    trap '/bin/rm -f /tmp/gztmp$$ "/tmp/$prog"; exit $res' 0
--    (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$ "/tmp/$prog") 2>/dev/null &
-+  if /bin/ln $tmpfile "/tmp/$prog" 2>/dev/null; then
-+    trap '/bin/rm -f $tmpfile "/tmp/$prog"; exit $res' 0
-+    (/bin/sleep 5; /bin/rm -f $tmpfile "/tmp/$prog") 2>/dev/null &
-     /tmp/"$prog" ${1+"$@"}; res=$?
-   else
--    trap '/bin/rm -f /tmp/gztmp$$; exit $res' 0
--    (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$) 2>/dev/null &
--    /tmp/gztmp$$ ${1+"$@"}; res=$?
-+    trap '/bin/rm -f $tmpfile; exit $res' 0
-+    (/bin/sleep 5; /bin/rm -f $tmpfile) 2>/dev/null &
-+    $tmpfile ${1+"$@"}; res=$?
-   fi
- else
-   echo Cannot decompress $0; exit 1
-@@ -116,7 +120,7 @@
- 
-   else
-     # decompression
--    skip=18
-+    skip=22
-     if sed -e 1d -e 2q "$i" | grep "^skip=[0-9]*$" >/dev/null; then
-       eval `sed -e 1d -e 2q "$i"`
-     fi

Added: tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-zforce.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-zforce.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4-zforce.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -0,0 +1,11 @@
+--- gzip-1.2.4/zforce.in.sopwith	Thu Feb  3 18:06:30 2000
++++ gzip-1.2.4/zforce.in	Thu Feb  3 18:07:37 2000
+@@ -25,7 +25,7 @@
+   test `expr "$i" : '.*[.-]gz$'` -eq 0 || continue
+   test `expr "$i" : '.*[.]t[ag]z$'` -eq 0 || continue
+ 
+-  if gzip -l < "$i" 2>/dev/null | grep '^defl' > /dev/null; then
++  if gzip -l < "$i" 2>/dev/null | grep '^compressed' > /dev/null; then
+ 
+     if test `expr "$i" : '^............'` -eq 12; then
+       new=`expr "$i" : '\(.*\)...$`.gz

Added: tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4a-dirinfo.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4a-dirinfo.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4a-dirinfo.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -0,0 +1,16 @@
+--- gzip-1.2.4a/gzip.texi.dirinfo	Tue Feb  8 20:17:42 2000
++++ gzip-1.2.4a/gzip.texi	Tue Feb  8 20:19:13 2000
+@@ -7,6 +7,13 @@
+ @c %**end of header
+ 
+ @ifinfo
++
++ at format
++START-INFO-DIR-ENTRY
++* gzip: (gzip).                 The GNU compression utility.
++END-INFO-DIR-ENTRY
++ at end format
++
+ This file documents the the GNU @code{gzip} command for compressing files.
+ 
+ Copyright (C) 1992-1993 Jean-loup Gailly

Deleted: tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4a.tar.gz
===================================================================
(Binary files differ)

Deleted: tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4b.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4b.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.2.4b.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -1,17 +0,0 @@
---- gzip-1.2.4/gzip.c	Thu Aug 19 15:39:43 1993
-+++ gzip-1.2.4b/gzip.c	Tue Jan  8 21:44:18 2002
-@@ -1005,7 +1005,14 @@
- #ifdef NO_MULTIPLE_DOTS
-     char *dot; /* pointer to ifname extension, or NULL */
- #endif
-+    int max_suffix_len = (z_len > 3 ? z_len : 3);
- 
-+    /* Leave enough room in ifname or ofname for suffix: */
-+    if (strlen(iname) >= sizeof(ifname) - max_suffix_len) {
-+        strncpy(ifname, iname, sizeof(ifname) - 1);
-+	/* last byte of ifname is already zero and never overwritten */
-+        error("file name too long");
-+    }
-     strcpy(ifname, iname);
- 
-     /* If input file exists, return OK. */

Added: tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-openbsd-owl-tmp.diff
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-openbsd-owl-tmp.diff	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-openbsd-owl-tmp.diff	2004-11-26 13:46:33 UTC (rev 5129)
@@ -0,0 +1,158 @@
+diff -ur gzip-1.3.orig/gzexe.in gzip-1.3/gzexe.in
+--- gzip-1.3.orig/gzexe.in	Fri Sep 18 04:43:06 1998
++++ gzip-1.3/gzexe.in	Fri Sep 28 04:35:48 2001
+@@ -13,7 +13,7 @@
+ # The : is required for some old versions of csh.
+ # On Ultrix, /bin/sh is too buggy, change the first line to: #!/bin/sh5
+ 
+-x=`basename $0`
++x=`basename "$0"`
+ if test $# = 0; then
+   echo compress executables. original file foo is renamed to foo~
+   echo usage: ${x} [-d] files...
+@@ -21,8 +21,9 @@
+   exit 1
+ fi
+ 
+-tmp=gz$$
+-trap "rm -f $tmp; exit 1" 1 2 3 5 10 13 15
++tmp=`/bin/mktemp ${TMPDIR:-/tmp}/gzexe.XXXXXXXXXX` || exit 1
++trap "rm -f $tmp; exit 1" HUP INT QUIT PIPE TERM
++trap "rm -f $tmp; exit 0" EXIT
+ 
+ decomp=0
+ res=0
+@@ -32,12 +33,10 @@
+   shift
+ fi
+ 
+-echo hi > zfoo1$$
+-echo hi > zfoo2$$
+-if test -z "`(${CPMOD-cpmod} zfoo1$$ zfoo2$$) 2>&1`"; then
+-  cpmod=${CPMOD-cpmod}
++cpmod=
++if type ${CPMOD:-cpmod} 2>/dev/null; then
++  cpmod=${CPMOD:-cpmod}
+ fi
+-rm -f zfoo[12]$$
+ 
+ tail=""
+ IFS="${IFS= 	}"; saveifs="$IFS"; IFS="${IFS}:"
+@@ -75,7 +74,7 @@
+     continue
+   fi
+   case "`basename $i`" in
+-  gzip | tail | chmod | ln | sleep | rm)
++  bash | chmod | gzip | ln | mktemp | rm | sed | sh | tail)
+ 	echo "${x}: $i would depend on itself"; continue ;;
+   esac
+   if test -z "$cpmod"; then
+@@ -88,27 +87,19 @@
+     fi
+   fi
+   if test $decomp -eq 0; then
+-    sed 1q $0 > $tmp
++    sed 1q "$0" > $tmp
+     sed "s|^if tail|if $tail|" >> $tmp <<'EOF'
+-skip=22
+-set -C
+-umask=`umask`
+-umask 77
+-if tail +$skip $0 | "BINDIR"/gzip -cd > /tmp/gztmp$$; then
+-  umask $umask
+-  /bin/chmod 700 /tmp/gztmp$$
+-  prog="`echo $0 | /bin/sed 's|^.*/||'`"
+-  if /bin/ln /tmp/gztmp$$ "/tmp/$prog" 2>/dev/null; then
+-    trap '/bin/rm -f /tmp/gztmp$$ "/tmp/$prog"; exit $res' 0
+-    (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$ "/tmp/$prog") 2>/dev/null &
+-    /tmp/"$prog" ${1+"$@"}; res=$?
+-  else
+-    trap '/bin/rm -f /tmp/gztmp$$; exit $res' 0
+-    (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$) 2>/dev/null &
+-    /tmp/gztmp$$ ${1+"$@"}; res=$?
+-  fi
++skip=14
++tmpdir=`/bin/mktemp -d ${TMPDIR:-/tmp}/gzexe.XXXXXXXXXX` || exit 1
++prog="${tmpdir}/`echo \"$0\" | sed 's|^.*/||'`"
++if tail +$skip "$0" | "BINDIR"/gzip -cd > "$prog"; then
++  /bin/chmod 700 "$prog"
++  trap '/bin/rm -rf $tmpdir; exit $res' EXIT
++  "$prog" ${1+"$@"}; res=$?
+ else
+-  echo Cannot decompress $0; exit 1
++  echo "Cannot decompress $0"
++  /bin/rm -rf $tmpdir
++  exit 1
+ fi; exit $res
+ EOF
+     gzip -cv9 "$i" >> $tmp || {
+diff -ur gzip-1.3.orig/zdiff.in gzip-1.3/zdiff.in
+--- gzip-1.3.orig/zdiff.in	Fri Sep 18 06:27:28 1998
++++ gzip-1.3/zdiff.in	Fri Sep 28 04:04:28 2001
+@@ -46,13 +46,13 @@
+                 case "$2" in
+ 	        *[-.]gz* | *[-.][zZ] | *.t[ga]z)
+ 			F=`echo "$2" | sed 's|.*/||;s|[-.][zZtga]*||'`
+-			set -C
+-			trap 'rm -f /tmp/"$F".$$; exit 2' 1 2 13 15 0
+-			gzip -cdfq "$2" > /tmp/"$F".$$ || exit
+-                        gzip -cdfq "$1" | $comp $OPTIONS - /tmp/"$F".$$
++			TF=`/bin/mktemp ${TMPDIR:-/tmp}/"$F".XXXXXXXXXX` || exit 1
++			trap 'rm -f "$TF"; exit 2' EXIT HUP INT PIPE TERM
++			gzip -cdfq "$2" > "$TF" || exit
++                        gzip -cdfq "$1" | $comp $OPTIONS - "$TF"
+                         STAT="$?"
+-			/bin/rm -f /tmp/"$F".$$ || STAT=2
+-			trap 1 2 13 15 0
++			rm -f "$TF" || STAT=2
++			trap EXIT HUP INT PIPE TERM
+ 			exit $STAT;;
+ 
+                 *)      gzip -cdfq "$1" | $comp $OPTIONS - "$2";;
+diff -ur gzip-1.3.orig/znew.in gzip-1.3/znew.in
+--- gzip-1.3.orig/znew.in	Thu Oct 15 03:37:58 1998
++++ gzip-1.3/znew.in	Fri Sep 28 03:58:18 2001
+@@ -14,29 +14,27 @@
+ # block is the disk block size (best guess, need not be exact)
+ 
+ warn="(does not preserve modes and timestamp)"
+-tmp=/tmp/zfoo.$$
+-set -C
+-echo hi > $tmp.1
+-echo hi > $tmp.2
+-if test -z "`(${CPMOD-cpmod} $tmp.1 $tmp.2) 2>&1`"; then
+-  cpmod=${CPMOD-cpmod}
++cpmod=
++cpmodarg=
++if type ${CPMOD:-cpmod} 2>/dev/null; then
++  cpmod=${CPMOD:-cpmod}
+   warn=""
+ fi
+ 
+-if test -z "$cpmod" && ${TOUCH-touch} -r $tmp.1 $tmp.2 2>/dev/null; then
+-  cpmod="${TOUCH-touch}"
++if test -z "$cpmod"; then
++  cpmod=touch
+   cpmodarg="-r"
+   warn="(does not preserve file modes)"
+ fi
+ 
+-# check if GZIP env. variable uses -S or --suffix
+-gzip -q $tmp.1
+-ext=`echo $tmp.1* | sed "s|$tmp.1||"`
+-rm -f $tmp.[12]*
+-if test -z "$ext"; then
+-  echo znew: error determining gzip extension
+-  exit 1
+-fi
++case "$GZIP" in
++  *-S*) ext=`echo "$GZIP" | sed 's/^.*-S[[:space:]]*\([^[:space:]]*\).*$/\1/'`
++	;;
++  *-suffix*) ext=`echo "$GZIP" | sed 's/^.*--suffix=\([^[:space:]]*\).*$/\1/'`
++	;;
++  *) ext='.gz'
++	;;
++esac
+ if test "$ext" = ".Z"; then
+   echo znew: cannot use .Z as gzip extension.
+   exit 1

Added: tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-rsync.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-rsync.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-rsync.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -0,0 +1,275 @@
+--- gzip-1.3.2/deflate.c.rsync	Fri Oct  8 08:46:28 1999
++++ gzip-1.3.2/deflate.c	Sun Mar 10 12:35:00 2002
+@@ -122,6 +122,14 @@
+ #endif
+ /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+ 
++#ifndef RSYNC_WIN
++#  define RSYNC_WIN 4096
++#endif
++/* Size of rsync window, must be < MAX_DIST */
++
++#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
++/* Whether window sum matches magic value */
++
+ /* ===========================================================================
+  * Local data used by the "longest match" routines.
+  */
+@@ -203,6 +211,8 @@
+ unsigned near good_match;
+ /* Use a faster search when the previous match is longer than this */
+ 
++local ulg rsync_sum;  /* rolling sum of rsync window */
++local ulg rsync_chunk_end; /* next rsync sequence point */
+ 
+ /* Values for max_lazy_match, good_match and max_chain_length, depending on
+  * the desired pack level (0..9). The values given below have been tuned to
+@@ -301,6 +311,10 @@
+ #endif
+     /* prev will be initialized on the fly */
+ 
++    /* rsync params */
++    rsync_chunk_end = 0xFFFFFFFFUL;
++    rsync_sum = 0;
++
+     /* Set the default configuration parameters:
+      */
+     max_lazy_match   = configuration_table[pack_level].max_lazy;
+@@ -537,6 +551,8 @@
+         memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
+         match_start -= WSIZE;
+         strstart    -= WSIZE; /* we now have strstart >= MAX_DIST: */
++	if (rsync_chunk_end != 0xFFFFFFFFUL)
++	    rsync_chunk_end -= WSIZE;
+ 
+         block_start -= (long) WSIZE;
+ 
+@@ -564,13 +580,46 @@
+     }
+ }
+ 
++local void rsync_roll(start, num)
++    unsigned start;
++    unsigned num;
++{
++    unsigned i;
++
++    if (start < RSYNC_WIN) {
++	/* before window fills. */
++	for (i = start; i < RSYNC_WIN; i++) {
++	    if (i == start + num) return;
++	    rsync_sum += (ulg)window[i];
++	}
++	num -= (RSYNC_WIN - start);
++	start = RSYNC_WIN;
++    }
++
++    /* buffer after window full */
++    for (i = start; i < start+num; i++) {
++	/* New character in */
++	rsync_sum += (ulg)window[i];
++	/* Old character out */
++	rsync_sum -= (ulg)window[i - RSYNC_WIN];
++	if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
++	    rsync_chunk_end = i;
++    }
++}
++
++/* ===========================================================================
++ * Set rsync_chunk_end if window sum matches magic value.
++ */
++#define RSYNC_ROLL(s, n) \
++   do { if (rsync) rsync_roll((s), (n)); } while(0)
++
+ /* ===========================================================================
+  * Flush the current block, with given end-of-file flag.
+  * IN assertion: strstart is set to the end of the current match.
+  */
+ #define FLUSH_BLOCK(eof) \
+    flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \
+-                (char*)NULL, (long)strstart - block_start, (eof))
++                (char*)NULL, (long)strstart - block_start, flush-1, (eof))
+ 
+ /* ===========================================================================
+  * Processes a new input file and return its compressed length. This
+@@ -581,7 +630,7 @@
+ local off_t deflate_fast()
+ {
+     IPos hash_head; /* head of the hash chain */
+-    int flush;      /* set if current block must be flushed */
++    int flush;      /* set if current block must be flushed, 2=>and padded  */
+     unsigned match_length = 0;  /* length of best match */
+ 
+     prev_length = MIN_MATCH-1;
+@@ -610,6 +659,7 @@
+ 
+             lookahead -= match_length;
+ 
++	    RSYNC_ROLL(strstart, match_length);
+ 	    /* Insert new strings in the hash table only if the match length
+              * is not too large. This saves time but degrades compression.
+              */
+@@ -638,9 +688,14 @@
+             /* No match, output a literal byte */
+             Tracevv((stderr,"%c",window[strstart]));
+             flush = ct_tally (0, window[strstart]);
++	    RSYNC_ROLL(strstart, 1);
+             lookahead--;
+ 	    strstart++; 
+         }
++	if (rsync && strstart > rsync_chunk_end) {
++	    rsync_chunk_end = 0xFFFFFFFFUL;
++	    flush = 2;
++	} 
+         if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ 
+         /* Make sure that we always have enough lookahead, except
+@@ -713,6 +768,7 @@
+              */
+             lookahead -= prev_length-1;
+             prev_length -= 2;
++	    RSYNC_ROLL(strstart, prev_length+1);
+             do {
+                 strstart++;
+                 INSERT_STRING(strstart, hash_head);
+@@ -725,24 +781,39 @@
+             match_available = 0;
+             match_length = MIN_MATCH-1;
+             strstart++;
+-            if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ 
++	    if (rsync && strstart > rsync_chunk_end) {
++		rsync_chunk_end = 0xFFFFFFFFUL;
++		flush = 2;
++	    }
++            if (flush) FLUSH_BLOCK(0), block_start = strstart;
+         } else if (match_available) {
+             /* If there was no match at the previous position, output a
+              * single literal. If there was a match but the current match
+              * is longer, truncate the previous match to a single literal.
+              */
+             Tracevv((stderr,"%c",window[strstart-1]));
+-            if (ct_tally (0, window[strstart-1])) {
+-                FLUSH_BLOCK(0), block_start = strstart;
+-            }
++	    flush = ct_tally (0, window[strstart-1]);
++	    if (rsync && strstart > rsync_chunk_end) {
++		rsync_chunk_end = 0xFFFFFFFFUL;
++		flush = 2;
++	    }
++            if (flush) FLUSH_BLOCK(0), block_start = strstart;
++	    RSYNC_ROLL(strstart, 1);
+             strstart++;
+             lookahead--;
+         } else {
+             /* There is no previous match to compare with, wait for
+              * the next step to decide.
+              */
++	    if (rsync && strstart > rsync_chunk_end) {
++		/* Reset huffman tree */
++		rsync_chunk_end = 0xFFFFFFFFUL;
++		flush = 2;
++		FLUSH_BLOCK(0), block_start = strstart;
++	    }
+             match_available = 1;
++	    RSYNC_ROLL(strstart, 1);
+             strstart++;
+             lookahead--;
+         }
+--- gzip-1.3.2/gzip.c.rsync	Mon Oct  1 07:28:16 2001
++++ gzip-1.3.2/gzip.c	Sun Mar 10 12:35:00 2002
+@@ -249,6 +249,7 @@
+ unsigned insize;           /* valid bytes in inbuf */
+ unsigned inptr;            /* index of next byte to be processed in inbuf */
+ unsigned outcnt;           /* bytes in output buffer */
++int rsync = 0;             /* make ryncable chunks */
+ 
+ struct option longopts[] =
+ {
+@@ -278,6 +279,7 @@
+     {"best",       0, 0, '9'}, /* compress better */
+     {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
+     {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
++    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */
+     { 0, 0, 0, 0 }
+ };
+ 
+@@ -368,6 +370,7 @@
+  " -Z --lzw         produce output compatible with old compress",
+  " -b --bits maxbits   max number of bits per code (implies -Z)",
+ #endif
++ "    --rsyncable   Make rsync-friendly archive",
+  " file...          files to (de)compress. If none given, use standard input.",
+  "Report bugs to <bug-gzip at gnu.org>.",
+   0};
+@@ -546,6 +549,9 @@
+ #else
+ 	    recursive = 1; break;
+ #endif
++	case 'R':
++	    rsync = 1; break;
++
+ 	case 'S':
+ #ifdef NO_MULTIPLE_DOTS
+             if (*optarg == '.') optarg++;
+--- gzip-1.3.2/gzip.h.rsync	Mon Oct  1 07:24:52 2001
++++ gzip-1.3.2/gzip.h	Sun Mar 10 12:36:12 2002
+@@ -133,6 +133,7 @@
+ extern unsigned insize; /* valid bytes in inbuf */
+ extern unsigned inptr;  /* index of next byte to be processed in inbuf */
+ extern unsigned outcnt; /* bytes in output buffer */
++extern int rsync;  /* deflate into rsyncable chunks */
+ 
+ extern off_t bytes_in;   /* number of input bytes */
+ extern off_t bytes_out;  /* number of output bytes */
+@@ -281,7 +282,7 @@
+         /* in trees.c */
+ void ct_init     OF((ush *attr, int *method));
+ int  ct_tally    OF((int dist, int lc));
+-off_t flush_block OF((char *buf, ulg stored_len, int eof));
++off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof));
+ 
+         /* in bits.c */
+ void     bi_init    OF((file_t zipfile));
+--- gzip-1.3.2/gzip.texi.rsync	Sun Nov  4 08:39:35 2001
++++ gzip-1.3.2/gzip.texi	Sun Mar 10 12:35:00 2002
+@@ -340,6 +340,14 @@
+ into the directory and compress all the files it finds there (or
+ decompress them in the case of @code{gunzip}).
+ 
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on the
++input.  This reduces compression by about 1 percent most cases, but
++means that the @code{rsync} program can take advantage of similarities
++in the uncompressed input when syncronizing two files compressed with
++this flag.  @code{gunzip} cannot tell the difference between a
++compressed file created with this option, and one created without it.
++
+ @item --suffix @var{suf}
+ @itemx -S @var{suf}
+ Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be
+--- gzip-1.3.2/trees.c.rsync	Wed Oct  6 07:00:00 1999
++++ gzip-1.3.2/trees.c	Sun Mar 10 12:37:05 2002
+@@ -847,9 +847,10 @@
+  * trees or store, and output the encoded block to the zip file. This function
+  * returns the total compressed length for the file so far.
+  */
+-off_t flush_block(buf, stored_len, eof)
++off_t flush_block(buf, stored_len, pad, eof)
+     char *buf;        /* input block, or NULL if too old */
+     ulg stored_len;   /* length of input block */
++    int pad;          /* pad output to byte boundary */
+     int eof;          /* true if this is the last block for a file */
+ {
+     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+@@ -941,6 +942,10 @@
+         Assert (input_len == bytes_in, "bad input size");
+         bi_windup();
+         compressed_len += 7;  /* align on byte boundary */
++    } else if (pad && (compressed_len % 8) != 0) {
++        send_bits((STORED_BLOCK<<1)+eof, 3);  /* send block type */
++        compressed_len = (compressed_len + 3 + 7) & ~7L;
++        copy_block(buf, 0, 1); /* with header */
+     }
+ 
+     return compressed_len >> 3;

Added: tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-stderr.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-stderr.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.3-stderr.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -0,0 +1,95 @@
+--- gzip-1.3/gzexe.in.orig	Thu Nov  9 15:08:50 2000
++++ gzip-1.3/gzexe.in	Thu Nov  9 15:09:09 2000
+@@ -15,9 +15,9 @@
+ 
+ x=`basename $0`
+ if test $# = 0; then
+-  echo compress executables. original file foo is renamed to foo~
+-  echo usage: ${x} [-d] files...
+-  echo   "   -d  decompress the executables"
++  echo compress executables. original file foo is renamed to foo~ 1&>2
++  echo usage: ${x} [-d] files... 1>&2
++  echo   "   -d  decompress the executables" 1>&2
+   exit 1
+ fi
+ 
+--- gzip-1.3/zdiff.in.orig	Thu Nov  9 15:08:50 2000
++++ gzip-1.3/zdiff.in	Thu Nov  9 15:09:29 2000
+@@ -32,7 +32,7 @@
+     esac
+ done
+ if test -z "$FILES"; then
+-	echo "Usage: $prog [${comp}_options] file [file]"
++	echo "Usage: $prog [${comp}_options] file [file]" 1>&2
+ 	exit 2
+ fi
+ set $FILES
+@@ -64,6 +64,6 @@
+                 esac;;
+ 	esac
+ else
+-	echo "Usage: $prog [${comp}_options] file [file]"
++	echo "Usage: $prog [${comp}_options] file [file]" 1>&2
+ 	exit 2
+ fi
+--- gzip-1.3/zforce.in.orig	Thu Nov  9 15:08:50 2000
++++ gzip-1.3/zforce.in	Thu Nov  9 15:09:47 2000
+@@ -9,8 +9,8 @@
+ PATH="BINDIR:$PATH"; export PATH
+ x=`basename $0`
+ if test $# = 0; then
+-  echo "force a '.gz' extension on all gzip files"
+-  echo usage: $x files...
++  echo "force a '.gz' extension on all gzip files" 1>&2
++  echo usage: $x files... 1>&2
+   exit 1
+ fi
+ 
+--- gzip-1.3/zgrep.in.orig	Thu Nov  9 15:08:50 2000
++++ gzip-1.3/zgrep.in	Thu Nov  9 15:12:21 2000
+@@ -31,8 +31,8 @@
+ done
+ 
+ if test -z "$pat"; then
+-  echo "grep through gzip files"
+-  echo "usage: $prog [grep_options] pattern [files]"
++  echo "grep through gzip files" 1>&2
++  echo "usage: $prog [grep_options] pattern [files]" 1>&2
+   exit 1
+ fi
+ 
+--- gzip-1.3/zmore.in.orig	Thu Nov  9 15:08:50 2000
++++ gzip-1.3/zmore.in	Thu Nov  9 15:13:49 2000
+@@ -23,7 +23,8 @@
+ 
+ if test $# = 0; then
+     if test -t 0; then
+-	echo usage: zmore files...
++	echo usage: zmore files... 1>&2
++	exit 1
+     else
+ 	gzip -cdfq | eval ${PAGER-more}
+     fi
+--- gzip-1.3/znew.in.orig	Thu Nov  9 15:08:50 2000
++++ gzip-1.3/znew.in	Thu Nov  9 15:14:20 2000
+@@ -51,13 +51,13 @@
+ done
+ 
+ if test $# -eq 0; then
+-  echo "recompress .Z files into $ext (gzip) files"
+-  echo usage: `echo $0 | sed 's,^.*/,,'` "[-tv9KP]" file.Z...
+-  echo "  -t tests the new files before deleting originals"
+-  echo "  -v be verbose"
+-  echo "  -9 use the slowest compression method (optimal compression)"
+-  echo "  -K keep a .Z file when it is smaller than the $ext file"
+-  echo "  -P use pipes for the conversion $warn"
++  echo "recompress .Z files into $ext (gzip) files" 1>&2
++  echo usage: `echo $0 | sed 's,^.*/,,'` "[-tv9KP]" file.Z... 1>&2
++  echo "  -t tests the new files before deleting originals" 1>&2
++  echo "  -v be verbose" 1>&2
++  echo "  -9 use the slowest compression method (optimal compression)" 1>&2
++  echo "  -K keep a .Z file when it is smaller than the $ext file" 1>&2
++  echo "  -P use pipes for the conversion $warn" 1>&2
+   exit 1
+ fi
+ 

Added: tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.1-zgreppipe.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.1-zgreppipe.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.1-zgreppipe.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -0,0 +1,19 @@
+--- gzip-1.3.1/zgrep.in
++++ gzip-1.3.1/zgrep.in
+@@ -92,6 +92,7 @@
+ fi
+ 
+ res=0
++trap break SIGPIPE
+ for i do
+   gzip -cdfq "$i" |
+     if test $files_with_matches -eq 1; then
+@@ -110,5 +111,8 @@
+     fi
+   r=$?
+   test $res -lt $r && res=$r
++  # SIGPIPE + 128
++  test "$r" -eq 141 && exit $res
+ done
++trap - SIGPIPE
+ exit $res

Added: tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.3-window-size.patch
===================================================================
--- tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.3-window-size.patch	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.3-window-size.patch	2004-11-26 13:46:33 UTC (rev 5129)
@@ -0,0 +1,11 @@
+--- gzip-1.3.3/gzip.c.orig	Thu Jan 30 21:19:36 2003
++++ gzip-1.3.3/gzip.c	Thu Jan 30 21:09:52 2003
+@@ -198,7 +198,7 @@
+ DECLARE(uch, inbuf,  INBUFSIZ +INBUF_EXTRA);
+ DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA);
+ DECLARE(ush, d_buf,  DIST_BUFSIZE);
+-DECLARE(uch, window, 2L*WSIZE);
++DECLARE(uch, window, 2L*WSIZE + 4096);
+ #ifndef MAXSEG_64K
+     DECLARE(ush, tab_prefix, 1L<<BITS);
+ #else

Added: tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.3.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/gzip/current/sources/gzip-1.3.3.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/gzip/current/specs/gzip.spec
===================================================================
--- tinysofa/releases/1.1/gzip/current/specs/gzip.spec	2004-11-25 19:42:06 UTC (rev 5128)
+++ tinysofa/releases/1.1/gzip/current/specs/gzip.spec	2004-11-26 13:46:33 UTC (rev 5129)
@@ -1,136 +1,216 @@
 Summary: The GNU data compression program.
 Name: gzip
-Version: 1.2.4a
-Release: 31ts
+Version: 1.3.3
+Release: 1jh
 License: GPL
 Group: main
-Source: ftp://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
-Patch: gzip-1.2.4-basename.patch
-Patch1: gzip-1.2.4-gzexe.patch
-Patch2: gzip-1.2.4-mktemp.patch
-Patch3: gzip-1.2.4b.patch
-Requires: mktemp
-BuildRequires: texinfo
-BuildRoot: %{_tmppath}/%{name}-root
+Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
+Patch0: gzip-1.3-openbsd-owl-tmp.diff
+Patch1: gzip-1.2.4-zforce.patch
+Patch2: gzip-1.2.4a-dirinfo.patch
+Patch3: gzip-1.3-stderr.patch
+Patch4: gzip-1.3.1-zgreppipe.patch
+Patch5: gzip-1.3-rsync.patch
+Patch6: gzip-1.3.3-window-size.patch
+URL: http://www.gzip.org/
+Requires: mktemp less
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 The gzip package contains the popular GNU gzip data compression
-program.  Gzipped files have a .gz extension.  
+program. Gzipped files have a .gz extension.
 
-Gzip should be installed on your tinysofa system, because it is a
+Gzip should be installed on your system, because it is a
 very commonly used data compression program.
 
+
 %prep
 %setup -q
-%patch -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1
+%patch1 -p1 
+#patch2 -p1 
 %patch3 -p1
+%patch4 -p1 -b .nixi
+%patch5 -p1 -b .rsync
+%patch6 -p1 -b .window-size
 
-%package doc
-Summary: html formatted Info-files for Gzip
-Group: documentation
-Requires: gzip
-Prereq: htmlinfo
 
-%description doc
-This package contains the documentation files for Gzip
-
 %build
-./configure --prefix=/usr
-make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s
-makeinfo --html --no-split %{name}.texi
+export DEFS="-DNO_ASM"
+export CPPFLAGS="-DHAVE_LSTAT"
+%configure  --bindir=/bin
 
+%make 
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p $RPM_BUILD_ROOT/{bin,usr/share/{man,html/%{name}}}
-make install prefix=$RPM_BUILD_ROOT/usr \
-    infodir=$RPM_BUILD_ROOT/usr/share/info \
-    mandir=$RPM_BUILD_ROOT/usr/share/man/man1
-strip $RPM_BUILD_ROOT/usr/bin/gzip
-cp %{name}.html $RPM_BUILD_ROOT/usr/share/html/%{name}/
-mv -f $RPM_BUILD_ROOT/usr/bin/gzip $RPM_BUILD_ROOT/bin/gzip
-rm -f $RPM_BUILD_ROOT/usr/bin/gunzip $RPM_BUILD_ROOT/usr/bin/zcat
-ln -f $RPM_BUILD_ROOT/bin/gzip $RPM_BUILD_ROOT/bin/gunzip
-ln -f $RPM_BUILD_ROOT/bin/gzip $RPM_BUILD_ROOT/bin/zcat
-ln -sf ../../bin/gzip $RPM_BUILD_ROOT/usr/bin/gzip
-ln -sf ../../bin/gunzip $RPM_BUILD_ROOT/usr/bin/gunzip
+%makeinstall  bindir=${RPM_BUILD_ROOT}/bin
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+ln -sf ../../bin/gzip ${RPM_BUILD_ROOT}%{_bindir}/gzip
+ln -sf ../../bin/gunzip ${RPM_BUILD_ROOT}%{_bindir}/gunzip
 
-for i in zcmp zdiff zforce zgrep zmore znew ; do
-	sed -e "s|$RPM_BUILD_ROOT||g" < $RPM_BUILD_ROOT/usr/bin/$i > $RPM_BUILD_ROOT/usr/bin/.$i
-	rm -f $RPM_BUILD_ROOT/usr/bin/$i
-	mv $RPM_BUILD_ROOT/usr/bin/.$i $RPM_BUILD_ROOT/usr/bin/$i
-	chmod 755 $RPM_BUILD_ROOT/usr/bin/$i
+for i in  zcmp zegrep zforce zless znew gzexe zdiff zfgrep zgrep zmore ; do
+    mv ${RPM_BUILD_ROOT}/bin/$i ${RPM_BUILD_ROOT}%{_bindir}/$i
 done
 
-cat > $RPM_BUILD_ROOT/usr/bin/zless <<EOF
+
+cat > ${RPM_BUILD_ROOT}%{_bindir}/zless <<EOF
 #!/bin/sh
 /bin/zcat "\$@" | /usr/bin/less
 EOF
-chmod 755 $RPM_BUILD_ROOT/usr/bin/zless
+chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/zless
 
-rm -rf $RPM_BUILD_ROOT/usr/share/info
+%nuke_info
 
-%post doc
-/usr/sbin/htmlinfo_update.sh
 
-%postun doc
-/usr/sbin/htmlinfo_update.sh
-
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
 
 %files
 %defattr(-,root,root)
 /bin/*
-/usr/bin/*
+%{_bindir}/*
+%{_mandir}/*/*
 
-%files doc
-%defattr(-,root,root)
-%doc NEWS README
-/usr/share/html/%{name}/*
-/usr/share/man/*/*
 
 %changelog
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.2.4a-31ts
-- current (1.2.4a-31jh) integrated as 1.2.4a-31ts for release 1.1
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.2.4a-30ts
-- current (1.2.4a-29ts) integrated as 1.2.4a-30ts for release 1.0-U1
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Dec  1 2003 Erlend Midttun <erlendbm at trustix dot org> 1.2.4a-26tr
-- Big rebuild
+* Tue Oct 28 2003 Jeff Johnson <jbj at redhat.com> 1.3.3-11
+- rebuilt.
 
-* Mon Oct 20 2003 Michael Scheffler <duke at tawie dot org> 1.2.4a-25ms
-- Added 64bit file support
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Jun 23 2003 Erlend Midttun <erlendbm at trustix dot com> 1.2.4a-24tr
-- Added %defattr.
+* Fri Jan 31 2003 Jeff Johnson <jbj at redhat.com> 1.3.3-9
+- enlarge window buffer to avoid accessing beyond end-of-buffer (#78413,#83095).
+- re-enable rsync ready patch.
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 1.2.4a-23tr
-- Big rebuild
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Tue Mar 25 2003 Erlend Midttun <erlendbm at trustix dot com> 1.2.4a-22em
-- Fix typo.
+* Fri Nov 22 2002 Jeff Johnson <jbj at redhat.com> 1.3.3-7
+- workaround mis-compilation with gcc-3.2-4 on alpha for now (#78413).
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 1.2.4a-21em
-- Rebuilt against glibc 2.3.2.
+* Mon Nov 18 2002 Tim Powers <timp at redhat.com>
+- rebuild on all arches
+- remove file from buildroot we aren't shipping
 
-* Thu Oct 24 2002 Christian H. Toldnes <christht at trustix dot com> 1.2.4a-20ct
-- Replaced info stuff with htmlinfo
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
 
-* Wed Jul 24 2002 Daniel Meyer <eagle at trustix dot org> 1.2.4a-19dm
-- rebuild for Trustix Secure Linux 2.0
+* Fri Jun 21 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.3.3-4
+- Fix the reading of unitialized memory problem (#66913)
 
-* Tue Jan 15 2002 Hans Alm?sbakk <hansa at trustix dot com>
-- Applied patch that fixes a potential buffer overflow on too long input 
-  filename.
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
 
-* Mon Feb 28 2000 Lars Gaarden <larsg at trustix dot com>
-- put the documentation in a separate package
+* Thu Apr 25 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.3.3-2
+- Rebuild
 
+* Wed Mar 13 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.3.3-1
+- 1.3.3
+
+* Sun Mar 10 2002 Florian La Roche <Florian.LaRoche at redhat.de>
+- add rsyncable patch #58888
+
+* Thu Feb 21 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.3.2-3
+- Rebuild
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon Nov 19 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.3.2-1
+- 1.3.2: no need for autoconf 2.5x hacks anymore
+
+* Sat Nov 17 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 1.3.1:
+	- disable patch2
+
+* Fri Oct 26 2001 Trond Eivind Glomsr?d <teg at redhat.com> 1.3.0-16
+- replace tempfile patches with improved ones solar at openwall.com
+- Add less to the dependency chain - zless needs it
+
+* Thu Aug 23 2001 Trond Eivind Glomsr?d <teg at redhat.com> 1.3.0-15
+- Fix typo in comment in zgrep (#52465) 
+- Copyright -> License
+
+* Tue Jun  5 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- Patch various uses of $$ in the bundled scripts
+
+* Mon Jun  4 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- Fix the SIGPIPE patch to avoid blank lines (#43319)
+
+* Thu Feb 08 2001 Philipp Knirsch <pknirsch at redhat.de>
+- Fixed buzilla bug #26680. Wrong skip value after mktemp patch and forced
+  overwrite for output file during decompression.
+
+* Tue Jan 30 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- trap SIGPIPE in zgrep, so "zgrep | less" gets a happy ending
+  (#24104)
+
+* Sun Dec 10 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- add HAVE_LSTAT define, to avoid it doing weird things to symlinks
+  instead of ignoring them as the docs say it should (#22045)
+
+* Fri Dec 01 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- rebuild
+
+* Thu Nov 09 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- patch all scripts so usage error messages are written to 
+  stderr (#20597)
+
+* Mon Oct 30 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- disable assembly, as it is faster without it (bug #19910)
+
+* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Tue Jun 27 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- rebuild
+
+* Wed Jun 07 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- Use %%{_mandir}, %%{_infodir},  %%configure, %%makeinstall
+  and %%{_tmppath}
+
+* Fri May 12 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- Add root as default owner of the files, permits building 
+  as non-root user
+
+* Wed May 10 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- Build system handles stripping
+- Don't do thing the system does, like creating directories
+- use --bindir /bin
+- Added URL
+- skip unnecesarry sed step
+- Include THANKS, AUTHORS, ChangeLog, TODO
+
+* Mon Mar 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 1.3
+- handle RPM_OPT_FLAGS
+
+* Tue Feb 15 2000 Cristian Gafton <gafton at redhat.com>
+- handle compressed man pages even better
+
+* Tue Feb 08 2000 Cristian Gafton <gafton at redhat.com>
+- adopt patch from Paul Eggert to fix detection of the improper tables in
+  inflate.c(huft_build)
+- the latest released version 1.2.4a, which provides documentation updates
+  only. But it lets us use small revision numbers again
+- add an dirinfo entry for gzip.info so we can get rid of the ugly --entry
+  args to install-info
+
+* Mon Feb  7 2000 Bill Nottingham <notting at redhat.com>
+- handle compressed manpages
+
+* Thu Feb 03 2000 Elliot Lee <sopwith at redhat.com>
+- Fix bug #7970
+
 * Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
 - auto rebuild in the new build environment (release 14)
 
@@ -157,3 +237,4 @@
 
 * Tue Apr 22 1997 Marc Ewing <marc at redhat.com>
 - (Entry added for Marc by Erik) fixed gzexe to use /bin/gzip
+


From svn at tinysofa.org  Fri Nov 26 13:57:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 26 Nov 2004 08:57:55 -0500 (EST)
Subject: [tinysofa-svn] r5130 - tinysofa/releases/1.1/bzip2/current/specs
Message-ID: <20041126135755.5A9E034410E@minbar.tinysofa.org>

Author: jh
Date: 2004-11-26 08:57:54 -0500 (Fri, 26 Nov 2004)
New Revision: 5130

Modified:
   tinysofa/releases/1.1/bzip2/current/specs/bzip2.spec
Log:
- minor cleanup


Modified: tinysofa/releases/1.1/bzip2/current/specs/bzip2.spec
===================================================================
--- tinysofa/releases/1.1/bzip2/current/specs/bzip2.spec	2004-11-26 13:46:33 UTC (rev 5129)
+++ tinysofa/releases/1.1/bzip2/current/specs/bzip2.spec	2004-11-26 13:57:54 UTC (rev 5130)
@@ -27,7 +27,6 @@
 Requires: bzip2 = %{version}, bzip2-libs = %{version}-%{release}
 
 %description devel
-
 Header files and a static library of bzip2 functions, for developing apps
 which will use the library.
 
@@ -36,7 +35,6 @@
 Group: main
 
 %description libs
-
 Libraries for applications using the bzip2 compression format.
 
 
@@ -89,7 +87,7 @@
 
 %files
 %defattr(-,root,root)
-%doc LICENSE CHANGES README README.COMPILATION.PROBLEMS Y2K_INFO
+%doc CHANGES README
 %{_bindir}/*
 %{_mandir}/*/*
 


From svn at tinysofa.org  Sun Nov 28 10:10:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 28 Nov 2004 05:10:09 -0500 (EST)
Subject: [tinysofa-svn] 
	r5131 - in contrib/1.1/dnsmasq/current: sources specs
Message-ID: <20041128101009.79D14344117@minbar.tinysofa.org>

Author: gda
Date: 2004-11-28 05:10:08 -0500 (Sun, 28 Nov 2004)
New Revision: 5131

Added:
   contrib/1.1/dnsmasq/current/sources/dnsmasq-2.18.tar.gz
Removed:
   contrib/1.1/dnsmasq/current/sources/dnsmasq-2.15.tar.gz
Modified:
   contrib/1.1/dnsmasq/current/specs/dnsmasq.spec
Log:
new upstream

Deleted: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.15.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.18.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.18.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/dnsmasq/current/specs/dnsmasq.spec
===================================================================
--- contrib/1.1/dnsmasq/current/specs/dnsmasq.spec	2004-11-26 13:57:54 UTC (rev 5130)
+++ contrib/1.1/dnsmasq/current/specs/dnsmasq.spec	2004-11-28 10:10:08 UTC (rev 5131)
@@ -1,6 +1,6 @@
 Summary:  A lightweight caching nameserver
 Name:     dnsmasq
-Version:  2.15
+Version:  2.18
 Release:  1gd
 Group:    Network/Services
 Source:   http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Sun Nov 28 2004 Gerald Dachs <gda at tinysofa dot org> 2.18-1gd
+- new upstream version
+
 * Wed Sep 29 2004 Gerald Dachs <gda at tinysofa dot org> 2.15-1gd
 - new upstream version
 


From svn at tinysofa.org  Sun Nov 28 10:23:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 28 Nov 2004 05:23:31 -0500 (EST)
Subject: [tinysofa-svn] 
	r5132 - in contrib/1.1/sqlite3/current: sources specs
Message-ID: <20041128102331.F0BA4344119@minbar.tinysofa.org>

Author: gda
Date: 2004-11-28 05:23:31 -0500 (Sun, 28 Nov 2004)
New Revision: 5132

Added:
   contrib/1.1/sqlite3/current/sources/sqlite-3.0.8.tar.gz
Removed:
   contrib/1.1/sqlite3/current/sources/sqlite-3.0.7.tar.gz
Modified:
   contrib/1.1/sqlite3/current/specs/sqlite3.spec
Log:
new upstream

Deleted: contrib/1.1/sqlite3/current/sources/sqlite-3.0.7.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/sqlite3/current/sources/sqlite-3.0.8.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/sqlite3/current/sources/sqlite-3.0.8.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/sqlite3/current/specs/sqlite3.spec
===================================================================
--- contrib/1.1/sqlite3/current/specs/sqlite3.spec	2004-11-28 10:10:08 UTC (rev 5131)
+++ contrib/1.1/sqlite3/current/specs/sqlite3.spec	2004-11-28 10:23:31 UTC (rev 5132)
@@ -1,6 +1,6 @@
 Summary: SQLite is a C library that implements an embeddable SQL database engine
 Name: sqlite3
-Version: 3.0.7
+Version: 3.0.8
 Release: 1gd
 License: GPL
 Group: contrib
@@ -58,5 +58,8 @@
 %doc README doc/*
 
 %changelog
+* Sun Nov 28 2004 Gerald Dachs <gda at tinysofa dot org> 3.0.8-1gd
+- new upstream version
+
 * Wed Oct  6 2004 Gerald Dachs <gda at tinysofa dot org> 3.0.7-1gd
 - new major version


From svn at tinysofa.org  Sun Nov 28 14:04:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 28 Nov 2004 09:04:21 -0500 (EST)
Subject: [tinysofa-svn] 
	r5133 - in contrib/1.1/abiword/current: sources specs
Message-ID: <20041128140421.CB4B7344117@minbar.tinysofa.org>

Author: gda
Date: 2004-11-28 09:04:21 -0500 (Sun, 28 Nov 2004)
New Revision: 5133

Added:
   contrib/1.1/abiword/current/sources/abiword-2.0.14.tar.bz2
Removed:
   contrib/1.1/abiword/current/sources/abiword-2.0.12.tar.bz2
Modified:
   contrib/1.1/abiword/current/specs/abiword.spec
Log:
new upstream

Deleted: contrib/1.1/abiword/current/sources/abiword-2.0.12.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/1.1/abiword/current/sources/abiword-2.0.14.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/abiword/current/sources/abiword-2.0.14.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/abiword/current/specs/abiword.spec
===================================================================
--- contrib/1.1/abiword/current/specs/abiword.spec	2004-11-28 10:23:31 UTC (rev 5132)
+++ contrib/1.1/abiword/current/specs/abiword.spec	2004-11-28 14:04:21 UTC (rev 5133)
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.0.12
-Release: 3gd
+Version: 2.0.14
+Release: 1gd
 Group: contrib
 License: GPL
 Source: http://prdownloads.sourceforge.net/abiword/abiword-%{version}.tar.bz2
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sun Nov 28 2004 Gerald Dachs <gda at tinysofa dot org> 2.0.14-1gd
+- new upstream version
+
 * Fri Oct 15 2004 Gerald Dachs <gda at tinysofa dot org> 2.0.12-3gd
 - new in tinysofa contrib
 


From svn at tinysofa.org  Sun Nov 28 18:22:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 28 Nov 2004 13:22:21 -0500 (EST)
Subject: [tinysofa-svn] 
	r5135 - in tinysofa/releases/1.1/flex/current: sources specs
Message-ID: <20041128182221.A08EB344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-28 13:22:21 -0500 (Sun, 28 Nov 2004)
New Revision: 5135

Added:
   tinysofa/releases/1.1/flex/current/sources/flex-2.5.4a2.patch
Modified:
   tinysofa/releases/1.1/flex/current/specs/flex.spec
Log:
- add flex-2.5.4a2.patch
- new spec file which fixes multilib problems


Added: tinysofa/releases/1.1/flex/current/sources/flex-2.5.4a2.patch
===================================================================
--- tinysofa/releases/1.1/flex/current/sources/flex-2.5.4a2.patch	2004-11-28 18:18:42 UTC (rev 5134)
+++ tinysofa/releases/1.1/flex/current/sources/flex-2.5.4a2.patch	2004-11-28 18:22:21 UTC (rev 5135)
@@ -0,0 +1,103 @@
+diff -r -c4 flex-2.5.4/flex.skl flex-2.5.4P/flex.skl
+*** flex-2.5.4/flex.skl	Wed Sep 11 01:58:54 1996
+--- flex-2.5.4P/flex.skl	Thu Oct 24 19:25:30 2002
+***************
+*** 969,976 ****
+--- 969,977 ----
+  %*
+  
+  
+  %-
++ #ifndef YY_NO_INPUT
+  #ifdef __cplusplus
+  static int yyinput()
+  #else
+  static int input()
+***************
+*** 1044,1052 ****
+  %% update BOL and yylineno
+  
+  	return c;
+  	}
+! 
+  
+  %-
+  #ifdef YY_USE_PROTOS
+  void yyrestart( FILE *input_file )
+--- 1045,1055 ----
+  %% update BOL and yylineno
+  
+  	return c;
+  	}
+! %-
+! #endif /* YY_NO_INPUT */
+! %*
+  
+  %-
+  #ifdef YY_USE_PROTOS
+  void yyrestart( FILE *input_file )
+diff -r -c4 flex-2.5.4/initscan.c flex-2.5.4P/initscan.c
+*** flex-2.5.4/initscan.c	Sun Jul 27 04:32:18 1997
+--- flex-2.5.4P/initscan.c	Tue Oct 15 11:51:22 2002
+***************
+*** 3127,3134 ****
+--- 3127,3135 ----
+  	}
+  #endif	/* ifndef YY_NO_UNPUT */
+  
+  
++ #ifndef YY_NO_INPUT
+  #ifdef __cplusplus
+  static int yyinput()
+  #else
+  static int input()
+***************
+*** 3199,3206 ****
+--- 3200,3208 ----
+  	yy_current_buffer->yy_at_bol = (c == '\n');
+  
+  	return c;
+  	}
++ #endif	/* ifndef YY_NO_INPUT */
+  
+  
+  #ifdef YY_USE_PROTOS
+  void yyrestart( FILE *input_file )
+diff -r -c4 flex-2.5.4/skel.c flex-2.5.4P/skel.c
+*** flex-2.5.4/skel.c	Wed Sep 11 02:00:38 1996
+--- flex-2.5.4P/skel.c	Thu Oct 24 19:25:32 2002
+***************
+*** 974,981 ****
+--- 974,982 ----
+    "%*",
+    "",
+    "",
+    "%-",
++   "#ifndef YY_NO_INPUT",
+    "#ifdef __cplusplus",
+    "static int yyinput()",
+    "#else",
+    "static int input()",
+***************
+*** 1049,1057 ****
+    "%% update BOL and yylineno",
+    "",
+    "	return c;",
+    "	}",
+!   "",
+    "",
+    "%-",
+    "#ifdef YY_USE_PROTOS",
+    "void yyrestart( FILE *input_file )",
+--- 1050,1060 ----
+    "%% update BOL and yylineno",
+    "",
+    "	return c;",
+    "	}",
+!   "%-",
+!   "#endif /* YY_NO_INPUT */",
+!   "%*",
+    "",
+    "%-",
+    "#ifdef YY_USE_PROTOS",
+    "void yyrestart( FILE *input_file )",

Modified: tinysofa/releases/1.1/flex/current/specs/flex.spec
===================================================================
--- tinysofa/releases/1.1/flex/current/specs/flex.spec	2004-11-28 18:18:42 UTC (rev 5134)
+++ tinysofa/releases/1.1/flex/current/specs/flex.spec	2004-11-28 18:22:21 UTC (rev 5135)
@@ -1,17 +1,17 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 21ts
-License: GPL
-Group: extra
+Release: 22jh
+License: BSD
+Group: development
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: ftp://ftp.gnu.org/non-gnu/flex/flex-2.5.4a.tar.gz
 Patch0: flex-2.5.4a-skel.patch
 Patch1: flex-2.5.4-glibc22.patch
 Patch2: flex-2.5.4a-gcc3.patch
 Patch3: flex-2.5.4a-gcc31.patch
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: byacc
+Patch4: flex-2.5.4a2.patch
+BuildRequires: autoconf, byacc
 
 %description
 The flex program generates scanners.  Scanners are programs which can
@@ -27,75 +27,121 @@
 You should install flex if you are going to use your system for
 application development.
 
+
 %prep
-%setup -q -n flex-2.5.4
+%setup -q -n %{name}-2.5.4
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch1 -p1 -b .glibc22
+%patch2 -p1 -b .glib3
+%patch3 -p1 -b .gcc31
+%patch4 -p1 -b .yynoinput
 
+
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s ./configure --prefix=/usr
+autoconf
+%configure
+%make
 
-make
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
+%makeinstall mandir=$RPM_BUILD_ROOT/%{_mandir}/man1
 
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install
-
 ( cd ${RPM_BUILD_ROOT}
-  strip .%{_prefix}/bin/flex
-  ln -sf flex .%{_prefix}/bin/lex
-  mkdir -p ./usr/share/man
-  mv ./usr/man/* ./usr/share/man
-  ln -s flex.1 .%{_prefix}/share/man/man1/lex.1
-  ln -s flex.1 .%{_prefix}/share/man/man1/flex++.1
-  ln -s libfl.a .%{_prefix}/lib/libl.a
+  ln -sf flex .%{_bindir}/lex
+  ln -s flex.1 .%{_mandir}/man1/lex.1
+  ln -s flex.1 .%{_mandir}/man1/flex++.1
+  ln -s libfl.a .%{_libdir}/libl.a
 )
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc COPYING NEWS README
-%{_prefix}/bin/lex
-%{_prefix}/bin/flex
-%{_prefix}/bin/flex++
-%{_prefix}/share/man/man1/*
-%{_prefix}/lib/libl.a
-%{_prefix}/lib/libfl.a
-%{_prefix}/include/FlexLexer.h
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_libdir}/*.a
+%{_includedir}/FlexLexer.h
 
+
 %changelog
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.5.4a-21ts
-- current (2.5.4a-21jh) integrated as 2.5.4a-21ts for release 1.1
+* Tue Aug 24 2004 Warren Togami <wtogami at redhat.com> 2.5.4a-33
+- #116407 BR byacc
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.5.4a-20ts
-- current (2.5.4a-19ts) integrated as 2.5.4a-20ts for release 1.0-U1
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue May 11 2004 Omar Kilani <omar ar tinysofa dot org> 
-- Add BuildRequires byacc.
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Dec  3 2003 Erlend Midttun <erlendbm at trustix dot org> 2.5.4a-16tr
-- Big rebuild
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 2.5.4a-15tr
-- Big rebuild
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 2.5.4a-14em
-- Rebuilt against glibc 2.3.2.
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Fri Sep 13 2002 Roland Kruse <rolandk at trustix dot com> 2.5.4a-13rk
-- Added patches for glibc 2.2 and gcc 3.x (Patch[1-3])
+* Tue Jan  7 2003 Jeff Johnson <jbj at redhat.com> 2.5.4a-28
+- don't include -debuginfo files in package.
 
-* Wed Jul 24 2002 Daniel Meyer <eagle at trustix dot org> 2.5.4a-12dm
-- rebuild for Trustix Secure Linux 2.0
+* Mon Nov  4 2002 Than Ngo <than at redhat.com> 2.5.4a-27
+- YY_NO_INPUT patch from Jean Marie
 
-* Mon Feb 28 2000 Lars Gaarden <larsg at trustix dot com>
-- moved man pages to /usr/share, FHS
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
 
+* Tue Jun 18 2002 Than Ngo <than at redhat.com> 2.5.4a-25
+- don't forcibly strip binaries
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Tue Apr  2 2002 Than Ngo <than at redhat.com> 2.5.4a-23
+- More ISO C++ 98 fixes (#59670)
+
+* Tue Feb 26 2002 Than Ngo <than at redhat.com> 2.5.4a-22
+- rebuild in new enviroment
+
+* Wed Feb 20 2002 Bernhard Rosenkraenzer <bero at redhat.com> 2.5.4a-21
+- More ISO C++ 98 fixes (#59670)
+
+* Tue Feb 19 2002 Bernhard Rosenkraenzer <bero at redhat.com> 2.5.4a-20
+- Fix ISO C++ 98 compliance (#59670)
+
+* Wed Jan 23 2002 Than Ngo <than at redhat.com> 2.5.4a-19
+- fixed #58643
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Tue Nov  6 2001 Than Ngo <than at redhat.com> 2.5.4a-17
+- fixed for working with gcc 3 (bug #55778)
+
+* Sat Oct 13 2001 Than Ngo <than at redhat.com> 2.5.4a-16
+- fix wrong License (bug #54574)
+
+* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
+- Bump release + rebuild.
+
+* Sat Sep 30 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix generation of broken code (conflicting isatty() prototype w/ glibc 2.2)
+  This broke, among other things, the kdelibs 2.0 build
+- Fix source URL
+
+* Thu Sep  7 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging (64bit systems need to use libdir).
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Tue Jun  6 2000 Bill Nottingham <notting at redhat.com>
+- rebuild, FHS stuff.
+
 * Thu Feb  3 2000 Bill Nottingham <notting at redhat.com>
 - handle compressed man pages
 


From svn at tinysofa.org  Sun Nov 28 18:38:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 28 Nov 2004 13:38:55 -0500 (EST)
Subject: [tinysofa-svn] 
	r5136 - in tinysofa/releases/1.1/rpm/current: sources specs
Message-ID: <20041128183855.6A751344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-28 13:38:54 -0500 (Sun, 28 Nov 2004)
New Revision: 5136

Added:
   tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.3.tar.gz
Removed:
   tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2.tar.gz
Modified:
   tinysofa/releases/1.1/rpm/current/specs/rpm.spec
Log:
- update to 4.3.3


Deleted: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.3.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.3.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec
===================================================================
--- tinysofa/releases/1.1/rpm/current/specs/rpm.spec	2004-11-28 18:22:21 UTC (rev 5135)
+++ tinysofa/releases/1.1/rpm/current/specs/rpm.spec	2004-11-28 18:38:54 UTC (rev 5136)
@@ -18,10 +18,10 @@
 
 Summary: The RPM package management system.
 Name: rpm
-%define version 4.3.2
+%define version 4.3.3
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 3ts
+Release: 1jh
 Group: main
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Source1: GROUPS
@@ -318,6 +318,7 @@
 %rpmattr	%{__prefix}/lib/rpm/config.guess
 %rpmattr	%{__prefix}/lib/rpm/config.sub
 %rpmattr	%{__prefix}/lib/rpm/convertrpmrc.sh
+%rpmattr	%{__prefix}/lib/rpm/freshen.sh
 %attr(0644, rpm, rpm)	%{__prefix}/lib/rpm/macros
 %rpmattr	%{__prefix}/lib/rpm/mkinstalldirs
 %rpmattr	%{__prefix}/lib/rpm/rpm.*
@@ -514,6 +515,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Sun Nov 28 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.3.3-1jh
+- 4.3.3
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 4.3.2-3ts
 - current (4.3.2-3jh) integrated as 4.3.2-3ts for release 1.1-U1
 


From svn at tinysofa.org  Sun Nov 28 18:47:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 28 Nov 2004 13:47:12 -0500 (EST)
Subject: [tinysofa-svn] 
	r5137 - in tinysofa/releases/1.1/sysstat/current: sources specs
Message-ID: <20041128184712.EB996344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-28 13:47:12 -0500 (Sun, 28 Nov 2004)
New Revision: 5137

Added:
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-4.0.1-config.patch
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-4.0.7-lib64.patch
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.0-history.patch
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-lib64init.patch
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-overrun.patch
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-statreset.patch
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5.tar.bz2
   tinysofa/releases/1.1/sysstat/current/sources/sysstat.crond
   tinysofa/releases/1.1/sysstat/current/sources/sysstat.crondaily
   tinysofa/releases/1.1/sysstat/current/sources/sysstat.sysconfig
Removed:
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.0-config.patch
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.2.tar.bz2
   tinysofa/releases/1.1/sysstat/current/sources/sysstat.init
Modified:
   tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec
Log:
- 5.0.5 with Fedora patches
- new spec file which fixes (wirh patches) multilib problems


Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat-4.0.1-config.patch
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat-4.0.1-config.patch	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat-4.0.1-config.patch	2004-11-28 18:47:12 UTC (rev 5137)
@@ -0,0 +1,36 @@
+--- sysstat-4.0.1/build/CONFIG.config	Sun Jun 24 10:10:30 2001
++++ sysstat-4.0.1/build/CONFIG	Fri Jun 29 13:04:58 2001
+@@ -2,7 +2,7 @@
+ # (C) 2000 Sebastien GODARD <sebastien.godard at wanadoo.fr>
+ 
+ # Directories
+-PREFIX = /usr/local
++PREFIX = /usr
+ SA_DIR = /var/log/sa
+ CLEAN_SA_DIR = n
+ 
+@@ -16,18 +16,21 @@
+ endif
+ 
+ # Uncomment this to enable workaround for Linux kernel SMP race condition
+-#SAS_DFLAGS += -DSMP_RACE
++SAS_DFLAGS += -DSMP_RACE
+ 
+ # Man page group
+ MAN_GROUP = root
+ 
++IGNORE_MAN_GROUP = y
++
+ # Crontab owner
+ CRON_OWNER = adm
+ 
+ # Run-command directories
+-RC_DIR = /etc/rc.d
+-INIT_DIR = /etc/rc.d/init.d
++RC_DIR = /etc
++INIT_DIR = /etc/init.d
+ INITD_DIR = init.d
+ 
+ INSTALL_CRON = n
++
+ 

Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat-4.0.7-lib64.patch
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat-4.0.7-lib64.patch	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat-4.0.7-lib64.patch	2004-11-28 18:47:12 UTC (rev 5137)
@@ -0,0 +1,34 @@
+--- sysstat-4.0.7/sa.h.lib64	2002-11-11 16:15:11.000000000 +0000
++++ sysstat-4.0.7/sa.h	2003-03-03 14:15:35.000000000 +0000
+@@ -119,7 +119,9 @@
+ #define NET_DEV		"/proc/net/dev"
+ #define NET_SOCKSTAT	"/proc/net/sockstat"
+ #define SADC		"sadc"
++#ifndef SADC_PATH
+ #define SADC_PATH	"/usr/lib/sa/sadc"
++#endif
+ #define SADC_LOCAL_PATH	"/usr/local/lib/sa/sadc"
+ #define LOADAVG		"/proc/loadavg"
+ 
+--- sysstat-4.0.7/sa1.sh.lib64	2001-12-29 16:49:53.000000000 +0000
++++ sysstat-4.0.7/sa1.sh	2003-03-03 14:19:01.000000000 +0000
+@@ -4,7 +4,7 @@
+ #
+ umask 0022
+ DATE=`date +%d`
+-ENDIR=PREFIX/lib/sa
++ENDIR=LIB_DIR/sa
+ DFILE=SA_DIR/sa${DATE}
+ cd ${ENDIR}
+ if [ $# = 0 ]
+--- sysstat-4.0.7/Makefile.lib64	2002-08-23 20:21:44.000000000 +0100
++++ sysstat-4.0.7/Makefile	2003-03-03 14:20:36.000000000 +0000
+@@ -79,7 +79,7 @@
+ 	$(SED) s+ALTLOC+$(PREFIX)+g $< > $@
+ 
+ sa1: sa1.sh
+-	$(SED) -e s+PREFIX+$(PREFIX)+g -e s+SA_DIR+$(SA_DIR)+g $< > $@
++	$(SED) -e s+LIB_DIR+$(LIB_DIR)+g -e s+SA_DIR+$(SA_DIR)+g $< > $@
+ 	$(CHMOD) 755 $@
+ 
+ sa2: sa2.sh

Deleted: tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.0-config.patch
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.0-config.patch	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.0-config.patch	2004-11-28 18:47:12 UTC (rev 5137)
@@ -1,50 +0,0 @@
-diff -Nru sysstat-5.0.0.orig/Makefile sysstat-5.0.0/Makefile
---- sysstat-5.0.0.orig/Makefile	2003-11-03 20:48:04.000000000 +0000
-+++ sysstat-5.0.0/Makefile	2004-01-27 14:50:32.000000000 +0000
-@@ -33,7 +33,7 @@
- NLS_DIR = $(PREFIX)/share/locale
- 
- # Compiler flags
--CFLAGS = -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce
-+CFLAGS = $(RPM_OPT_FLAGS) -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce
- LFLAGS = -L. -lsysstat -s
- SAS_DFLAGS += -DSA_DIR=\"$(SA_DIR)\"
- 
-diff -Nru sysstat-5.0.0.orig/build/CONFIG sysstat-5.0.0/build/CONFIG
---- sysstat-5.0.0.orig/build/CONFIG	2003-11-05 19:45:35.000000000 +0000
-+++ sysstat-5.0.0/build/CONFIG	2004-01-27 14:50:15.000000000 +0000
-@@ -2,10 +2,10 @@
- # (C) 2000 Sebastien GODARD <sebastien.godard at wanadoo.fr>
- 
- # Directories
--PREFIX = /usr/local
-+PREFIX = /usr
- SA_DIR = /var/log/sa
- MAN_DIR = ${PREFIX}/man
--CLEAN_SA_DIR = n
-+CLEAN_SA_DIR = y
- YESTERDAY =
- HISTORY = 7
- 
-@@ -19,7 +19,7 @@
- endif
- 
- # Uncomment this to enable workaround for Linux kernel SMP race condition
--#SAS_DFLAGS += -DSMP_RACE
-+SAS_DFLAGS += -DSMP_RACE
- 
- # Man page group
- MAN_GROUP = root
-@@ -29,8 +29,11 @@
- 
- # Run-command directories
- RC_DIR = /etc/rc.d
--INIT_DIR = /etc/rc.d/init.d
-+INIT_DIR = /etc/init.d
- INITD_DIR = init.d
- 
- INSTALL_CRON = n
- 
-+MAN_DIR = $(PREFIX)/share/man
-+
-+

Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.0-history.patch
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.0-history.patch	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.0-history.patch	2004-11-28 18:47:12 UTC (rev 5137)
@@ -0,0 +1,33 @@
+--- sysstat-5.0.0/sa2.sh.history	2004-01-22 14:55:24.000000000 +0100
++++ sysstat-5.0.0/sa2.sh	2004-01-22 14:56:18.000000000 +0100
+@@ -2,6 +2,11 @@
+ # PREFIX/lib/sa/sa2.sh
+ # (C) 1999-2003 Sebastien Godard <sebastien.godard at wanadoo.fr>
+ #
++# Changes:
++# - 2004-01-22 Nils Philippsen <nphilipp at redhat.com>
++#   make history configurable
++HISTORY=7
++[ -r /etc/sysconfig/sysstat ] && . /etc/sysconfig/sysstat
+ S_TIME_FORMAT=ISO ; export S_TIME_FORMAT
+ umask 0022
+ DATE=`date YESTERDAY +%d`
+@@ -11,5 +16,5 @@
+ [ -f "$DFILE" ] || exit 0
+ cd ${ENDIR}
+ ${ENDIR}/sar $* -f ${DFILE} > ${RPT}
+-find SA_DIR \( -name 'sar??' -o -name 'sa??' \) -mtime +HISTORY -exec rm -f {} \;
++find SA_DIR \( -name 'sar??' -o -name 'sa??' \) -mtime +"$HISTORY" -exec rm -f {} \;
+ 
+--- sysstat-5.0.0/Makefile.history	2004-01-22 14:55:29.000000000 +0100
++++ sysstat-5.0.0/Makefile	2004-01-22 14:55:54.000000000 +0100
+@@ -87,8 +87,7 @@
+ 
+ sa2: sa2.sh
+ 	$(SED) -e s+BIN_DIR+$(BIN_DIR)+g -e s+SA_DIR+$(SA_DIR)+g \
+-		-e s+PREFIX+$(PREFIX)+g -e s+YESTERDAY+$(YESTERDAY)+g \
+-		-e s+HISTORY+$(HISTORY)+g $< > $@
++		-e s+PREFIX+$(PREFIX)+g -e s+YESTERDAY+$(YESTERDAY)+g $< > $@
+ 	$(CHMOD) 755 $@
+ 
+ sysstat: sysstat.sh

Deleted: tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.2.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-lib64init.patch
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-lib64init.patch	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-lib64init.patch	2004-11-28 18:47:12 UTC (rev 5137)
@@ -0,0 +1,11 @@
+--- sysstat-5.0.5/sysstat.sh.lib64init	2004-06-30 16:09:56.228959786 +0200
++++ sysstat-5.0.5/sysstat.sh	2004-06-30 16:10:49.406463840 +0200
+@@ -28,7 +28,7 @@
+   start)
+         if [ ! -f /var/lock/subsys/sysstat ]; then
+             echo -n "Calling the system activity data collector (sadc): "
+-            PREFIX/lib/sa/sadc -F -L - QUOTE && touch /var/lock/subsys/sysstat
++            PREFIX/lib64/sa/sadc -F -L - QUOTE && touch /var/lock/subsys/sysstat
+ 			RETVAL=$?
+             echo
+ 		fi

Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-overrun.patch
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-overrun.patch	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-overrun.patch	2004-11-28 18:47:12 UTC (rev 5137)
@@ -0,0 +1,31 @@
+--- sysstat-5.0.5/iostat.c.overrun	2004-05-26 21:18:25.000000000 +0200
++++ sysstat-5.0.5/iostat.c	2004-06-30 15:56:20.491203712 +0200
+@@ -343,7 +343,7 @@
+    FILE *statfp;
+    char line[8192];
+    int pos, i;
+-   unsigned long v_tmp[3];
++   unsigned long v_tmp[4];
+    unsigned int v_major, v_index;
+    struct io_stats *st_iodev_tmp[4], *st_iodev_i;
+    struct io_hdr_stats *st_hdr_iodev_i;
+--- sysstat-5.0.5/sadc.c.overrun	2004-05-20 12:00:12.000000000 +0200
++++ sysstat-5.0.5/sadc.c	2004-06-30 15:55:12.784048268 +0200
+@@ -415,7 +415,7 @@
+ void get_irqcpu_nb(unsigned int *irqcpu_used, unsigned int max_nr_irqcpu)
+ {
+    FILE *irqfp;
+-   char line[16];
++   char line[256];
+    unsigned int irq = 0;
+ 
+    /* Open interrupts file */
+@@ -424,7 +424,7 @@
+       return;
+    }
+ 
+-   while ((fgets(line, 16, irqfp) != NULL) && (irq < max_nr_irqcpu)) {
++   while ((fgets(line, 256, irqfp) != NULL) && (irq < max_nr_irqcpu)) {
+       if (isdigit(line[2]))
+ 	 irq++;
+    }

Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-statreset.patch
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-statreset.patch	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-statreset.patch	2004-11-28 18:47:12 UTC (rev 5137)
@@ -0,0 +1,48 @@
+--- sysstat-5.0.1/sysstat.sh.statreset	2004-01-23 11:06:58.000000000 +0100
++++ sysstat-5.0.1/sysstat.sh	2004-02-18 09:16:08.000000000 +0100
+@@ -1,5 +1,9 @@
+ #! /bin/sh
+ #
++# sysstat	Reset the system activity logs
++# 
++# chkconfig: 12345 01 99
++# description: Reset the system activity logs
+ # Author: Klaus.Franken at fth2.siemens.de
+ # Die Okt 12 10:05:41 EDT 1999
+ #
+@@ -8,16 +12,26 @@
+ #	Now use '-d' option when starting sar.
+ # 2000/01/22 - Sebastien Godard <sebastien.godard at wanadoo.fr>
+ #	Rewritten from scratch. Call sadc instead of sar.
++# 2004/01/22 - Nils Philippsen <nphilipp at redhat.com>
++#   Adapt for chkconfig. Call only once after booting.
++# 2004/02/18 - Nils Philippsen <nphilipp at redhat.com>
++#   Return real retval
++
+ #
+ # /etc/rc.d/init.d/sysstat
+ #
+ 
++RETVAL=0
++
+ # See how we were called.
+ case "$1" in
+   start)
+-        echo -n "Calling the system activity data collector (sadc): "
+-        PREFIX/lib/sa/sadc -F -L - QUOTE
+-        echo
++        if [ ! -f /var/lock/subsys/sysstat ]; then
++            echo -n "Calling the system activity data collector (sadc): "
++            PREFIX/lib/sa/sadc -F -L - QUOTE && touch /var/lock/subsys/sysstat
++			RETVAL=$?
++            echo
++		fi
+         ;;
+   stop|status|restart|reload)
+         ;;
+@@ -25,4 +39,4 @@
+         echo "Usage: sysstat {start|stop|status|restart|reload}"
+         exit 1
+ esac
+-
++exit $RETVAL

Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat.crond
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat.crond	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat.crond	2004-11-28 18:47:12 UTC (rev 5137)
@@ -0,0 +1,5 @@
+# run system activity accounting tool every 10 minutes
+*/10 * * * * root /usr/lib/sa/sa1 1 1
+# generate a daily summary of process accounting at 23:53
+53 23 * * * root /usr/lib/sa/sa2 -A
+

Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat.crondaily
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat.crondaily	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat.crondaily	2004-11-28 18:47:12 UTC (rev 5137)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# generate a daily summary of process accounting.
+umask 0022
+/usr/lib/sa/sa2 -A

Deleted: tinysofa/releases/1.1/sysstat/current/sources/sysstat.init
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat.init	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat.init	2004-11-28 18:47:12 UTC (rev 5137)
@@ -1,37 +0,0 @@
-#! /bin/sh
-#
-# sysstat		This shell script takes care of starting and\
-#			stopping sysstat (system statistics).
-# chkconfig: - 60 40
-#
-# description: Sysstat is a colletion of utilities for gathering and
-# displaying statistics about the system.
-#
-# Author: Klaus.Franken at fth2.siemens.de
-# Die Okt 12 10:05:41 EDT 1999
-#
-# Modified by:
-# 1999/11/07 - Sebastien Godard <sebastien.godard at wanadoo.fr>
-#	Now use '-d' option when starting sar.
-# 2000/01/22 - Sebastien Godard <sebastien.godard at wanadoo.fr>
-#	Rewritten from scratch. Call sadc instead of sar.
-# 2003/12/05 - Erlend Midttun <erlendbm at trustix dot org>
-#       Added chkconfig lines
-#
-# /etc/init.d/sysstat
-#
-
-# See how we were called.
-case "$1" in
-  start)
-        echo -n "Calling the system activity data collector (sadc): "
-        /usr/lib/sa/sadc 300 - &
-        echo
-        ;;
-  stop|status|restart|reload|try-restart)
-        ;;
-  *)
-        echo "Usage: sysstat {start|stop|status|restart|reload}"
-        exit 4
-esac
-

Added: tinysofa/releases/1.1/sysstat/current/sources/sysstat.sysconfig
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat.sysconfig	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat.sysconfig	2004-11-28 18:47:12 UTC (rev 5137)
@@ -0,0 +1,2 @@
+# How long to keep log files (days), maximum is a month
+HISTORY=7

Modified: tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec
===================================================================
--- tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec	2004-11-28 18:38:54 UTC (rev 5136)
+++ tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec	2004-11-28 18:47:12 UTC (rev 5137)
@@ -1,116 +1,300 @@
-Summary: SAR and IOSTAT for Linux
 Name: sysstat
-Version: 5.0.2
-Release: 4ts
+Version: 5.0.5
+Release: 1jh
+Summary: The sar and iostat system monitoring commands.
 License: GPL
-Group: main
-Source0: http://perso.wanadoo.fr/sebastien.godard/sysstat-%{version}.tar.bz2
-Source1: sysstat.init
-Patch0: sysstat-5.0.0-config.patch
-BuildRoot: %{_tmppath}/%{name}-root
-%service_requires
-BuildRequires: gettext
+Group: extra
+URL: http://perso.wanadoo.fr/sebastien.godard/
+Source: http://perso.wanadoo.fr/sebastien.godard/%{name}-%{version}.tar.bz2
+Source1: sysstat.crond
+Source2: sysstat.crondaily
+Source3: sysstat.sysconfig
+Patch0: sysstat-4.0.1-config.patch
+Patch1: sysstat-4.0.7-lib64.patch
+Patch2: sysstat-5.0.0-history.patch
+Patch3: sysstat-5.0.5-statreset.patch
+Patch4: sysstat-5.0.5-overrun.patch
+Patch5: sysstat-5.0.5-lib64init.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: kernel >= 2.2.16-21 /sbin/chkconfig
+Prereq: coreutils grep /etc/cron.daily
+BuildRequires: perl %{_includedir}/linux/if.h
+Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
 
 %description
-SAR and IOSTAT for Linux
+This package provides the sar and iostat commands for Linux. Sar and
+iostat enable system monitoring of disk, network, and other IO
+activity.
 
-%prep 
+
+%prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .config
+%patch1 -p1 -b .lib64
+%patch2 -p1 -b .history
+%patch3 -p1 -b .statreset
+%patch4 -p1 -b .overrun
 
+# Fix initscript for lib64 systems
+
+%if %_lib == "lib64"
+%patch5 -p1 -b .lib64init
+%endif
+
+
 %build
-%make 
+# FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and
+# send the upstream maintainer a patch.
+CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\""
+%make \
+	CFLAGS="$CFLAGS" \
+	PREFIX=%{_prefix} \
+	LIB_DIR=%{_libdir} \
+	MAN_DIR=%{_mandir} \
+	DATA_DIR=%{_datadir} \
+	DOC_DIR=%{_docdir}
 
+# Thou shalt not write to source files or patches
+rm -f sysstat.crond
+%if %_lib == "lib64"
+perl -p -e "s|/lib|/lib64|g" %{SOURCE1} > sysstat.crond
+%else
+cat %{SOURCE1} > sysstat.crond
+%endif
+
+
 %install
-make install DESTDIR=$RPM_BUILD_ROOT IGNORE_MAN_GROUP=y
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/%{_initrddir}/sysstat
+%makeinstall \
+	PREFIX=%{_prefix} \
+	LIB_DIR=%{_libdir} \
+	MAN_DIR=%{_mandir} \
+	DATA_DIR=%{_datadir} \
+	DOC_DIR=%{_docdir} \
+	INIT_DIR=%{_initrddir}
 
-rm -rf $RPM_BUILD_ROOT/usr/doc
+mkdir -p %{buildroot}/etc/{cron.daily,cron.d,sysconfig}
 
+#install -m 0644 sysstat.crond %{buildroot}/etc/cron.d/sysstat
+install %{SOURCE2} %{buildroot}/etc/cron.daily/sysstat
+install -m 0644 %{SOURCE3} %{buildroot}/etc/sysconfig/sysstat
+
+mkdir -p %{buildroot}%{_initrddir}
+install -m 0755 sysstat %{buildroot}%{_initrddir}/
+
+# sysstat makefiles install the docs in the wrong place, blow them away
+rm -f %{buildroot}/usr/share/doc/*
+
 %find_lang %{name}
 
+
 %post
-%service_post sysstat
+/sbin/chkconfig --add sysstat
 
 %preun
-%service_preun sysstat
+if [ "$1" = 0 ]; then
+  # Remove sa logs if removing sysstat completely
+  rm -f /var/log/sa/*
+  # Remove service
+  /sbin/chkconfig --del sysstat
+fi
 
-%postun
-%service_postun sysstat
 
 %clean
 %clean_buildroot
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc CHANGES  COPYING  CREDITS  FAQ  README
+%doc CHANGES COPYING CREDITS README TODO
+#config(noreplace) /etc/cron.d/sysstat
+%config(noreplace) /etc/cron.daily/sysstat
+%config(noreplace) /etc/sysconfig/sysstat
 %{_initrddir}/sysstat
-/usr/lib/sa
-/usr/bin/iostat
-/usr/bin/sar
-/usr/bin/mpstat
+%{_bindir}/*
+%{_libdir}/sa
+%{_mandir}/man1/*
+%{_mandir}/man8/*
 /var/log/sa
 
-/usr/share/man/man1/*
-/usr/share/man/man8/*
 
 %changelog
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 5.0.2-4ts
-- current (5.0.2-4jh) integrated as 5.0.2-4ts for release 1.1
+* Wed Jun 30 2004 Nils Philippsen <nphilipp at redhat.com>
+- version 5.0.5
+- remove some obsolete patches
+- update statreset, overrun, lib64init patches
+- renumber patches
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 5.0.2-3ts
-- current (5.0.2-2ts) integrated as 5.0.2-3ts for release 1.0-U1
+* Wed Jun 16 2004 Alan Cox <alan at redhat.com>
+- Fix spew of crap to console at startup
+- Fix order of startup (#124035)
+- Fix array overrun (#117182)
+- Fix interrupt buffer sizing (caused bogus irq info)
 
-* Mon May 17 2004 Jaakko Heinonen <jh at tinysofa dot org>
-- fix non-root build
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed May 12 2004 Omar Kilani <omar at tinysofa dot org> 5.0.2-2ts
-- Add BuildRequires gettext.
+* Wed Mar 24 2004 Justin Forbes <64bit_fedora at comcast.net> 5.0.1-2
+- fix lib64 init
 
-* Mon Mar 15 2004 Chr. Toldnes <christht at trustix dot org> 5.0.2-1tr
-- New upstream version
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue Jan 27 2004 Erlend Midttun <erlendbm at trustix dot org> 5.0.0-2tr
-- Fixed init-script description.
+* Wed Feb 18 2004 Nils Philippsen <nphilipp at redhat.com> 5.0.1-1
+- version 5.0.1
+- update statreset patch
 
-* Fri Dec  5 2003 Erlend Midttun <erlendbm at trustix dot org> 5.0.0-1tr
-- New upstream.
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Jun 23 2003 Erlend Midttun <erlendbm at trustix dot com> 4.0.0-7tr
-- Added %defattr.
+* Thu Jan 22 2004 Nils Philippsen <nphilipp at redhat.com> 5.0.0-0.6
+- let user configure how long to keep logs through /etc/sysconfig/sysstat
+  (#81294)
+- reset stats at system boot (#102445)
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 4.0.0-6tr
-- Big rebuild
+* Wed Jan 21 2004 Nils Philippsen <nphilipp at redhat.com> 5.0.0-0.5
+- fix ifnamsiz patch for s390x (hopefully)
 
-* Wed Apr  9 2003 Gerald Dachs <gda at trustix dot org> 4.0.0-5gd
-- Added PreReq on tsl-utils
+* Tue Jan 20 2004 Nils Philippsen <nphilipp at redhat.com> 5.0.0-0.4
+- fix insecure tmp files in scripts (#78212)
+- require tools needed in scripts
+- use IFNAMSIZ from %{_includedir}/linux/if.h for maximum interface length
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 4.0.0-4em
-- Rebuilt against glibc 2.3.2.
+* Mon Jan 12 2004 Nils Philippsen <nphilipp at redhat.com> 5.0.0-0.3
+- Buildrequires: perl
+- check for %%_lib == lib64 instead of specific arches
 
-* Thu Feb 27 2003 Erlend Midttun <erlendbm at trustix dot com> 4.0.0-3em
-- Make setup quiet.
+* Mon Jan 12 2004 Nils Philippsen <nphilipp at redhat.com> 5.0.0-0.2
+- fix dealing with lib64 case of cron.d file
 
-* Thu Oct  3 2002 Christian H. Toldnes <christht at trustix dot com> 4.0.0-2ct
-- Moved initscript to /etc/init.d to follow devel policy.
+* Mon Jan 12 2004 Nils Philippsen <nphilipp at redhat.com> 5.0.0-0.1
+- version 5.0.0
 
-* Tue Jun 12 2001 Oystein Viggen <oysteivi at trustix dot com>
-- New upstream version: 4.0.0
-- Include init script
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Mar  6 2001 Alexander Reelsen <ar at trustix dot com>
-- Picked up 3.3.5
+* Mon Mar  3 2003 Joe Orton <jorton at redhat.com> 4.0.7-4
+- really fix paths for multilib (#82913)
 
-* Wed Sep 13 2000 Per Ivar Paulsen <perp at trustix dot com>
-- Update to 3.2.4
+* Wed Feb 19 2003 Bill Nottingham <notting at redhat.com> 4.0.7-3
+- fix paths on multilib arches (#82913)
 
-* Wed Mar 15 2000 Oystein Viggen <oysteivi at trustix dot com>
-- Fix some building troubles
-- Some general cleanups
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Mon Feb 28 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Updated for Trustix
-- Moved man pages to FHS
-- Original package by:
-- Klaus Franken / SBS IP 21 F <Klaus.Franken at fth2.siemens.de>
+* Sat Nov 23 2002 Mike A. Harris <mharris at redhat.com> 4.0.7-1
+- Updated to new upstream version 4.0.7
+
+* Tue Nov 19 2002 Mike A. Harris <mharris at redhat.com> 4.0.5-7
+- Fixed files installed in /usr/doc to be put in correct place
+
+* Tue Oct  8 2002 Mike A. Harris <mharris at redhat.com> 4.0.5-6
+- All-arch rebuild
+
+* Tue Jul 23 2002 Trond Eivind Glomsr?d <teg at redhat.com> 4.0.5-3
+- Rebuild
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon Jun 17 2002 Trond Eivind Glomsr?d <teg at redhat.com> 4.0.5-1
+- 4.0.5-1
+- isag is no longer installed by default upstream, removing
+  requirement on gnuplot
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon Apr 22 2002 Trond Eivind Glomsr?d <teg at redhat.com> 4.0.4-1
+- 4.0.4
+- Add an explicit requires on gnuplot (#63474)
+
+* Fri Apr 12 2002 Trond Eivind Glomsr?d <teg at redhat.com> 4.0.3-2
+- Do the daily sa2 run just before midnight, not at 4AM... you'd 
+  only get 4 hours worth of data that way (#63132)
+
+* Thu Feb 28 2002 Trond Eivind Glomsr?d <teg at redhat.com> 4.0.3-1
+- 4.0.3
+
+* Wed Feb 27 2002 Trond Eivind Glomsr?d <teg at redhat.com> 4.0.2-3
+- Rebuild
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Dec 12 2001 Trond Eivind Glomsr?d <teg at redhat.com> 4.0.2-1
+- 4.0.2
+- the kernel patch for extended statistics is in, don't say it needs
+  applying in the man page
+
+* Mon Aug 13 2001 Preston Brown <pbrown at redhat.com>
+- be more verbose about which files are corrupt (#47122)
+
+* Mon Jul  2 2001 Preston Brown <pbrown at redhat.com>
+- run sa1 from cron.d to fix run-parts interaction problem (#37733)
+
+* Fri Jun 29 2001 Preston Brown <pbrown at redhat.com>
+- upgrade to 4.0.1 stable release
+
+* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
+- Bump release + rebuild.
+
+* Sun Apr  8 2001 Preston Brown <pbrown at redhat.com>
+- explicitly set safe umask (#35142)
+
+* Fri Mar  9 2001 Preston Brown <pbrown at redhat.com>
+- iostat disk utilization was off by a factor of 10.
+
+* Wed Feb 14 2001 Preston Brown <pbrown at redhat.com>
+- 3.3.5 brings us full support for kernel IO stats
+
+* Tue Jan 30 2001 Preston Brown <pbrown at redhat.com>
+- Summarize previous day's activity with sa2, not current day (which is only 4 hours of data when it gets run) (#24820)
+- upgrade to 3.3.4 for full 2.4 compatibility and improved iostat
+
+* Tue Jan 17 2001 Preston Brown <pbrown at redhat.com>
+- iostat man page fixes
+
+* Fri Jan 05 2001 Preston Brown <pbrown at redhat.com>
+- 3.3.3, crontab fixes
+
+* Fri Dec 29 2000 Bill Nottingham <notting at redhat.com>
+- fix prereqs
+
+* Fri Oct 13 2000 Preston Brown <pbrown at redhat.com>
+- crontab entry was still incorrect.  Fixed.
+
+* Mon Oct 09 2000 Preston Brown <pbrown at redhat.com>
+- make sure disk accounting is enabled to fix iostat -l, -p (#16268)
+- crontab entries were missing the user (root) to run as (#18212)
+
+* Tue Aug 22 2000 Preston Brown <pbrown at redhat.com>
+- enable IO accounting now that kernel supports it
+
+* Wed Aug 16 2000 Nalin Dahyabhai <nalin at redhat.com>
+- fix buildrooting (#16271)
+
+* Tue Aug 08 2000 Preston Brown <pbrown at redhat.com>
+- bugfixes in 3.2.4 cause our inclusion. :)
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Thu Jun 29 2000 Preston Brown <pbrown at redhat.com>
+- 3.2.3 fixes SMP race condition
+
+* Tue Jun 20 2000 Preston Brown <pbrown at redhat.com>
+- FHS macros
+- 3.2.2
+
+* Fri May 26 2000 Preston Brown <pbrown at redhat.com>
+- packaged for Winston
+- change va patch to indicate kernel is not patched for iostat accounting.
+  re-enable if our stock kernel gets this patch.
+- upgrade to 3.2.
+- install crontab entry.
+
+* Sun Dec 12 1999  Ian Macdonald <ian at caliban.org>
+- upgraded to 2.2
+
+* Fri Oct 29 1999  Ian Macdonald <ian at caliban.org>
+- first RPM release (2.1)


From svn at tinysofa.org  Sun Nov 28 19:09:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 28 Nov 2004 14:09:51 -0500 (EST)
Subject: [tinysofa-svn] 
	r5138 - in tinysofa/releases/1.1/ypserv/current: sources specs
Message-ID: <20041128190951.20DE3344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-28 14:09:50 -0500 (Sun, 28 Nov 2004)
New Revision: 5138

Added:
   tinysofa/releases/1.1/ypserv/current/sources/ypserv-2.13-pie.patch
   tinysofa/releases/1.1/ypserv/current/sources/ypserv-2.13.tar.bz2
Modified:
   tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec
Log:
- update to 2.13
- use macros
- multilib fixes
- enable PIE
- add Requires: bash gawk


Added: tinysofa/releases/1.1/ypserv/current/sources/ypserv-2.13-pie.patch
===================================================================
--- tinysofa/releases/1.1/ypserv/current/sources/ypserv-2.13-pie.patch	2004-11-28 18:47:12 UTC (rev 5137)
+++ tinysofa/releases/1.1/ypserv/current/sources/ypserv-2.13-pie.patch	2004-11-28 19:09:50 UTC (rev 5138)
@@ -0,0 +1,70 @@
+--- ypserv-2.13/ypserv/Makefile.am.pie	2004-05-17 17:13:20.533939367 +0200
++++ ypserv-2.13/ypserv/Makefile.am	2004-05-17 17:13:40.686705862 +0200
+@@ -25,3 +25,4 @@
+ ypserv_SOURCES = ypserv.c server.c ypserv_xdr.c reg_slp.c
+ 
+ ypserv_LDADD =  $(top_builddir)/lib/libyp.a @LIBDBM@ @LIBSLP@
++ypserv_LDFLAGS = -pie
+--- ypserv-2.13/ypserv/Makefile.in.pie	2004-05-17 17:13:25.549382969 +0200
++++ ypserv-2.13/ypserv/Makefile.in	2004-05-17 17:13:46.878020836 +0200
+@@ -175,6 +175,7 @@
+ noinst_HEADERS = reg_slp.h
+ ypserv_SOURCES = ypserv.c server.c ypserv_xdr.c reg_slp.c
+ ypserv_LDADD = $(top_builddir)/lib/libyp.a @LIBDBM@ @LIBSLP@
++ypserv_LDFLAGS = -pie
+ all: all-am
+ 
+ .SUFFIXES:
+--- ypserv-2.13/rpc.ypxfrd/Makefile.am.pie	2004-05-17 17:11:40.705095109 +0200
++++ ypserv-2.13/rpc.ypxfrd/Makefile.am	2004-05-17 17:12:04.015475643 +0200
+@@ -24,3 +24,4 @@
+ rpc_ypxfrd_SOURCES = ypxfrd.c ypxfrd_server.c ypxfrd_svc.c
+ 
+ rpc_ypxfrd_LDADD = $(top_builddir)/lib/libyp.a @LIBDBM@
++rpc_ypxfrd_LDFLAGS = -pie
+--- ypserv-2.13/rpc.ypxfrd/Makefile.in.pie	2004-05-17 17:11:46.012497868 +0200
++++ ypserv-2.13/rpc.ypxfrd/Makefile.in	2004-05-17 17:12:12.544519524 +0200
+@@ -174,6 +174,7 @@
+ man_MANS = ypxfrd.8 rpc.ypxfrd.8
+ rpc_ypxfrd_SOURCES = ypxfrd.c ypxfrd_server.c ypxfrd_svc.c
+ rpc_ypxfrd_LDADD = $(top_builddir)/lib/libyp.a @LIBDBM@
++rpc_ypxfrd_LDFLAGS = -pie
+ all: all-am
+ 
+ .SUFFIXES:
+--- ypserv-2.13/yppush/Makefile.am.pie	2004-05-17 17:12:27.468849374 +0200
++++ ypserv-2.13/yppush/Makefile.am	2004-05-17 17:12:50.302301049 +0200
+@@ -24,4 +24,5 @@
+ yppush_SOURCES = yppush.c
+ 
+ yppush_LDADD =  @LIBDBM@  $(top_builddir)/lib/libyp.a
++yppush_LDFLAGS = -pie
+ 
+--- ypserv-2.13/yppush/Makefile.in.pie	2004-05-17 17:12:33.122217660 +0200
++++ ypserv-2.13/yppush/Makefile.in	2004-05-17 17:13:04.368735193 +0200
+@@ -171,6 +171,7 @@
+ man_MANS = yppush.8
+ yppush_SOURCES = yppush.c
+ yppush_LDADD = @LIBDBM@  $(top_builddir)/lib/libyp.a
++yppush_LDFLAGS = -pie
+ all: all-am
+ 
+ .SUFFIXES:
+--- ypserv-2.13/rpc.yppasswdd/Makefile.am.pie	2004-05-17 17:11:17.897667348 +0200
++++ ypserv-2.13/rpc.yppasswdd/Makefile.am	2004-05-17 17:11:23.173071545 +0200
+@@ -26,4 +26,4 @@
+ rpc_yppasswdd_SOURCES = update.c yppasswd_xdr.c yppasswdd.c
+ 
+ rpc_yppasswdd_LDADD =  $(LIBDBM) $(LIBCRYPT) $(top_builddir)/lib/libyp.a
+-
++rpc_yppasswdd_LDFLAGS = -pie
+--- ypserv-2.13/rpc.yppasswdd/Makefile.in.pie	2004-05-17 17:11:12.430285377 +0200
++++ ypserv-2.13/rpc.yppasswdd/Makefile.in	2004-05-17 17:11:19.197520496 +0200
+@@ -180,6 +180,7 @@
+ man_MANS = yppasswdd.8 rpc.yppasswdd.8
+ rpc_yppasswdd_SOURCES = update.c yppasswd_xdr.c yppasswdd.c
+ rpc_yppasswdd_LDADD = $(LIBDBM) $(LIBCRYPT) $(top_builddir)/lib/libyp.a
++rpc_yppasswdd_LDFLAGS = -pie
+ all: all-am
+ 
+ .SUFFIXES:

Added: tinysofa/releases/1.1/ypserv/current/sources/ypserv-2.13.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/ypserv/current/sources/ypserv-2.13.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec
===================================================================
--- tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec	2004-11-28 18:47:12 UTC (rev 5137)
+++ tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec	2004-11-28 19:09:50 UTC (rev 5138)
@@ -1,7 +1,7 @@
 Summary: The NIS (Network Information Service) server.
 Name: ypserv
-Version: 2.12.1
-Release: 3ts
+Version: 2.13
+Release: 1jh
 License: GPL
 Group: extra
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -9,12 +9,13 @@
 Source2: ypserv-yppasswdd.init
 Source3: ypserv-yppasswdd.sysconfig
 Source4: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2.sign
-Requires: portmap make
+Requires: gawk portmap make bash
 %service_requires
 Patch0: ypserv-2.8-trustix.patch
 Patch1: ypserv-awkpath.patch
+Patch2: ypserv-2.13-pie.patch
 Obsoletes: yppasswd
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, gdbm-devel
 
 %description
@@ -33,43 +34,48 @@
 also need to install the yp-tools and ypbind packages onto any NIS
 client machines.
 
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .pie
 
 %build
 autoconf
 cp etc/README etc/README.etc
 
-CFLAGS=$RPM_OPT_FLAGS ./configure --enable-checkroot \
+export CFLAGS="$RPM_OPT_FLAGS -fpic"
+%configure --enable-checkroot \
            --enable-fqdn \
-           --libexecdir=/usr/lib/yp
-make
+           --libexecdir=%{_libdir}/yp
+%make
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-make DESTDIR="$RPM_BUILD_ROOT" install
+%makeinstall_std
 
 sed -e 's/^0\.0\.0\.0		0.0.0.0$/#0.0.0.0		0.0.0.0/' \
 	etc/securenets > $RPM_BUILD_ROOT/var/yp/securenets
 chmod 644 $RPM_BUILD_ROOT/var/yp/securenets
 
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/ypserv
-install -m755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/yppasswdd
+%{__mkdir_p} \
+	$RPM_BUILD_ROOT/%{_initrddir} \
+	$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
 
-install -m644 etc/ypserv.conf $RPM_BUILD_ROOT/etc
-mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/yppasswdd
+install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/ypserv
+install -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initrddir}/yppasswdd
 
-touch $RPM_BUILD_ROOT/etc/netgroup
-chmod 644 $RPM_BUILD_ROOT/etc/netgroup
+install -m644 etc/ypserv.conf $RPM_BUILD_ROOT/%{_sysconfdir}
+install -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yppasswdd
 
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/netgroup
+chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/netgroup
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post
 %service_post ypserv
 %service_post yppasswdd
@@ -82,24 +88,33 @@
 %service_postun ypserv
 %service_postun yppasswdd
  
+
 %files
 %defattr(-,root,root)
 %doc README INSTALL ChangeLog TODO NEWS THANKS
 %doc etc/README.etc
-%config /etc/ypserv.conf
-%config /etc/netgroup
-%config /var/yp/Makefile
-%config(noreplace) /var/yp/securenets
-%dir /var/yp
-%config /etc/init.d/*
-%config(noreplace) /etc/sysconfig/yppasswdd
-/usr/lib/yp
-/usr/sbin/*
-/usr/share/man/man5/*
-/usr/share/man/man8/*
-/usr/include/*/*
+%config %{_sysconfdir}/ypserv.conf
+%config %{_sysconfdir}/netgroup
+%config %{_localstatedir}/yp/Makefile
+%config(noreplace) %{_localstatedir}/yp/securenets
+%dir %{_localstatedir}/yp
+%config %{_initrddir}/*
+%config(noreplace) %{_sysconfdir}/sysconfig/yppasswdd
+%{_libdir}/yp
+%{_sbindir}/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
+%{_includedir}/*/*
 
+
 %changelog
+* Sun Nov 28 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.13-1jh
+- update to 2.13
+- use macros
+- multilib fixes
+- enable PIE
+- add Requires: bash gawk
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.12.1-3ts
 - current (2.12.1-3jh) integrated as 2.12.1-3ts for release 1.1
 


From svn at tinysofa.org  Sun Nov 28 19:24:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 28 Nov 2004 14:24:15 -0500 (EST)
Subject: [tinysofa-svn] r5139 - tinysofa/releases/1.1/ypserv/current/specs
Message-ID: <20041128192415.63841344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-28 14:24:14 -0500 (Sun, 28 Nov 2004)
New Revision: 5139

Modified:
   tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec
Log:
- macro changes
- fix binary stripping


Modified: tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec
===================================================================
--- tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec	2004-11-28 19:09:50 UTC (rev 5138)
+++ tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec	2004-11-28 19:24:14 UTC (rev 5139)
@@ -55,23 +55,25 @@
 %makeinstall_std
 
 sed -e 's/^0\.0\.0\.0		0.0.0.0$/#0.0.0.0		0.0.0.0/' \
-	etc/securenets > $RPM_BUILD_ROOT/var/yp/securenets
-chmod 644 $RPM_BUILD_ROOT/var/yp/securenets
+	etc/securenets > %{buildroot}%{_localstatedir}/yp/securenets
+chmod 644 %{buildroot}%{_localstatedir}/yp/securenets
 
 %{__mkdir_p} \
-	$RPM_BUILD_ROOT/%{_initrddir} \
-	$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
+	%{buildroot}%{_initrddir} \
+	%{buildroot}%{_sysconfdir}/sysconfig
 
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/ypserv
-install -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initrddir}/yppasswdd
+install -m755 %{SOURCE1} %{buildroot}%{_initrddir}/ypserv
+install -m755 %{SOURCE2} %{buildroot}%{_initrddir}/yppasswdd
 
-install -m644 etc/ypserv.conf $RPM_BUILD_ROOT/%{_sysconfdir}
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yppasswdd
+install -m644 etc/ypserv.conf %{buildroot}%{_sysconfdir}
+install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/yppasswdd
 
-touch $RPM_BUILD_ROOT/%{_sysconfdir}/netgroup
-chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/netgroup
+touch %{buildroot}%{_sysconfdir}/netgroup
+chmod 644 %{buildroot}%{_sysconfdir}/netgroup
 
+chmod 755 %{buildroot}%{_sbindir}/* %{buildroot}%{_libdir}/yp/*
 
+
 %clean
 %clean_buildroot
 


From svn at tinysofa.org  Sun Nov 28 20:00:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 28 Nov 2004 15:00:02 -0500 (EST)
Subject: [tinysofa-svn] 
	r5140 - tinysofa/releases/1.1/wireless-tools/current/specs
Message-ID: <20041128200002.DB029344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-28 15:00:02 -0500 (Sun, 28 Nov 2004)
New Revision: 5140

Modified:
   tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec
Log:
- fix libiw.so symlink on multilib arches

Modified: tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec
===================================================================
--- tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec	2004-11-28 19:24:14 UTC (rev 5139)
+++ tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec	2004-11-28 20:00:02 UTC (rev 5140)
@@ -7,7 +7,7 @@
 URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 Source: http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.%{version}.tar.gz
 Patch1: wireless-tools-26-makefile.patch
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 This package contain the Wireless tools, used to manipulate
@@ -15,17 +15,18 @@
 allowing you to set Wireless LAN specific parameters and get the
 specific stats for wireless networking equipment. 
 
+
 %prep
 %setup -n wireless_tools.%{version} -q
 %patch1 -p1
 
+
 %build
 make clean
 make OPT_FLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT{/sbin,/%{_lib},%{_mandir}/man8,%{_includedir},%{_libdir}}
 
 make install INSTALL_DIR=$RPM_BUILD_ROOT/sbin \
@@ -33,14 +34,18 @@
 	INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \
 	INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}
 rm -f $RPM_BUILD_ROOT/%{_lib}/libiw.a
-ln -sf ../../lib/libiw.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libiw.so
+ln -sf /%{_lib}/libiw.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libiw.so
 
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
 %doc INSTALL README DISTRIBUTIONS.txt
@@ -50,7 +55,11 @@
 %{_includedir}/*
 %{_libdir}/*.so
 
+
 %changelog
+* Sun Nov 28 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- fix libiw.so symlink on multilib arches
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 26-5ts
 - current (26-5jh) integrated as 26-5ts for release 1.1
 


From svn at tinysofa.org  Mon Nov 29 07:07:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 29 Nov 2004 02:07:33 -0500 (EST)
Subject: [tinysofa-svn] 
	r5141 - tinysofa/releases/1.1/sysstat/current/sources
Message-ID: <20041129070733.DDDF9344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-29 02:07:31 -0500 (Mon, 29 Nov 2004)
New Revision: 5141

Modified:
   tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-statreset.patch
Log:
- tune chkconfig line


Modified: tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-statreset.patch
===================================================================
--- tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-statreset.patch	2004-11-28 20:00:02 UTC (rev 5140)
+++ tinysofa/releases/1.1/sysstat/current/sources/sysstat-5.0.5-statreset.patch	2004-11-29 07:07:31 UTC (rev 5141)
@@ -5,7 +5,7 @@
  #
 +# sysstat	Reset the system activity logs
 +# 
-+# chkconfig: 12345 01 99
++# chkconfig: - 01 99
 +# description: Reset the system activity logs
  # Author: Klaus.Franken at fth2.siemens.de
  # Die Okt 12 10:05:41 EDT 1999


From svn at tinysofa.org  Mon Nov 29 13:22:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 29 Nov 2004 08:22:27 -0500 (EST)
Subject: [tinysofa-svn] 
	r5142 - in contrib/1.1: . electricfence electricfence/current
	electricfence/current/sources electricfence/current/specs
Message-ID: <20041129132227.324A2344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-29 08:22:26 -0500 (Mon, 29 Nov 2004)
New Revision: 5142

Added:
   contrib/1.1/electricfence/
   contrib/1.1/electricfence/current/
   contrib/1.1/electricfence/current/sources/
   contrib/1.1/electricfence/current/sources/ElectricFence-2.0.5-longjmp.patch
   contrib/1.1/electricfence/current/sources/ElectricFence-2.1-vaarg.patch
   contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2-madvise.patch
   contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2-pthread.patch
   contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2.tar.gz
   contrib/1.1/electricfence/current/specs/
   contrib/1.1/electricfence/current/specs/electricfence.spec
   contrib/1.1/electricfence/pristine/
   contrib/1.1/electricfence/releases/
Log:
- add electricfence


Added: contrib/1.1/electricfence/current/sources/ElectricFence-2.0.5-longjmp.patch
===================================================================
--- contrib/1.1/electricfence/current/sources/ElectricFence-2.0.5-longjmp.patch	2004-11-29 07:07:31 UTC (rev 5141)
+++ contrib/1.1/electricfence/current/sources/ElectricFence-2.0.5-longjmp.patch	2004-11-29 13:22:26 UTC (rev 5142)
@@ -0,0 +1,27 @@
+--- ElectricFence-2.0.5/eftest.c.ewt	Tue Jun  2 09:25:10 1998
++++ ElectricFence-2.0.5/eftest.c	Tue Jun  2 09:24:58 1998
+@@ -24,7 +24,7 @@
+ extern int	EF_PROTECT_BELOW;
+ extern int	EF_ALIGNMENT;
+ 
+-static jmp_buf	env;
++static sigjmp_buf	env;
+ 
+ /*
+  * There is still too little standardization of the arguments and return
+@@ -40,13 +40,13 @@
+ )
+  {
+ 	signal(PAGE_PROTECTION_VIOLATED_SIGNAL, SIG_DFL);
+-	longjmp(env, 1);
++	siglongjmp(env, 1);
+ }
+ 
+ static int
+ gotSegmentationFault(int (*test)(void))
+ {
+-	if ( setjmp(env) == 0 ) {
++	if ( sigsetjmp(env, 1) == 0 ) {
+ 		int			status;
+ 
+ 		signal(PAGE_PROTECTION_VIOLATED_SIGNAL

Added: contrib/1.1/electricfence/current/sources/ElectricFence-2.1-vaarg.patch
===================================================================
--- contrib/1.1/electricfence/current/sources/ElectricFence-2.1-vaarg.patch	2004-11-29 07:07:31 UTC (rev 5141)
+++ contrib/1.1/electricfence/current/sources/ElectricFence-2.1-vaarg.patch	2004-11-29 13:22:26 UTC (rev 5142)
@@ -0,0 +1,11 @@
+--- ElectricFence-2.1/print.c.jj	Thu Jan 19 23:54:26 1995
++++ ElectricFence-2.1/print.c	Tue May 16 07:43:45 2000
+@@ -99,7 +99,7 @@ vprint(const char * pattern, va_list arg
+ 				break;
+ 			case 'c':
+ 				{
+-					char	c = va_arg(args, char);
++					char	c = va_arg(args, int);
+ 					
+ 					(void) write(2, &c, 1);
+ 				}

Added: contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2-madvise.patch
===================================================================
--- contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2-madvise.patch	2004-11-29 07:07:31 UTC (rev 5141)
+++ contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2-madvise.patch	2004-11-29 13:22:26 UTC (rev 5142)
@@ -0,0 +1,54 @@
+--- ElectricFence-2.2.2/page.c.jj	1999-04-11 17:45:26.000000000 -0400
++++ ElectricFence-2.2.2/page.c	2004-10-16 12:30:10.000000000 -0400
+@@ -160,8 +160,9 @@ Page_DenyAccess(void * address, size_t s
+ void
+ Page_Delete(void * address, size_t size)
+ {
+-	if ( munmap((caddr_t)address, size) < 0 )
+-		Page_DenyAccess(address, size);
++	Page_DenyAccess(address, size);
++	/* Tell the kernel we will never need it again.  */
++	madvise(address, size, MADV_DONTNEED);
+ }
+ 
+ #if defined(_SC_PAGESIZE)
+--- ElectricFence-2.2.2/efence.c.jj	1999-04-12 21:00:49.000000000 -0400
++++ ElectricFence-2.2.2/efence.c	2004-10-16 13:11:30.000000000 -0400
+@@ -626,10 +626,7 @@ memalign(size_t alignment, size_t userSi
+ 		address += internalSize - bytesPerPage;
+ 
+ 		/* Set up the "dead" page. */
+-		if ( EF_PROTECT_FREE )
+-			Page_Delete(address, bytesPerPage);
+-		else
+-			Page_DenyAccess(address, bytesPerPage);
++		Page_Delete(address, bytesPerPage);
+ 
+ 		/* Figure out what address to give the user. */
+ 		address -= userSize;
+@@ -643,11 +640,8 @@ memalign(size_t alignment, size_t userSi
+ 		address = (char *)fullSlot->internalAddress;
+ 
+ 		/* Set up the "dead" page. */
+-		if ( EF_PROTECT_FREE )
+-			Page_Delete(address, bytesPerPage);
+-		else
+-			Page_DenyAccess(address, bytesPerPage);
+-			
++		Page_Delete(address, bytesPerPage);
++
+ 		address += bytesPerPage;
+ 
+ 		/* Set up the "live" page. */
+@@ -777,10 +771,7 @@ free(void * address)
+ 	 * in the hope that the swap space attached to those pages will be
+ 	 * released as well.
+ 	 */
+-	if ( EF_PROTECT_FREE )
+-	    Page_Delete(slot->internalAddress, slot->internalSize);
+-	else
+-	    Page_DenyAccess(slot->internalAddress, slot->internalSize);
++	Page_Delete(slot->internalAddress, slot->internalSize);
+ 
+ 	previousSlot = slotForInternalAddressPreviousTo(slot->internalAddress);
+ 	nextSlot = slotForInternalAddress(

Added: contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2-pthread.patch
===================================================================
--- contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2-pthread.patch	2004-11-29 07:07:31 UTC (rev 5141)
+++ contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2-pthread.patch	2004-11-29 13:22:26 UTC (rev 5142)
@@ -0,0 +1,70 @@
+--- ElectricFence-2.2.2/efence.c.jj	1999-04-12 21:00:49.000000000 -0400
++++ ElectricFence-2.2.2/efence.c	2003-02-03 11:20:18.000000000 -0500
+@@ -174,6 +174,15 @@ static int		internalUse = 0;
+ static int		noAllocationListProtection = 0;
+ 
+ #ifdef USE_SEMAPHORE
++
++#include <stdbool.h>
++
++#pragma weak sem_init
++#pragma weak sem_post
++#pragma weak sem_wait
++
++static int		pthread_initialization = 0;
++
+ /*
+  * EF_sem is a semaphore used to allow one thread at a time into
+  * these routines.
+@@ -274,7 +283,7 @@ initialize(void)
+ 	EF_Print(version);
+ 
+ #ifdef USE_SEMAPHORE
+-	if (sem_init(&EF_sem, 0, 1) >= 0) {
++	if (sem_init != NULL && !pthread_initialization && sem_init(&EF_sem, 0, 1) >= 0) {
+ 		semEnabled = 1;
+ 	}
+ #endif
+@@ -397,6 +406,21 @@ initialize(void)
+ 	release();
+ }
+ 
++#ifdef USE_SEMAPHORE
++void
++__libc_malloc_pthread_startup (bool first_time)
++{
++	if (first_time) {
++		pthread_initialization = 1;
++		initialize ();
++	} else {
++		pthread_initialization = 0;
++		if (!semEnabled && sem_init != NULL && sem_init(&EF_sem, 0, 1) >= 0)
++			semEnabled = 1;
++	}
++}
++#endif
++
+ /*
+  * allocateMoreSlots is called when there are only enough slot structures
+  * left to support the allocation of a single malloc buffer.
+--- ElectricFence-2.2.2/Makefile.jj	1999-04-13 13:22:49.000000000 -0400
++++ ElectricFence-2.2.2/Makefile	2003-02-03 11:27:06.000000000 -0500
+@@ -1,6 +1,6 @@
+ PIC= -fPIC
+ CFLAGS= -g -DUSE_SEMAPHORE $(PIC)
+-LIBS= -lpthread
++LIBS=
+ 
+ prefix=/usr
+ BIN_INSTALL_DIR= $(prefix)/bin
+@@ -54,8 +54,8 @@ libefence.a: $(OBJECTS)
+ 	$(AR) crv libefence.a $(OBJECTS)
+ 
+ libefence.so.0.0: $(OBJECTS)
+-	gcc -g -shared -Wl,-soname,libefence.so.0 -o libefence.so.0.0 \
+-		$(OBJECTS) -lpthread -lc 
++	gcc -shared -Wl,-soname,libefence.so.0 -o libefence.so.0.0 \
++		$(CFLAGS) $(OBJECTS) 
+ 
+ tstheap: libefence.a tstheap.o
+ 	- rm -f tstheap

Added: contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/electricfence/current/sources/ElectricFence-2.2.2.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/electricfence/current/specs/electricfence.spec
===================================================================
--- contrib/1.1/electricfence/current/specs/electricfence.spec	2004-11-29 07:07:31 UTC (rev 5141)
+++ contrib/1.1/electricfence/current/specs/electricfence.spec	2004-11-29 13:22:26 UTC (rev 5142)
@@ -0,0 +1,181 @@
+Summary: A debugger which detects memory allocation violations.
+Name: electricfence
+Version: 2.2.2
+Release: 1jh
+Copyright: GPL
+Group: contrib
+Source: ftp://ftp.perens.com/pub/ElectricFence/beta/ElectricFence-%{version}.tar.gz
+Patch1: ElectricFence-2.0.5-longjmp.patch
+Patch2: ElectricFence-2.1-vaarg.patch
+Patch3: ElectricFence-2.2.2-pthread.patch
+Patch4: ElectricFence-2.2.2-madvise.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: /sbin/ldconfig
+
+%description
+ElectricFence is a utility for C programming and
+debugging. ElectricFence uses the virtual memory hardware of your
+system to detect when software overruns malloc() buffer boundaries,
+and/or to detect any accesses of memory released by
+free(). ElectricFence will then stop the program on the first
+instruction that caused a bounds violation and you can use your
+favorite debugger to display the offending statement.
+
+Install ElectricFence if you need a debugger to find malloc()
+violations.
+
+
+%prep
+%setup -q -n ElectricFence-%{version}
+%patch1 -p1 -b .longjmp
+%patch2 -p1 -b .vaarg
+%patch3 -p1 -b .pthread
+%patch4 -p1 -b .madvise
+
+
+%build
+make CFLAGS='${RPM_OPT_FLAGS} -DUSE_SEMAPHORE -fpic'
+
+
+%install
+mkdir -p %{buildroot}{%{_bindir},%{_libdir},%{_mandir}/man3}
+
+make	BIN_INSTALL_DIR=%{buildroot}%{_bindir} \
+	LIB_INSTALL_DIR=%{buildroot}%{_libdir} \
+	MAN_INSTALL_DIR=%{buildroot}%{_mandir}/man3 \
+	install
+
+echo ".so man3/efence.3" > %{buildroot}%{_mandir}/man3/libefence.3
+
+
+%clean
+%clean_buildroot
+
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+
+%files
+%defattr(-,root,root)
+%doc README CHANGES COPYING
+%{_bindir}/*
+%{_libdir}/*.a
+%{_libdir}/*.so*
+%{_mandir}/*/*
+
+
+%changelog
+* Sat Oct 16 2004 Jakub Jelinek <jakub at redhat.com> 2.2.2-19
+- when EF_PROTECT_FREE=1, instead of munmaping mprotect PROT_NONE
+  and madvise MADV_DONTNEED (#107506)
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon Feb  3 2003 Jakub Jelinek <jakub at redhat.com>
+- never call semaphore routines in between
+  __libc_malloc_pthread_startup(true) and
+  __libc_malloc_pthread_startup(false) (#83111)
+- only use semaphore locking if application or its dependencies
+  are linked against -lpthread, don't link libefence.so against
+  -lpthread
+- run tests as part of the build process
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Tue Jan  7 2003 Jeff Johnson <jbj at redhat.com> 2.2.2-13
+- don't include -debuginfo files in package.
+
+* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 2.2.2-12
+- rebuild on all arches
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
+- Bump release + rebuild.
+
+* Thu Nov 16 2000 Tim Powers <timp at redhat.com>
+- use -fPIC, not -fpic, also -DUSE_SEMAPHORE to make it thread safe,
+  as per bug #20935
+
+* Tue Sep 19 2000 Bill Nottingham <notting at redhat.com>
+- use -fpic
+
+* Fri Aug 18 2000 Tim Waugh <twaugh at redhat.com>
+- fix efence.3/libefence.3 confusion (#16412).
+
+* Tue Aug 1 2000 Tim Powers <timp at redhat.com>
+- added ldconfig stuff to ;post and postun
+- added Requires /sbin/ldconfig
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Wed Jul 05 2000 Preston Brown <pbrown at redhat.com>
+- back in main distro
+- 2.2.2 version - claimed beta, but no releases in over a year.
+- FHS macros
+
+* Fri May 26 2000 Tim Powers <timp at redhat.com>
+- moved to Powertools
+- fix map page location to be in /usr/share/man
+
+* Tue May 16 2000 Jakub Jelinek <jakub at redhat.com>
+- fix build on ia64
+
+* Wed Feb 02 2000 Cristian Gafton <gafton at redhat.com>
+- fix description
+- man pages are compressed
+
+* Tue Jan  4 2000 Jeff Johnson <jbj at redhat.com>
+- remove ExcludeArch: alpha (#6683).
+
+* Sat Apr 10 1999 Matt Wilson <msw at redhat.com>
+- version 2.1
+
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+- auto rebuild in the new build environment (release 13)
+
+* Wed Jan 06 1999 Cristian Gafton <gafton at redhat.com>
+- build for glibc 2.1
+
+* Fri Aug 21 1998 Jeff Johnson <jbj at redhat.com>
+- create efence.3 (problem #830)
+
+* Tue Aug  4 1998 Jeff Johnson <jbj at redhat.com>
+- build root
+
+* Mon Jun 01 1998 Prospector System <bugs at redhat.com>
+- translations modified for de
+
+* Mon Jun 01 1998 Prospector System <bugs at redhat.com>
+- need to use sigsetjmp() and siglongjmp() for proper testing
+
+* Fri May 01 1998 Prospector System <bugs at redhat.com>
+- translations modified for de, fr, tr
+
+* Thu Apr 30 1998 Cristian Gafton <gafton at redhat.com>
+- use ExcludeArch instead of Exclude
+
+* Thu Jul 10 1997 Erik Troan <ewt at redhat.com>
+- built against glibc


From svn at tinysofa.org  Mon Nov 29 17:39:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 29 Nov 2004 12:39:44 -0500 (EST)
Subject: [tinysofa-svn] 
	r5143 - in tinysofa/releases/1.1/mdadm/current: sources specs
Message-ID: <20041129173944.DBC65344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-29 12:39:43 -0500 (Mon, 29 Nov 2004)
New Revision: 5143

Added:
   tinysofa/releases/1.1/mdadm/current/sources/mdadm-1.8.0.tgz
Removed:
   tinysofa/releases/1.1/mdadm/current/sources/mdadm-1.5.0.tgz
Modified:
   tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec
Log:
- new mdadm upstream


Deleted: tinysofa/releases/1.1/mdadm/current/sources/mdadm-1.5.0.tgz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/mdadm/current/sources/mdadm-1.8.0.tgz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/mdadm/current/sources/mdadm-1.8.0.tgz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec
===================================================================
--- tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec	2004-11-29 13:22:26 UTC (rev 5142)
+++ tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec	2004-11-29 17:39:43 UTC (rev 5143)
@@ -1,7 +1,7 @@
 Summary: mdadm is used for controlling Linux md devices (aka RAID arrays)
 Name: mdadm
-Version: 1.5.0
-Release: 6ts
+Version: 1.8.0
+Release: 1jh
 Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 Source1: mdmonitor.init
 Patch0: mdadm-1.5.0-email.patch
@@ -32,11 +32,15 @@
 
 
 %build
-make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}"
+%make \
+	CXFLAGS="$RPM_OPT_FLAGS" \
+	SYSCONFDIR="%{_sysconfdir}"
 
 
 %install
-%makeinstall_std MANDIR=%{_mandir} BINDIR=%{_sbindir}
+%makeinstall_std \
+	MANDIR=%{_mandir} \
+	BINDIR=%{_sbindir}
 
 install -D -m 600 mdadm.conf-example $RPM_BUILD_ROOT/%{_sysconfdir}/mdadm.conf
 install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
@@ -66,6 +70,9 @@
 
 
 %changelog
+* Mon Nov 29 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.8.0-1jh
+- 1.8.0
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.5.0-6ts
 - current (1.5.0-6jh) integrated as 1.5.0-6ts for release 1.1
 


From svn at tinysofa.org  Mon Nov 29 19:38:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 29 Nov 2004 14:38:50 -0500 (EST)
Subject: [tinysofa-svn] 
	r5144 - in contrib/1.1: . perl-xml-parser perl-xml-parser/current
	perl-xml-parser/current/sources perl-xml-parser/current/specs
Message-ID: <20041129193850.AEEBF344117@minbar.tinysofa.org>

Author: gda
Date: 2004-11-29 14:38:50 -0500 (Mon, 29 Nov 2004)
New Revision: 5144

Added:
   contrib/1.1/perl-xml-parser/
   contrib/1.1/perl-xml-parser/current/
   contrib/1.1/perl-xml-parser/current/sources/
   contrib/1.1/perl-xml-parser/current/sources/XML-Parser-2.34.tar.gz
   contrib/1.1/perl-xml-parser/current/specs/
   contrib/1.1/perl-xml-parser/current/specs/perl-xml-parser.spec
   contrib/1.1/perl-xml-parser/pristine/
   contrib/1.1/perl-xml-parser/releases/
Log:
new in contrib

Added: contrib/1.1/perl-xml-parser/current/sources/XML-Parser-2.34.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-xml-parser/current/sources/XML-Parser-2.34.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/perl-xml-parser/current/specs/perl-xml-parser.spec
===================================================================
--- contrib/1.1/perl-xml-parser/current/specs/perl-xml-parser.spec	2004-11-29 17:39:43 UTC (rev 5143)
+++ contrib/1.1/perl-xml-parser/current/specs/perl-xml-parser.spec	2004-11-29 19:38:50 UTC (rev 5144)
@@ -0,0 +1,54 @@
+%define perlname XML-Parser
+
+Summary:The Perl module XML-Parser.
+Name: perl-xml-parser
+Version: 2.34
+Release: 1gd
+License: Artistic, GPL
+Group: contrib
+Source: %{perlname}-%{version}.tar.gz
+URL: http://www.cpan.org/
+Requires: perl = %{perl_version}
+Requires: expat-libs
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRequires: expat-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+
+%description
+The Perl module XML-Parser
+
+%prep
+%setup -q -n %{perlname}-%{version}
+
+
+%build
+%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor </dev/null
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__make} test
+
+
+%install
+%{__make} install
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/File/Spec/.packlist
+%{__rm} -f %{buildroot}%{perl_archlib}/perllocal.pod
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+find %{buildroot} -type d -print |\
+%{__sed} "s|%{buildroot}|%dir |g" >%{name}-%{version}-filelist
+find %{buildroot} -type f -print |\
+%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist
+
+%clean
+%clean_buildroot
+
+%files -f %{name}-%{version}-filelist
+%defattr(-,root,root)
+%doc Changes MANIFEST README
+
+
+%changelog
+* Sun Nov 28 2004 Gerald Dachs <gda at tinysofa dot org> 2.34-1gd
+- fresh build
+


From svn at tinysofa.org  Mon Nov 29 20:18:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 29 Nov 2004 15:18:54 -0500 (EST)
Subject: [tinysofa-svn] r5145 - in contrib/1.1/fox/current: sources specs
Message-ID: <20041129201854.A685B344117@minbar.tinysofa.org>

Author: gda
Date: 2004-11-29 15:18:54 -0500 (Mon, 29 Nov 2004)
New Revision: 5145

Added:
   contrib/1.1/fox/current/sources/fox-1.2.11.tar.gz
Removed:
   contrib/1.1/fox/current/sources/fox-1.2.9.tar.gz
Modified:
   contrib/1.1/fox/current/specs/fox.spec
Log:
new upstream

Added: contrib/1.1/fox/current/sources/fox-1.2.11.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/fox/current/sources/fox-1.2.11.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: contrib/1.1/fox/current/sources/fox-1.2.9.tar.gz
===================================================================
(Binary files differ)

Modified: contrib/1.1/fox/current/specs/fox.spec
===================================================================
--- contrib/1.1/fox/current/specs/fox.spec	2004-11-29 19:38:50 UTC (rev 5144)
+++ contrib/1.1/fox/current/specs/fox.spec	2004-11-29 20:18:54 UTC (rev 5145)
@@ -1,7 +1,7 @@
 Summary: Shared libraries for the FOX 1.2.x toolkit.
 Name: fox
-Version: 1.2.9
-Release: 2gd
+Version: 1.2.11
+Release: 1gd
 Copyright: LGPL
 Group: contrib
 Source: ftp://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz
@@ -141,6 +141,9 @@
 %{_mandir}/man1/shutterbug.1*
 
 %changelog
+* Sun Oct 29 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.11-1gd
+- new upstream
+
 * Mon Oct 25 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.9-2gd
 - fixed requirements
 


From svn at tinysofa.org  Mon Nov 29 21:16:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 29 Nov 2004 16:16:46 -0500 (EST)
Subject: [tinysofa-svn] 
	r5147 - in tinysofa/releases/1.1: cyrus-imapd/current/specs
	openldap/current/specs openssh/current/specs portmap/current/specs
	quota/current/specs tftp/current/specs vsftpd/current/specs
	xinetd/current/specs
Message-ID: <20041129211646.73374344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-29 16:16:46 -0500 (Mon, 29 Nov 2004)
New Revision: 5147

Modified:
   tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec
   tinysofa/releases/1.1/openldap/current/specs/openldap.spec
   tinysofa/releases/1.1/openssh/current/specs/openssh.spec
   tinysofa/releases/1.1/portmap/current/specs/portmap.spec
   tinysofa/releases/1.1/quota/current/specs/quota.spec
   tinysofa/releases/1.1/tftp/current/specs/tftp.spec
   tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec
   tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec
Log:
- tcp_wrappers -> tcp_wrappers-devel


Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec
===================================================================
--- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec	2004-11-29 20:48:39 UTC (rev 5146)
+++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec	2004-11-29 21:16:46 UTC (rev 5147)
@@ -25,7 +25,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cyrus-sasl, db4, imapd-pam, libcom_err
-BuildRequires: cyrus-sasl-devel, e2fsprogs-devel, perl, perl-devel, tcp_wrappers
+BuildRequires: cyrus-sasl-devel, e2fsprogs-devel, perl, perl-devel, tcp_wrappers-devel
 BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel
 BuildRequires: autoconf, byacc, bison, flex
 Prereq: shadow-utils, glibc

Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec
===================================================================
--- tinysofa/releases/1.1/openldap/current/specs/openldap.spec	2004-11-29 20:48:39 UTC (rev 5146)
+++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec	2004-11-29 21:16:46 UTC (rev 5147)
@@ -32,7 +32,7 @@
 License: Freely distributable
 Group: extra
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: openssl-devel tcp_wrappers cyrus-sasl-devel libtool pkgconfig
+BuildRequires: openssl-devel tcp_wrappers-devel cyrus-sasl-devel libtool pkgconfig
 BuildRequires: perl
 Requires: readline 
 BuildRequires: readline-devel

Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec
===================================================================
--- tinysofa/releases/1.1/openssh/current/specs/openssh.spec	2004-11-29 20:48:39 UTC (rev 5146)
+++ tinysofa/releases/1.1/openssh/current/specs/openssh.spec	2004-11-29 21:16:46 UTC (rev 5147)
@@ -16,7 +16,7 @@
 Source4: openssh-3.8p1-selinux.patch
 Patch1: openssh-3.8p1-makecheck.patch
 Requires: openssl >= 0.9.5a, zlib >= 1.1.4
-BuildRequires: perl, openssl-devel, tcp_wrappers, groff
+BuildRequires: perl, openssl-devel, tcp_wrappers-devel, groff
 BuildRequires: zlib-devel >= 1.1.4, pam-devel >= 0.77
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ssh

Modified: tinysofa/releases/1.1/portmap/current/specs/portmap.spec
===================================================================
--- tinysofa/releases/1.1/portmap/current/specs/portmap.spec	2004-11-29 20:48:39 UTC (rev 5146)
+++ tinysofa/releases/1.1/portmap/current/specs/portmap.spec	2004-11-29 21:16:46 UTC (rev 5147)
@@ -21,7 +21,7 @@
 %service_requires
 %accountman_requires
 %if %{tcp_wrappers}
-BuildPreReq: tcp_wrappers
+BuildPreReq: tcp_wrappers-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: initscripts >= 5.54, coreutils

Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec
===================================================================
--- tinysofa/releases/1.1/quota/current/specs/quota.spec	2004-11-29 20:48:39 UTC (rev 5146)
+++ tinysofa/releases/1.1/quota/current/specs/quota.spec	2004-11-29 21:16:46 UTC (rev 5147)
@@ -6,7 +6,7 @@
 Group: main
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: initscripts >= 6.38
-BuildPreReq: e2fsprogs-devel gettext tcp_wrappers
+BuildPreReq: e2fsprogs-devel gettext tcp_wrappers-devel
 Source0: http://prdownloads.sourceforge.net/linuxquota/quota-%{version}.tar.gz
 Patch0:	quota-3.06-warnquota.patch
 Patch1: quota-3.06-no-stripping.patch

Modified: tinysofa/releases/1.1/tftp/current/specs/tftp.spec
===================================================================
--- tinysofa/releases/1.1/tftp/current/specs/tftp.spec	2004-11-29 20:48:39 UTC (rev 5146)
+++ tinysofa/releases/1.1/tftp/current/specs/tftp.spec	2004-11-29 21:16:46 UTC (rev 5147)
@@ -9,7 +9,7 @@
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
 Source2: tftp-xinetd
 Patch: tftp-0.28-malta.patch
-BuildPreReq: tcp_wrappers
+BuildPreReq: tcp_wrappers-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -120,7 +120,7 @@
 - rebuilt
 
 * Sun Feb 23 2003 Tim Powers <timp at redhat.com>
-- add BuildPreReq on tcp_wrappers
+- add BuildPreReq on tcp_wrappers-devel
 
 * Wed Jan 22 2003 Tim Powers <timp at redhat.com>
 - rebuilt

Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec
===================================================================
--- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec	2004-11-29 20:48:39 UTC (rev 5146)
+++ tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec	2004-11-29 21:16:46 UTC (rev 5147)
@@ -19,7 +19,7 @@
 Patch5: vsftpd-2.0.0-ssl.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: tcp_wrappers openssl-devel pam-devel libcap-devel
+BuildPrereq: tcp_wrappers-devel openssl-devel pam-devel libcap-devel
 Requires: logrotate, openssl
 %service_requires
 PreReq: /usr/sbin/usermod setup

Modified: tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec
===================================================================
--- tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec	2004-11-29 20:48:39 UTC (rev 5146)
+++ tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec	2004-11-29 21:16:46 UTC (rev 5147)
@@ -22,7 +22,7 @@
 Provides: inetd
 Prereq: /etc/init.d
 %service_requires
-BuildRequires: tcp_wrappers glibc-devel libtool
+BuildRequires: tcp_wrappers-devel glibc-devel libtool
 Requires: filesystem, initscripts, setup, coreutils
 URL: http://www.xinetd.org
 BuildRoot: %{_tmppath}/%{name}-root


From svn at tinysofa.org  Mon Nov 29 21:29:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 29 Nov 2004 16:29:49 -0500 (EST)
Subject: [tinysofa-svn] 
	r5148 - tinysofa/releases/1.1/kerberos5/current/specs
Message-ID: <20041129212949.EF2AD344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-29 16:29:49 -0500 (Mon, 29 Nov 2004)
New Revision: 5148

Added:
   tinysofa/releases/1.1/kerberos5/current/specs/krb5.spec
Removed:
   tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec
Log:
- rename to krb5


Deleted: tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec
===================================================================
--- tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec	2004-11-29 21:16:46 UTC (rev 5147)
+++ tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec	2004-11-29 21:29:49 UTC (rev 5148)
@@ -1,166 +0,0 @@
-Summary: Kerberos is a network authentication protocol.
-Name: kerberos5
-Version: 1.3.5
-Release: 1jh
-Group: main
-Source0: krb5-%{version}.tar.gz
-URL: http://web.mit.edu/kerberos
-License: Distributable
-Requires: libcom_err libtermcap ncurses
-BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-%description
-(MIT) Kerberos is a network authentication protocol. It is designed to provide
-strong authentication for client/server applications by using secret-key
-cryptography.  A free implementation of this protocol is available from the
-Massachusetts Institute of Technology. Kerberos is available in many commercial
-products as well.
-
-%package devel
-Group: development
-Summary: Development libraries for kerberos 5
-Requires: %{name}-libs
-Requires: libcom_err-devel
-
-%description devel
-The kerberos5-devel package contains the development libraries and header files
-for MIT kerberos5.
-
-%package libs
-Group: main
-Summary: Kerberos libraries 
-
-%description libs
-The kerberos5-libs package contains the kerberos5 libraries.
-
-
-%prep
-%setup -q -n krb5-%{version}
-
-
-%build
-pushd src
-export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et -fPIC"
-export CFLAGS="$CFLAGS -DKRB5_DNS_LOOKUP=1"
-%ifarch %{ix86} s390 ppc sparc
-export CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
-%endif
-export LDFLAGS="$LDFLAGS -pie"
-%configure \
-	--enable-shared \
-	--program-prefix=krb5 \
-	--with-system-et \
-	--enable-dns \
-	--with-netlib=-lresolv
-
-%make
-popd
-
-%install
-pushd src
-%makeinstall_std
-popd
-
-
-%clean
-%clean_buildroot
-
-
-%files
-%defattr(-,root,root)
-%attr(755,root,root) %{_bindir}/*
-%{_sbindir}/*
-%exclude %{_sbindir}/krb5-send-pr
-%{_datadir}/gnats
-%{_mandir}/man8/*
-%{_mandir}/man1/*
-%exclude %{_mandir}/man1/krb5-send-pr*
-%{_mandir}/man5/*
-%{_mandir}/man5/.k5login.5*
-
-%files libs
-%attr(755,root,root) %{_libdir}/*.so.*
-
-%files devel
-%defattr(-,root,root)
-%{_includedir}/*
-%attr(644,root,root) %{_libdir}/*.a
-%attr(755,root,root) %{_libdir}/*.so
-
-
-%changelog
-* Sun Nov 14 2004 Jaakko Heinonen <jh at tinysofa dot org>
-- exclude krb5-send-pr script
-
-* Sun Oct 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.3.5-1jh
-- 1.3.5
-- large file support
-- copile with -fPIC and links with -pie
-
-* Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 1.3.4-2ts
-- current (1.3.4-2jh) integrated as 1.3.4-2ts for release 1.1-U1
-
-* Tue Aug 31 2004 Jaakko Heinonen <jh at tinysofa dot org>
-- MITKRB5-SA-2004-002 and MITKRB5-SA-2004-003 security fixes
-
-* Thu Aug 19 2004 Jaakko Heinonen <jh at tinysofa dot org>
-- 1.3.4
-- spec cleanup
-
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.3.3-5ts
-- current (1.3.3-5jh) integrated as 1.3.3-5ts for release 1.1
-
-* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.3.3-4ts
-- current (1.3.3-3ts) integrated as 1.3.3-4ts for release 1.0-U2
-
-* Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
-- Update MIT patch to latest version of vuln fix.
-
-* Wed Jun 02 2004 tsintegrate <release at tinysofa dot org> 1.3.3-3ts
-- current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1
-
-* Wed Jun 02 2004 Omar Kilani <omar at tinysofa dot org> 1.3.3-3ok
-- Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln.
-
-* Mon May 24 2004 tsintegrate <release at tinysofa dot org> 1.3.3-2ts
-- current (1.3.3-2jh) integrated as 1.3.3-2ts for release 1.0-U1
-
-* Sun May 23 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.3.3-2jh
-- fix permissions for /usr/bin/krb5ksu and /usr/bin/krb5v4rcp
-
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.3.3-1ts
-- current (1.3.3-1ok) integrated as 1.3.3-1ts for release 1.0-U1
-
-* Thu May 13 2004 Omar Kilani <omar at tinysofa dot org> 1.3.3-1ok
-- New Upstream.
-
-* Tue May 11 2004 Omar Kilani <omar at tinysofa dot org>
-- Add BuildRequires: byacc libtermcap-devel ncurses-devel
-- Add Requires: libtermcap ncurses
-- Add Requires: libcom_err-devel to devel sub package.
-
-* Mon May 10 2004  Jaakko Heinonen <jh at tinysofa dot org> 1.3.2-4jh
-- fixed permissions for library files
-
-* Mon May 03 2004 Omar Kilani <omar at tinysofa dot org> 1.3.2-3ts
-- Rebuild
-
-* Mon May 03 2004 Jaakko Heinonen <jheinonen at users.sourceforge.net> 1.3.2-2jh
-- fixed permissions for manual and include files
-
-* Wed Apr 07 2004 Omar Kilani <omar at tinysofa dot org> 1.3.2-1ts
-- New upstream.
-
-* Tue Feb 11 2004 Tor Hveem <torh at trustix dot org> 1.3.1-4th
-- Fixed stupid error with file wildcards.
-
-* Tue Feb 10 2004 Tor Hveem <torh at trustix dot org> 1.3.1-3th
-- New package libs.
-
-* Mon Feb  9 2004 Chr. Toldnes <christht at trustix dot org> 1.3.1-2tr
-- Use system et (libcom_err)
-
-* Mon Feb  9 2004 Chr. Toldnes <christht at trustix dot org> 1.3.1-1tr
-- Initial release for Trustix
-- built shared :)  with no stack protection :(

Copied: tinysofa/releases/1.1/kerberos5/current/specs/krb5.spec (from rev 5090, tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec)
===================================================================
--- tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec	2004-11-14 18:00:01 UTC (rev 5090)
+++ tinysofa/releases/1.1/kerberos5/current/specs/krb5.spec	2004-11-29 21:29:49 UTC (rev 5148)
@@ -0,0 +1,173 @@
+Summary: Kerberos is a network authentication protocol.
+Name: krb5
+Version: 1.3.5
+Release: 2jh
+Group: main
+Source0: krb5-%{version}.tar.gz
+URL: http://web.mit.edu/kerberos
+License: Distributable
+Requires: libcom_err libtermcap ncurses
+BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel
+%rename kerberos5
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+(MIT) Kerberos is a network authentication protocol. It is designed to provide
+strong authentication for client/server applications by using secret-key
+cryptography.  A free implementation of this protocol is available from the
+Massachusetts Institute of Technology. Kerberos is available in many commercial
+products as well.
+
+%package devel
+Group: development
+Summary: Development libraries for kerberos 5
+Requires: %{name}-libs = %{version}-%{release}
+Requires: libcom_err-devel
+%rename kerberos5-devel
+
+%description devel
+The kerberos5-devel package contains the development libraries and header files
+for MIT kerberos5.
+
+%package libs
+Group: main
+Summary: Kerberos libraries 
+%rename kerberos5-libs
+
+%description libs
+The kerberos5-libs package contains the kerberos5 libraries.
+
+
+%prep
+%setup -q -n krb5-%{version}
+
+
+%build
+pushd src
+export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et -fPIC"
+export CFLAGS="$CFLAGS -DKRB5_DNS_LOOKUP=1"
+%ifarch %{ix86} s390 ppc sparc
+export CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+%endif
+export LDFLAGS="$LDFLAGS -pie"
+%configure \
+	--enable-shared \
+	--program-prefix=krb5 \
+	--with-system-et \
+	--enable-dns \
+	--with-netlib=-lresolv
+
+%make
+popd
+
+%install
+pushd src
+%makeinstall_std
+popd
+
+
+%clean
+%clean_buildroot
+
+
+%files
+%defattr(-,root,root)
+%attr(755,root,root) %{_bindir}/*
+%{_sbindir}/*
+%exclude %{_sbindir}/krb5-send-pr
+%{_datadir}/gnats
+%{_mandir}/man8/*
+%{_mandir}/man1/*
+%exclude %{_mandir}/man1/krb5-send-pr*
+%{_mandir}/man5/*
+%{_mandir}/man5/.k5login.5*
+
+%files libs
+%attr(755,root,root) %{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/*
+%attr(644,root,root) %{_libdir}/*.a
+%attr(755,root,root) %{_libdir}/*.so
+
+
+%changelog
+* Tue Nov 16 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.3.5-2jh
+- -devel requires now the same version of the -libs
+- rename to krb5
+
+* Sun Nov 14 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- exclude krb5-send-pr script
+
+* Sun Oct 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.3.5-1jh
+- 1.3.5
+- large file support
+- copile with -fPIC and link with -pie
+
+* Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 1.3.4-2ts
+- current (1.3.4-2jh) integrated as 1.3.4-2ts for release 1.1-U1
+
+* Tue Aug 31 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- MITKRB5-SA-2004-002 and MITKRB5-SA-2004-003 security fixes
+
+* Thu Aug 19 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- 1.3.4
+- spec cleanup
+
+* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.3.3-5ts
+- current (1.3.3-5jh) integrated as 1.3.3-5ts for release 1.1
+
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.3.3-4ts
+- current (1.3.3-3ts) integrated as 1.3.3-4ts for release 1.0-U2
+
+* Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
+- Update MIT patch to latest version of vuln fix.
+
+* Wed Jun 02 2004 tsintegrate <release at tinysofa dot org> 1.3.3-3ts
+- current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1
+
+* Wed Jun 02 2004 Omar Kilani <omar at tinysofa dot org> 1.3.3-3ok
+- Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln.
+
+* Mon May 24 2004 tsintegrate <release at tinysofa dot org> 1.3.3-2ts
+- current (1.3.3-2jh) integrated as 1.3.3-2ts for release 1.0-U1
+
+* Sun May 23 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.3.3-2jh
+- fix permissions for /usr/bin/krb5ksu and /usr/bin/krb5v4rcp
+
+* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.3.3-1ts
+- current (1.3.3-1ok) integrated as 1.3.3-1ts for release 1.0-U1
+
+* Thu May 13 2004 Omar Kilani <omar at tinysofa dot org> 1.3.3-1ok
+- New Upstream.
+
+* Tue May 11 2004 Omar Kilani <omar at tinysofa dot org>
+- Add BuildRequires: byacc libtermcap-devel ncurses-devel
+- Add Requires: libtermcap ncurses
+- Add Requires: libcom_err-devel to devel sub package.
+
+* Mon May 10 2004  Jaakko Heinonen <jh at tinysofa dot org> 1.3.2-4jh
+- fixed permissions for library files
+
+* Mon May 03 2004 Omar Kilani <omar at tinysofa dot org> 1.3.2-3ts
+- Rebuild
+
+* Mon May 03 2004 Jaakko Heinonen <jheinonen at users.sourceforge.net> 1.3.2-2jh
+- fixed permissions for manual and include files
+
+* Wed Apr 07 2004 Omar Kilani <omar at tinysofa dot org> 1.3.2-1ts
+- New upstream.
+
+* Tue Feb 11 2004 Tor Hveem <torh at trustix dot org> 1.3.1-4th
+- Fixed stupid error with file wildcards.
+
+* Tue Feb 10 2004 Tor Hveem <torh at trustix dot org> 1.3.1-3th
+- New package libs.
+
+* Mon Feb  9 2004 Chr. Toldnes <christht at trustix dot org> 1.3.1-2tr
+- Use system et (libcom_err)
+
+* Mon Feb  9 2004 Chr. Toldnes <christht at trustix dot org> 1.3.1-1tr
+- Initial release for Trustix
+- built shared :)  with no stack protection :(


From svn at tinysofa.org  Mon Nov 29 21:44:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 29 Nov 2004 16:44:00 -0500 (EST)
Subject: [tinysofa-svn] 
	r5149 - in tinysofa/releases/1.1: . krb5/current/sources
	krb5/current/specs
Message-ID: <20041129214400.6DA66344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-29 16:43:59 -0500 (Mon, 29 Nov 2004)
New Revision: 5149

Added:
   tinysofa/releases/1.1/krb5/
   tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz
   tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz.asc
   tinysofa/releases/1.1/krb5/current/specs/krb5.spec
Removed:
   tinysofa/releases/1.1/kerberos5/
Log:
- rename kerberos5 to krb5


Copied: tinysofa/releases/1.1/krb5 (from rev 4868, tinysofa/releases/1.1/kerberos5)

Copied: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz (from rev 5045, tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.5.tar.gz)

Copied: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz.asc (from rev 5045, tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.5.tar.gz.asc)

Copied: tinysofa/releases/1.1/krb5/current/specs/krb5.spec (from rev 5148, tinysofa/releases/1.1/kerberos5/current/specs/krb5.spec)


From svn at tinysofa.org  Mon Nov 29 21:58:11 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 29 Nov 2004 16:58:11 -0500 (EST)
Subject: [tinysofa-svn] r5150 - in contrib/1.1: . synaptic synaptic/current
	synaptic/current/sources synaptic/current/specs
Message-ID: <20041129215811.83BA2344117@minbar.tinysofa.org>

Author: gda
Date: 2004-11-29 16:58:11 -0500 (Mon, 29 Nov 2004)
New Revision: 5150

Added:
   contrib/1.1/synaptic/
   contrib/1.1/synaptic/current/
   contrib/1.1/synaptic/current/sources/
   contrib/1.1/synaptic/current/sources/synaptic-0.55.3-tinysofa-nodoc.patch
   contrib/1.1/synaptic/current/sources/synaptic-0.55.3.tar.gz
   contrib/1.1/synaptic/current/specs/
   contrib/1.1/synaptic/current/specs/synaptic.spec
   contrib/1.1/synaptic/pristine/
   contrib/1.1/synaptic/releases/
Log:
new in contrib

Added: contrib/1.1/synaptic/current/sources/synaptic-0.55.3-tinysofa-nodoc.patch
===================================================================
--- contrib/1.1/synaptic/current/sources/synaptic-0.55.3-tinysofa-nodoc.patch	2004-11-29 21:43:59 UTC (rev 5149)
+++ contrib/1.1/synaptic/current/sources/synaptic-0.55.3-tinysofa-nodoc.patch	2004-11-29 21:58:11 UTC (rev 5150)
@@ -0,0 +1,64 @@
+--- synaptic-0.55.3/configure.orig	2004-11-29 14:11:44.439733664 +0100
++++ synaptic-0.55.3/configure	2004-11-29 14:12:03.113894760 +0100
+@@ -6568,50 +6568,6 @@
+ synapticlocaledir='${prefix}/${DATADIRNAME}/locale'
+ 
+ 
+-# Extract the first word of "xmlto", so it can be a program name with args.
+-set dummy xmlto; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_XMLTO+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$XMLTO"; then
+-  ac_cv_prog_XMLTO="$XMLTO" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_XMLTO="yes"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  test -z "$ac_cv_prog_XMLTO" && ac_cv_prog_XMLTO="no"
+-fi
+-fi
+-XMLTO=$ac_cv_prog_XMLTO
+-if test -n "$XMLTO"; then
+-  echo "$as_me:$LINENO: result: $XMLTO" >&5
+-echo "${ECHO_T}$XMLTO" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test x"$XMLTO" == xno; then
+-	{ { echo "$as_me:$LINENO: error: You need xmlto to build the documentation. Apt-get it or download it from http://cyberelk.net/tim/xmlto/" >&5
+-echo "$as_me: error: You need xmlto to build the documentation. Apt-get it or download it from http://cyberelk.net/tim/xmlto/" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-
+-
+ 	pkg_modules="gtk+-2.0 >= 2.4.0, libglade-2.0 >= 2.0.0, pango >= 1.0.0, glib-2.0"
+ 
+   succeeded=no
+--- synaptic-0.55.3/Makefile.in.orig	2004-11-29 14:11:17.242868216 +0100
++++ synaptic-0.55.3/Makefile.in	2004-11-29 14:11:30.809805728 +0100
+@@ -174,7 +174,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = data common gtk man pixmaps po help doc
++SUBDIRS = data common gtk man pixmaps po
+ 
+ EXTRA_DIST = config.h.in synaptic.spec README.debtags FAQ intltool-extract.in intltool-merge.in intltool-update.in TRANSLATORS README.tasks README.supported
+ subdir = .

Added: contrib/1.1/synaptic/current/sources/synaptic-0.55.3.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/synaptic/current/sources/synaptic-0.55.3.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/synaptic/current/specs/synaptic.spec
===================================================================
--- contrib/1.1/synaptic/current/specs/synaptic.spec	2004-11-29 21:43:59 UTC (rev 5149)
+++ contrib/1.1/synaptic/current/specs/synaptic.spec	2004-11-29 21:58:11 UTC (rev 5150)
@@ -0,0 +1,66 @@
+%define icewm_menu 1
+
+Summary: Synaptic is a graphical package management program for apt
+Name: synaptic
+Version: 0.55.3
+Release: 1gd
+Group: contrib
+URL: http://www.nongnu.org/synaptic/index.html
+Source: %{name}-%{version}.tar.gz
+Patch: %{name}-%{version}-tinysofa-nodoc.patch
+Copyright: GPL
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: apt gtk libglade
+BuildRequires: apt-devel gettext perl-xml-parser pkgconfig
+BuildRequires: gtk-devel libglade-devel gcc-c++
+
+%description
+Synaptic is a graphical package management program for apt. It provides the
+same features as the apt-get command line utility with a GUI front-end based
+on Gtk+ or WINGs.
+
+Features
+%prep
+
+%setup
+%patch -p1 
+
+
+%build
+%configure
+%make
+
+%install
+
+#mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man1,man8}
+%makeinstall
+
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "Synaptic Package Manager"                  synaptic.png synaptic
+__EOF__
+%endif
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%doc ABOUT-NLS COPYING README AUTHORS ChangeLog FAQ
+%doc README.supported README.tasks INSTALL TODO NEWS TRANSLATORS
+%{_sbindir}/synaptic
+%{_sysconfdir}/X11/sysconfig/synaptic.desktop
+%{_datadir}/applications/synaptic.desktop
+%dir %{_datadir}/synaptic
+%{_datadir}/synaptic/*
+%{_datadir}/locale/*
+%{_datadir}/pixmaps/*
+%{_mandir}/man8/*
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
+
+%changelog
+* Mon Nov 29 2004 Gerald Dachs <gda at tinysofa dot org> 0.55.3-1gd
+- new in tinysofa contrib


From svn at tinysofa.org  Tue Nov 30 06:40:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 30 Nov 2004 01:40:47 -0500 (EST)
Subject: [tinysofa-svn] 
	r5151 - tinysofa/releases/1.1/wireless-tools/current/specs
Message-ID: <20041130064047.C30B9344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-30 01:40:46 -0500 (Tue, 30 Nov 2004)
New Revision: 5151

Modified:
   tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec
Log:
- make libiw.so lymlink relative


Modified: tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec
===================================================================
--- tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec	2004-11-29 21:58:11 UTC (rev 5150)
+++ tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec	2004-11-30 06:40:46 UTC (rev 5151)
@@ -23,18 +23,18 @@
 
 %build
 make clean
-make OPT_FLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1
+%make OPT_FLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT{/sbin,/%{_lib},%{_mandir}/man8,%{_includedir},%{_libdir}}
+mkdir -p %{buildroot}{/sbin,/%{_lib},%{_mandir}/man8,%{_includedir},%{_libdir}}
 
-make install INSTALL_DIR=$RPM_BUILD_ROOT/sbin \
-	INSTALL_LIB=$RPM_BUILD_ROOT/%{_lib} \
-	INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \
-	INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT/%{_lib}/libiw.a
-ln -sf /%{_lib}/libiw.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libiw.so
+make install INSTALL_DIR=%{buildroot}/sbin \
+	INSTALL_LIB=%{buildroot}/%{_lib} \
+	INSTALL_INC=%{buildroot}%{_includedir} \
+	INSTALL_MAN=%{buildroot}%{_mandir}
+rm -f %{buildroot}/%{_lib}/libiw.a
+ln -s ../../%{_lib}/libiw.so.%{version} %{buildroot}%{_libdir}/libiw.so
 
 
 %clean


From svn at tinysofa.org  Tue Nov 30 06:43:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 30 Nov 2004 01:43:28 -0500 (EST)
Subject: [tinysofa-svn] 
	r5152 - tinysofa/releases/1.1/wireless-tools/current/specs
Message-ID: <20041130064328.ED867344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-30 01:43:28 -0500 (Tue, 30 Nov 2004)
New Revision: 5152

Modified:
   tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec
Log:
- fix optflags usage


Modified: tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec
===================================================================
--- tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec	2004-11-30 06:40:46 UTC (rev 5151)
+++ tinysofa/releases/1.1/wireless-tools/current/specs/wireless-tools.spec	2004-11-30 06:43:28 UTC (rev 5152)
@@ -23,7 +23,7 @@
 
 %build
 make clean
-%make OPT_FLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1
+%make CFLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1
 
 
 %install


From svn at tinysofa.org  Tue Nov 30 07:16:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 30 Nov 2004 02:16:22 -0500 (EST)
Subject: [tinysofa-svn] r5153 - tinysofa/releases/1.1/openssl/current/specs
Message-ID: <20041130071622.A9F1E344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-30 02:16:21 -0500 (Tue, 30 Nov 2004)
New Revision: 5153

Modified:
   tinysofa/releases/1.1/openssl/current/specs/openssl.spec
Log:
- spec cleanup


Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec
===================================================================
--- tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-11-30 06:43:28 UTC (rev 5152)
+++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-11-30 07:16:21 UTC (rev 5153)
@@ -188,24 +188,7 @@
         $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc && \
 rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp
 
-#
-# Generate site package filelist
-#
-pushd $RPM_BUILD_ROOT/%{py_sitedir}
-echo %dir %{py_sitedir}/M2Crypto >> ${RPM_BUILD_DIR}/%{name}-%{version}/sitefiles.txt
-echo %dir %{py_sitedir}/M2Crypto/PGP >> ${RPM_BUILD_DIR}/%{name}-%{version}/sitefiles.txt
-echo %dir %{py_sitedir}/M2Crypto/SSL >> ${RPM_BUILD_DIR}/%{name}-%{version}/sitefiles.txt
-for file in `find . -name \*.py`; do
-        echo %{py_sitedir}/${file}
-        echo %ghost %{py_sitedir}/${file}c
-done >> ${RPM_BUILD_DIR}/%{name}-%{version}/sitefiles.txt
 
-for file in `find . -name \*.so`; do
-        echo "%attr(755,root,root) %{py_sitedir}/${file}"
-done >> ${RPM_BUILD_DIR}/%{name}-%{version}/sitefiles.txt
-popd
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -254,9 +237,10 @@
 %{_mandir}/man7/*
 %{_libdir}/pkgconfig/openssl.pc
  
-%files python -f sitefiles.txt
+%files python
 %defattr(-,root,root)
 %doc m2crypto-%{m2crypto_version}/{BUGS,CHANGES,LIC*,README}
+%{py_sitedir}/M2Crypto
 
 
 %changelog


From svn at tinysofa.org  Tue Nov 30 16:43:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 30 Nov 2004 11:43:31 -0500 (EST)
Subject: [tinysofa-svn] r5154 - contrib/1.1/fox/current/specs
Message-ID: <20041130164331.2272E344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-30 11:43:30 -0500 (Tue, 30 Nov 2004)
New Revision: 5154

Modified:
   contrib/1.1/fox/current/specs/fox.spec
Log:
- fix groups
- use %configure


Modified: contrib/1.1/fox/current/specs/fox.spec
===================================================================
--- contrib/1.1/fox/current/specs/fox.spec	2004-11-30 07:16:21 UTC (rev 5153)
+++ contrib/1.1/fox/current/specs/fox.spec	2004-11-30 16:43:30 UTC (rev 5154)
@@ -63,7 +63,7 @@
 
 %package -n pathfinder
 Summary: contrib
-Group: X11/Applications
+Group: contrib
 Version: 1.0.0
 
 %description -n pathfinder
@@ -81,8 +81,14 @@
 %setup -q
 
 %build
+export PATH="$PATH:/usr/X11R6/bin"
 CPPFLAGS="$RPM_OPT_FLAGS -frtti" CFLAGS="$RPM_OPT_FLAGS -frtti"
-./configure --prefix=%{_prefix} --mandir=\${prefix}/share/man --enable-release --with-xft --with-xcursor --enable-cups --with-opengl
+%configure \
+	--enable-release \
+	--with-xft \
+	--with-xcursor \
+	--enable-cups \
+	--with-opengl
 make
 
 %install


From svn at tinysofa.org  Tue Nov 30 16:44:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 30 Nov 2004 11:44:34 -0500 (EST)
Subject: [tinysofa-svn] 
	r5155 - in contrib/1.1: cgdb/current/specs compface/current/specs
	dnsmasq/current/specs kernel-utils26/current/specs
	lesstif/current/specs spamassassin/current/specs xfe/current/specs
Message-ID: <20041130164434.7B28F344117@minbar.tinysofa.org>

Author: jh
Date: 2004-11-30 11:44:33 -0500 (Tue, 30 Nov 2004)
New Revision: 5155

Modified:
   contrib/1.1/cgdb/current/specs/cgdb.spec
   contrib/1.1/compface/current/specs/compface.spec
   contrib/1.1/dnsmasq/current/specs/dnsmasq.spec
   contrib/1.1/kernel-utils26/current/specs/kernel-utils26.spec
   contrib/1.1/lesstif/current/specs/lesstif.spec
   contrib/1.1/spamassassin/current/specs/spamassassin.spec
   contrib/1.1/xfe/current/specs/xfe.spec
Log:
- fix groups


Modified: contrib/1.1/cgdb/current/specs/cgdb.spec
===================================================================
--- contrib/1.1/cgdb/current/specs/cgdb.spec	2004-11-30 16:43:30 UTC (rev 5154)
+++ contrib/1.1/cgdb/current/specs/cgdb.spec	2004-11-30 16:44:33 UTC (rev 5155)
@@ -3,7 +3,7 @@
 Version: 0.5.0
 Release: 1gd
 License: GPL
-Group:   conrib
+Group: contrib
 URL:     http://cgdb.sourceforge.net
 Source:  %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root

Modified: contrib/1.1/compface/current/specs/compface.spec
===================================================================
--- contrib/1.1/compface/current/specs/compface.spec	2004-11-30 16:43:30 UTC (rev 5154)
+++ contrib/1.1/compface/current/specs/compface.spec	2004-11-30 16:44:33 UTC (rev 5155)
@@ -3,7 +3,7 @@
 Version: 1.4
 Release: 1gd
 License: MIT
-Group: Applications/System
+Group: contrib
 URL: http://freshmeat.net/projects/compface/
 Source: http://www.ibiblio.org/pub/Linux/apps/graphics/convert/compface-%{version}.tar.gz
 Patch0: compface-1.4-errno.patch
@@ -19,7 +19,7 @@
 
 %package devel
 Summary: Static library and header file for compface
-Group: Development/Libraries
+Group: contrib
 
 %description devel
 This package contains the static compface library which can be used to allow

Modified: contrib/1.1/dnsmasq/current/specs/dnsmasq.spec
===================================================================
--- contrib/1.1/dnsmasq/current/specs/dnsmasq.spec	2004-11-30 16:43:30 UTC (rev 5154)
+++ contrib/1.1/dnsmasq/current/specs/dnsmasq.spec	2004-11-30 16:44:33 UTC (rev 5155)
@@ -2,7 +2,7 @@
 Name:     dnsmasq
 Version:  2.18
 Release:  1gd
-Group:    Network/Services
+Group: contrib
 Source:   http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
 Source1:  %{name}.initd
 Source2:  %{name}.conf

Modified: contrib/1.1/kernel-utils26/current/specs/kernel-utils26.spec
===================================================================
--- contrib/1.1/kernel-utils26/current/specs/kernel-utils26.spec	2004-11-30 16:43:30 UTC (rev 5154)
+++ contrib/1.1/kernel-utils26/current/specs/kernel-utils26.spec	2004-11-30 16:44:33 UTC (rev 5155)
@@ -2,7 +2,7 @@
 Name:           kernel-utils26
 Version:        2.4
 Release: 1gd
-Group:          System Environment/Base
+Group: contrib
 License:        GPL/OSL
 Source0:        microcode_ctl-1.06.tar.gz
 Source1:	microcode_ctl.init

Modified: contrib/1.1/lesstif/current/specs/lesstif.spec
===================================================================
--- contrib/1.1/lesstif/current/specs/lesstif.spec	2004-11-30 16:43:30 UTC (rev 5154)
+++ contrib/1.1/lesstif/current/specs/lesstif.spec	2004-11-30 16:44:33 UTC (rev 5155)
@@ -43,7 +43,7 @@
 
 %package mwm
 Summary: Lesstif Motif window manager clone based on fvwm
-Group: User Interface/Desktops
+Group: contrib
 Requires: lesstif = %{version}
 Obsoletes: motif-mwm
 

Modified: contrib/1.1/spamassassin/current/specs/spamassassin.spec
===================================================================
--- contrib/1.1/spamassassin/current/specs/spamassassin.spec	2004-11-30 16:43:30 UTC (rev 5154)
+++ contrib/1.1/spamassassin/current/specs/spamassassin.spec	2004-11-30 16:44:33 UTC (rev 5155)
@@ -1,7 +1,7 @@
 %define real_name Mail-SpamAssassin
 
 Summary:        a spam filter for email which can be invoked from mail delivery agents
-Group:          contrib
+Group: contrib
 Name: spamassassin
 Version: 3.0.0
 Release: 1gd
@@ -29,7 +29,7 @@
 
 %package tools
 Summary:        Miscellaneous tools and documentation for SpamAssassin
-Group:          contrib
+Group: contrib
 Requires: perl-mail-spamassassin = %{version}-%{release}
 
 %description tools
@@ -40,7 +40,7 @@
 Summary:        %{real_name} -- SpamAssassin e-mail filter Perl modules
 Requires: perl >= 5.6.1 perl(HTML::Parser) perl(Digest::SHA1)
 BuildRequires: perl >= 5.6.1 perl(HTML::Parser) perl(Digest::SHA1)
-Group:          Contrib
+Group: contrib
 
 %description -n perl-mail-spamassassin
 Mail::SpamAssassin is a module to identify spam using text analysis and

Modified: contrib/1.1/xfe/current/specs/xfe.spec
===================================================================
--- contrib/1.1/xfe/current/specs/xfe.spec	2004-11-30 16:43:30 UTC (rev 5154)
+++ contrib/1.1/xfe/current/specs/xfe.spec	2004-11-30 16:44:33 UTC (rev 5155)
@@ -6,7 +6,7 @@
 Summary: X File Explorer (Xfe) is a filemanager for X. 
 Release: 1gd
 License: GPL
-Group: File tools
+Group: contrib
 Requires: fox >= 1.2 libpng >= 1.0
 BuildRequires: gcc-c++
 BuildRequires: fox >= 1.2 fox-devel >= 1.2 libpng-devel >= 1.0