From svn at tinysofa.org  Wed Jun  1 04:00:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  1 Jun 2005 00:00:06 -0400 (EDT)
Subject: [tinysofa-svn] r6397 - tinysofa/releases/classic/2.0/samba
Message-ID: <20050601040006.1E7183451A3@minbar.tinysofa.org>

Author: jh
Date: 2005-05-31 23:59:59 -0400 (Tue, 31 May 2005)
New Revision: 6397

Removed:
   tinysofa/releases/classic/2.0/samba/current/
Log:
- remove




From svn at tinysofa.org  Wed Jun  1 04:01:32 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  1 Jun 2005 00:01:32 -0400 (EDT)
Subject: [tinysofa-svn] r6398 - tinysofa/releases/classic/2.0/samba
Message-ID: <20050601040132.C882C3451A4@minbar.tinysofa.org>

Author: jh
Date: 2005-06-01 00:01:24 -0400 (Wed, 01 Jun 2005)
New Revision: 6398

Added:
   tinysofa/releases/classic/2.0/samba/current/
Log:
- go back to revision 6386


Copied: tinysofa/releases/classic/2.0/samba/current (from rev 6386, tinysofa/releases/classic/2.0/samba/current)



From svn at tinysofa.org  Wed Jun  1 08:50:05 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  1 Jun 2005 04:50:05 -0400 (EDT)
Subject: [tinysofa-svn] r6399 - in
	tinysofa/releases/classic/2.0/initscripts/current: sources specs
Message-ID: <20050601085005.DC71E344F48@minbar.tinysofa.org>

Author: jh
Date: 2005-06-01 04:49:56 -0400 (Wed, 01 Jun 2005)
New Revision: 6399

Added:
   tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-lvm2.patch
Modified:
   tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
Log:
- add lvm2 supoprt

Added: tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-lvm2.patch
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-lvm2.patch	2005-06-01 04:01:24 UTC (rev 6398)
+++ tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-lvm2.patch	2005-06-01 08:49:56 UTC (rev 6399)
@@ -0,0 +1,23 @@
+--- ./rc.d/rc.sysinit.oo	2005-06-01 11:25:42.000000000 +0300
++++ ./rc.d/rc.sysinit	2005-06-01 11:32:57.000000000 +0300
+@@ -342,6 +342,20 @@
+     fi
+ fi
+ 
++# LVM2 initialization
++if [ -x /sbin/lvm.static ]; then
++    if ! LC_ALL=C fgrep -q "device-mapper" /proc/devices 2>/dev/null ; then
++	modprobe dm-mod >/dev/null 2>&1
++    fi
++    /bin/rm -f /dev/mapper/control &> /dev/null
++    echo "mkdmnod" | /sbin/nash --quiet >/dev/null 2>&1
++    if [ -c /dev/mapper/control -a -x /sbin/lvm.static ]; then
++	if /sbin/lvm.static vgscan --mknodes --ignorelockingfailure > /dev/null 2>&1 ; then
++	    action $"Setting up Logical Volume Management:" /sbin/lvm.static vgchange -a y --ignorelockingfailure
++	fi
++    fi
++fi
++
+ # LVM initialization
+ if [ -f /etc/lvmtab ]; then
+     [ -e /proc/lvm ] || modprobe lvm-mod > /dev/null 2>&1

Modified: tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-06-01 04:01:24 UTC (rev 6398)
+++ tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-06-01 08:49:56 UTC (rev 6399)
@@ -3,7 +3,7 @@
 Version: 7.31.9
 License: GPL
 Group: main
-Release: 15jh
+Release: 16jh
 Source: initscripts-%{version}.tar.bz2
 Source1: sysctl.grsec
 Source2: sysctl.raid
@@ -18,6 +18,7 @@
 Patch7: initscripts-7.31.9-usbfs.patch
 Patch8: initscripts-7.31.9-udev-support.patch
 Patch9: initscripts-7.31.9-legacy-ups.patch
+Patch10: initscripts-7.31.9-lvm2.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: agetty, gawk, sed, mktemp, e2fsprogs >= 1.15
 Requires: procps, sysklogd >= 1.3.31
@@ -54,6 +55,7 @@
 %patch7 -p1 -b .usbfs~
 %patch8 -p1 -b .udev~
 %patch9 -p1 -b .legacy-ups~
+%patch10 -p1 -b .lvm2~
 
 find . -name '*~'|xargs rm -f
 
@@ -224,6 +226,9 @@
 
 
 %changelog
+* Wed Jun  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-16jh
+- add lvm2 supoprt
+
 * Thu May 19 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-15jh
 - add md sysctl options to sysctl.conf
 - remove legacy UPS code (for nut)



From svn at tinysofa.org  Fri Jun  3 06:40:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  3 Jun 2005 02:40:26 -0400 (EDT)
Subject: [tinysofa-svn] r6400 - in
	tinysofa/releases/classic/2.0/initscripts/current: sources specs
Message-ID: <20050603064026.46B9E3450B9@minbar.tinysofa.org>

Author: jh
Date: 2005-06-03 02:40:16 -0400 (Fri, 03 Jun 2005)
New Revision: 6400

Added:
   tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-fs.patch
Modified:
   tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
Log:
- handle more network file systems

Added: tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-fs.patch
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-fs.patch	2005-06-01 08:49:56 UTC (rev 6399)
+++ tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-fs.patch	2005-06-03 06:40:16 UTC (rev 6400)
@@ -0,0 +1,11 @@
+--- ./rc.d/rc.sysinit.cifs	2005-06-03 09:25:32.000000000 +0300
++++ ./rc.d/rc.sysinit	2005-06-03 09:38:20.000000000 +0300
+@@ -542,7 +542,7 @@
+ # Mount all other filesystems (except for NFS and /proc, which is already
+ # mounted). Contrary to standard usage,
+ # filesystems are NOT unmounted in single user mode.
+-action $"Mounting local filesystems: " mount -a -t nonfs,smbfs,ncpfs -O no_netdev
++action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs -O no_netdev
+ 
+ # check remaining quotas other than root
+ if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then

Modified: tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-06-01 08:49:56 UTC (rev 6399)
+++ tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-06-03 06:40:16 UTC (rev 6400)
@@ -19,6 +19,7 @@
 Patch8: initscripts-7.31.9-udev-support.patch
 Patch9: initscripts-7.31.9-legacy-ups.patch
 Patch10: initscripts-7.31.9-lvm2.patch
+Patch11: initscripts-7.31.9-fs.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: agetty, gawk, sed, mktemp, e2fsprogs >= 1.15
 Requires: procps, sysklogd >= 1.3.31
@@ -56,6 +57,7 @@
 %patch8 -p1 -b .udev~
 %patch9 -p1 -b .legacy-ups~
 %patch10 -p1 -b .lvm2~
+%patch11 -p1 -b .fs~
 
 find . -name '*~'|xargs rm -f
 
@@ -226,6 +228,9 @@
 
 
 %changelog
+* Fri Jun  3 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-17jh
+- handle more network file systems
+
 * Wed Jun  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-16jh
 - add lvm2 supoprt
 



From svn at tinysofa.org  Sat Jun  4 07:47:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  4 Jun 2005 03:47:57 -0400 (EDT)
Subject: [tinysofa-svn] r6401 - in
	tinysofa/releases/classic/2.0/tar/current: sources specs
Message-ID: <20050604074757.BF6533450C3@minbar.tinysofa.org>

Author: jh
Date: 2005-06-04 03:47:37 -0400 (Sat, 04 Jun 2005)
New Revision: 6401

Added:
   tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.026.tar.gz
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.026.tar.gz
Removed:
   tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.023.tar.gz
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.023.tar.gz
Modified:
   tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
Log:
- 1.02.026

Deleted: tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.023.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.026.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.026.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.023.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.026.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.026.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-06-03 06:40:16 UTC (rev 6400)
+++ tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-06-04 07:47:37 UTC (rev 6401)
@@ -1,8 +1,8 @@
-%define libarchive_version	1.02.023
+%define libarchive_version	1.02.026
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.02.023
+Version: 1.02.026
 Release: 1jh
 License: BSD
 Group: main
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Sat Jun  4 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.026-1jh
+- 1.02.026
+
 * Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.023-1jh
 - 1.02.023
 - update eilseq patch



From svn at tinysofa.org  Sun Jun  5 14:19:51 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 10:19:51 -0400 (EDT)
Subject: [tinysofa-svn] r6402 -
	tinysofa/releases/classic/2.0/python/current/specs
Message-ID: <20050605141951.CE44834510B@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 10:19:45 -0400 (Sun, 05 Jun 2005)
New Revision: 6402

Modified:
   tinysofa/releases/classic/2.0/python/current/specs/python.spec
Log:
- own sitedir under /usr/lib on x84_64

Modified: tinysofa/releases/classic/2.0/python/current/specs/python.spec
===================================================================
--- tinysofa/releases/classic/2.0/python/current/specs/python.spec	2005-06-04 07:47:37 UTC (rev 6401)
+++ tinysofa/releases/classic/2.0/python/current/specs/python.spec	2005-06-05 14:19:45 UTC (rev 6402)
@@ -9,7 +9,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}
-Release: 2gd
+Release: 3jh
 License: PSF - see LICENSE
 Group: main
 Provides: python-abi = %{pybasever}
@@ -299,6 +299,10 @@
 %dir %{_libdir}/python%{pybasever}/lib-dynload
 %attr(755,root,root) %{_libdir}/python%{pybasever}/lib-dynload/*.so
 %exclude %{_libdir}/python%{pybasever}/lib-tk
+%if %{_lib} == lib64
+%attr(0755,root,root) %dir /usr/lib/python%{pybasever}
+%attr(0755,root,root) %dir /usr/lib/python%{pybasever}/site-packages
+%endif
 
 %files jp-codecs
 %defattr(644,root,root,755)
@@ -335,6 +339,9 @@
 
 
 %changelog
+* Sun Jun  5 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.4-3jh
+- own sitedir under /usr/lib on x84_64
+
 * Sat Feb 05 2005 Gerald Dachs <gda at tinsofa dot org> 2.4-2gd
 - applied CAN-2005-0089 patch
 



From svn at tinysofa.org  Sun Jun  5 15:15:54 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 11:15:54 -0400 (EDT)
Subject: [tinysofa-svn] r6403 - contrib/classic/2.0/bittorrent/current/specs
Message-ID: <20050605151554.8D749344F84@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 11:15:48 -0400 (Sun, 05 Jun 2005)
New Revision: 6403

Modified:
   contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec
Log:
- install site files under /usr/lib on x86_64


Modified: contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec
===================================================================
--- contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec	2005-06-05 14:19:45 UTC (rev 6402)
+++ contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec	2005-06-05 15:15:48 UTC (rev 6403)
@@ -1,3 +1,8 @@
+# on x86_64 we must have sitedir under /usr/lib because this is noarch
+# package
+%ifarch x86_64
+%define py_sitedir	%{py_prefix}/lib/python%{py_version}
+%endif
 Name: bittorrent
 Version: 4.0.1
 Release: 1jh



From svn at tinysofa.org  Sun Jun  5 15:21:03 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 11:21:03 -0400 (EDT)
Subject: [tinysofa-svn] r6404 -
	contrib/classic/2.0/courier-imap/current/specs
Message-ID: <20050605152103.7859C3450CD@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 11:20:57 -0400 (Sun, 05 Jun 2005)
New Revision: 6404

Modified:
   contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec
Log:
- work around build problem on x86_64


Modified: contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec
===================================================================
--- contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec	2005-06-05 15:15:48 UTC (rev 6403)
+++ contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec	2005-06-05 15:20:57 UTC (rev 6404)
@@ -88,7 +88,10 @@
         CXXFLAGS="`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g'` -fexceptions" \
         XCFLAGS="`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g'` -fexceptions" \
         TCFLAGS="`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g'` -fexceptions" \
+%ifarch x86_64
+	# XXX: this is broken, makefiles should be fixed
 	LDFLAGS="-pie" \
+%endif
 	   ./configure --prefix=%{_prefix} \
 	   --mandir=%{_mandir} \
 	   --localstatedir=%{_localstatedir} \



From svn at tinysofa.org  Sun Jun  5 15:35:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 11:35:44 -0400 (EDT)
Subject: [tinysofa-svn] r6406 - contrib/classic/2.0/irssi/current/specs
Message-ID: <20050605153544.B15973450FB@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 11:35:40 -0400 (Sun, 05 Jun 2005)
New Revision: 6406

Modified:
   contrib/classic/2.0/irssi/current/specs/irssi.spec
Log:
- fix perl directory


Modified: contrib/classic/2.0/irssi/current/specs/irssi.spec
===================================================================
--- contrib/classic/2.0/irssi/current/specs/irssi.spec	2005-06-05 15:29:49 UTC (rev 6405)
+++ contrib/classic/2.0/irssi/current/specs/irssi.spec	2005-06-05 15:35:40 UTC (rev 6406)
@@ -42,7 +42,7 @@
         --with-socks \
         --with-proxy \
         --with-perl="yes" \
-	--with-perl-lib=$RPM_BUILD_ROOT%perl_sitelib \
+	--with-perl-lib=%{buildroot}%{perl_sitarch} \
 	--with-gc \
         --with-ncurses
 



From svn at tinysofa.org  Sun Jun  5 15:42:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 11:42:47 -0400 (EDT)
Subject: [tinysofa-svn] r6407 - contrib/classic/2.0/clearsilver/current/specs
Message-ID: <20050605154247.E978D34510A@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 11:42:42 -0400 (Sun, 05 Jun 2005)
New Revision: 6407

Modified:
   contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec
Log:
- compile with -fPIC


Modified: contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec
===================================================================
--- contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec	2005-06-05 15:35:40 UTC (rev 6406)
+++ contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec	2005-06-05 15:42:42 UTC (rev 6407)
@@ -45,9 +45,11 @@
 clearsilver templating system.
 
 %prep
-%setup 
+%setup -q
 
 %build
+# XXX: PIC shouldn't be used everywhere
+CFLAGS="$RPM_OPT_FLAGS -fPIC" \
 %configure --prefix=%{_prefix} --with-python=%{_bindir}/python --enable-gettext
 %{__make}
 



From svn at tinysofa.org  Sun Jun  5 16:32:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 12:32:22 -0400 (EDT)
Subject: [tinysofa-svn] r6408 -
	contrib/classic/2.0/perl-mail-clamav/current/specs
Message-ID: <20050605163222.C1558344F86@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 12:32:16 -0400 (Sun, 05 Jun 2005)
New Revision: 6408

Modified:
   contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
Log:
- add BuildRequires: bzip2-devel


Modified: contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
===================================================================
--- contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-05 15:42:42 UTC (rev 6407)
+++ contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-05 16:32:16 UTC (rev 6408)
@@ -8,7 +8,7 @@
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
 URL: http://www.cpan.org/
-Requires: perl = %{perl_version} perl-inline clamav zlib gmp-devel
+Requires: perl = %{perl_version} perl-inline clamav zlib gmp-devel bzip2-devel
 BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
 BuildRequires: perl-inline clamav-devel zlib-devel gmp-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}



From svn at tinysofa.org  Sun Jun  5 16:32:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 12:32:49 -0400 (EDT)
Subject: [tinysofa-svn] r6409 -
	contrib/classic/2.0/perl-mail-clamav/current/specs
Message-ID: <20050605163249.E23D6344F86@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 12:32:44 -0400 (Sun, 05 Jun 2005)
New Revision: 6409

Modified:
   contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
Log:
- bump up release for rebuild


Modified: contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
===================================================================
--- contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-05 16:32:16 UTC (rev 6408)
+++ contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-05 16:32:44 UTC (rev 6409)
@@ -3,7 +3,7 @@
 Summary: Perl extension for the clamav virus scanner
 Name: perl-mail-clamav
 Version: 0.13
-Release: 1gd
+Release: 2jh
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz



From svn at tinysofa.org  Sun Jun  5 16:35:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 12:35:24 -0400 (EDT)
Subject: [tinysofa-svn] r6410 - contrib/classic/2.0/pango/current/specs
Message-ID: <20050605163524.7D1BF3450B8@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 12:35:18 -0400 (Sun, 05 Jun 2005)
New Revision: 6410

Modified:
   contrib/classic/2.0/pango/current/specs/pango.spec
Log:
- add X to path


Modified: contrib/classic/2.0/pango/current/specs/pango.spec
===================================================================
--- contrib/classic/2.0/pango/current/specs/pango.spec	2005-06-05 16:32:44 UTC (rev 6409)
+++ contrib/classic/2.0/pango/current/specs/pango.spec	2005-06-05 16:35:18 UTC (rev 6410)
@@ -62,6 +62,7 @@
 %patch5 -p1 -b .lib64
 
 %build
+export PATH="$PATH:/usr/X11R6/bin"
 
 ## FIXME remove this hack when X is fixed
 export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/X11R6/lib64/pkgconfig



From svn at tinysofa.org  Sun Jun  5 16:37:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 12:37:24 -0400 (EDT)
Subject: [tinysofa-svn] r6411 - contrib/classic/2.0/xfe/current/specs
Message-ID: <20050605163724.0EEB33450F3@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 12:37:18 -0400 (Sun, 05 Jun 2005)
New Revision: 6411

Modified:
   contrib/classic/2.0/xfe/current/specs/xfe.spec
Log:
- change %{_libdir}/foxicons to /usr/lib/foxicons (problem on x86_64)


Modified: contrib/classic/2.0/xfe/current/specs/xfe.spec
===================================================================
--- contrib/classic/2.0/xfe/current/specs/xfe.spec	2005-06-05 16:35:18 UTC (rev 6410)
+++ contrib/classic/2.0/xfe/current/specs/xfe.spec	2005-06-05 16:37:18 UTC (rev 6411)
@@ -50,7 +50,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING README TODO FAQ BUGS
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/foxicons
+/usr/lib/foxicons
 %{_libdir}/foxrc
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*



From svn at tinysofa.org  Sun Jun  5 16:40:41 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 12:40:41 -0400 (EDT)
Subject: [tinysofa-svn] r6412 - contrib/classic/2.0/bittorrent/current/specs
Message-ID: <20050605164041.EFD373450E9@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 12:40:36 -0400 (Sun, 05 Jun 2005)
New Revision: 6412

Modified:
   contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec
Log:
- correct py_sitedir


Modified: contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec
===================================================================
--- contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec	2005-06-05 16:37:18 UTC (rev 6411)
+++ contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec	2005-06-05 16:40:36 UTC (rev 6412)
@@ -1,7 +1,7 @@
 # on x86_64 we must have sitedir under /usr/lib because this is noarch
 # package
 %ifarch x86_64
-%define py_sitedir	%{py_prefix}/lib/python%{py_version}
+%define py_sitedir	%{py_prefix}/lib/python%{py_version}/site-packages
 %endif
 Name: bittorrent
 Version: 4.0.1



From svn at tinysofa.org  Sun Jun  5 16:41:39 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 12:41:39 -0400 (EDT)
Subject: [tinysofa-svn] r6413 - contrib/classic/2.0/clearsilver/current/specs
Message-ID: <20050605164139.6B70D344FBA@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 12:41:33 -0400 (Sun, 05 Jun 2005)
New Revision: 6413

Modified:
   contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec
Log:
- fix libdir


Modified: contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec
===================================================================
--- contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec	2005-06-05 16:40:36 UTC (rev 6412)
+++ contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec	2005-06-05 16:41:33 UTC (rev 6413)
@@ -73,9 +73,9 @@
 %files 
 %defattr(-,root,root)
 %{_prefix}/include/ClearSilver
-%{_prefix}/lib/libneo_cgi.a
-%{_prefix}/lib/libneo_cs.a
-%{_prefix}/lib/libneo_utl.a
+%{_libdir}/libneo_cgi.a
+%{_libdir}/libneo_cs.a
+%{_libdir}/libneo_utl.a
 %{_prefix}/bin/static.cgi
 %{_prefix}/bin/cstest
 %{_mandir}/man3



From svn at tinysofa.org  Sun Jun  5 16:43:16 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 12:43:16 -0400 (EDT)
Subject: [tinysofa-svn] r6414 -
	contrib/classic/2.0/courier-imap/current/specs
Message-ID: <20050605164316.476953450FD@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 12:43:10 -0400 (Sun, 05 Jun 2005)
New Revision: 6414

Modified:
   contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec
Log:
- ifarch -> ifnarch


Modified: contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec
===================================================================
--- contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec	2005-06-05 16:41:33 UTC (rev 6413)
+++ contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec	2005-06-05 16:43:10 UTC (rev 6414)
@@ -88,7 +88,7 @@
         CXXFLAGS="`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g'` -fexceptions" \
         XCFLAGS="`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g'` -fexceptions" \
         TCFLAGS="`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g'` -fexceptions" \
-%ifarch x86_64
+%ifnarch x86_64
 	# XXX: this is broken, makefiles should be fixed
 	LDFLAGS="-pie" \
 %endif



From svn at tinysofa.org  Sun Jun  5 16:52:46 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 12:52:46 -0400 (EDT)
Subject: [tinysofa-svn] r6415 - contrib/classic/2.0/irssi/current/specs
Message-ID: <20050605165246.5470B3450E5@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 12:52:40 -0400 (Sun, 05 Jun 2005)
New Revision: 6415

Modified:
   contrib/classic/2.0/irssi/current/specs/irssi.spec
Log:
- correct a typo


Modified: contrib/classic/2.0/irssi/current/specs/irssi.spec
===================================================================
--- contrib/classic/2.0/irssi/current/specs/irssi.spec	2005-06-05 16:43:10 UTC (rev 6414)
+++ contrib/classic/2.0/irssi/current/specs/irssi.spec	2005-06-05 16:52:40 UTC (rev 6415)
@@ -42,7 +42,7 @@
         --with-socks \
         --with-proxy \
         --with-perl="yes" \
-	--with-perl-lib=%{buildroot}%{perl_sitarch} \
+	--with-perl-lib=%{buildroot}%{perl_sitearch} \
 	--with-gc \
         --with-ncurses
 



From svn at tinysofa.org  Sun Jun  5 19:05:21 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  5 Jun 2005 15:05:21 -0400 (EDT)
Subject: [tinysofa-svn] r6416 - contrib/classic/2.0/compface/current/specs
Message-ID: <20050605190521.8B9303450C1@minbar.tinysofa.org>

Author: jh
Date: 2005-06-05 15:05:15 -0400 (Sun, 05 Jun 2005)
New Revision: 6416

Modified:
   contrib/classic/2.0/compface/current/specs/compface.spec
Log:
- multilib fix


Modified: contrib/classic/2.0/compface/current/specs/compface.spec
===================================================================
--- contrib/classic/2.0/compface/current/specs/compface.spec	2005-06-05 16:52:40 UTC (rev 6415)
+++ contrib/classic/2.0/compface/current/specs/compface.spec	2005-06-05 19:05:15 UTC (rev 6416)
@@ -28,7 +28,7 @@
 
 
 %prep
-%setup
+%setup -q
 %patch0 -p1 -b .errno
 %patch1 -p1 -b .makefile
 
@@ -39,7 +39,11 @@
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/{man1,man3},include,lib}
+%{__mkdir_p} \
+	%{buildroot}%{_mandir}/{man1,man3} \
+	%{buildroot}%{_bindir} \
+	%{buildroot}%{_includedir} \
+	%{buildroot}%{_libdir}
 %makeinstall DESTDIR=$RPM_BUILD_ROOT
 
 



From svn at tinysofa.org  Mon Jun  6 04:14:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 00:14:47 -0400 (EDT)
Subject: [tinysofa-svn] r6417 -
	contrib/classic/2.0/perl-mail-clamav/current/specs
Message-ID: <20050606041447.66C733451E2@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 00:14:40 -0400 (Mon, 06 Jun 2005)
New Revision: 6417

Modified:
   contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
Log:
- bzip2-devel should be in BuildRequires


Modified: contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
===================================================================
--- contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-05 19:05:15 UTC (rev 6416)
+++ contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-06 04:14:40 UTC (rev 6417)
@@ -8,9 +8,9 @@
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
 URL: http://www.cpan.org/
-Requires: perl = %{perl_version} perl-inline clamav zlib gmp-devel bzip2-devel
+Requires: perl = %{perl_version} perl-inline clamav zlib gmp-devel
 BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
-BuildRequires: perl-inline clamav-devel zlib-devel gmp-devel
+BuildRequires: perl-inline clamav-devel zlib-devel gmp-devel bzip2-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
 



From svn at tinysofa.org  Mon Jun  6 04:19:37 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 00:19:37 -0400 (EDT)
Subject: [tinysofa-svn] r6418 - contrib/classic/2.0/gtk/current/specs
Message-ID: <20050606041937.2BE503450BC@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 00:19:31 -0400 (Mon, 06 Jun 2005)
New Revision: 6418

Modified:
   contrib/classic/2.0/gtk/current/specs/gtk.spec
Log:
- BR: xorg-x11-devel


Modified: contrib/classic/2.0/gtk/current/specs/gtk.spec
===================================================================
--- contrib/classic/2.0/gtk/current/specs/gtk.spec	2005-06-06 04:14:40 UTC (rev 6417)
+++ contrib/classic/2.0/gtk/current/specs/gtk.spec	2005-06-06 04:19:31 UTC (rev 6418)
@@ -34,6 +34,7 @@
 BuildPrereq: libpng-devel >= %{libpng_version}
 BuildPrereq: gcc-c++ gettext
 BuildPrereq: autoconf
+BuildPrereq: xorg-x11-devel
 # needed for running aclocal
 # BuildPrereq: gtk-doc
 
@@ -45,11 +46,8 @@
 Prereq: glib >= %{glib_version}
 Prereq: atk >= %{atk_version}
 Prereq: pango >= %{pango_version}
+Prereq: /sbin/ldconfig
 
-%define _unpackaged_files_terminate_build      1
-%define _missing_doc_files_terminate_build     1
-
-
 %description
 GTK+ is a multi-platform toolkit for creating graphical user
 interfaces. Offering a complete set of widgets, GTK+ is suitable for



From svn at tinysofa.org  Mon Jun  6 05:09:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 01:09:53 -0400 (EDT)
Subject: [tinysofa-svn] r6419 - contrib/classic/2.0/gtk/current/specs
Message-ID: <20050606050953.7D61F345130@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 01:09:47 -0400 (Mon, 06 Jun 2005)
New Revision: 6419

Modified:
   contrib/classic/2.0/gtk/current/specs/gtk.spec
Log:
- export correct LD_LIBRARY_PATH


Modified: contrib/classic/2.0/gtk/current/specs/gtk.spec
===================================================================
--- contrib/classic/2.0/gtk/current/specs/gtk.spec	2005-06-06 04:19:31 UTC (rev 6418)
+++ contrib/classic/2.0/gtk/current/specs/gtk.spec	2005-06-06 05:09:47 UTC (rev 6419)
@@ -93,7 +93,7 @@
         exit 1
 fi
 
-export LD_LIBRARY_PATH=/usr/X11R6/lib
+export LD_LIBRARY_PATH=/usr/X11R6/%{_lib}
 %configure --with-xinput=xfree --disable-gtk-doc
 
 ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed 



From svn at tinysofa.org  Mon Jun  6 05:14:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 01:14:48 -0400 (EDT)
Subject: [tinysofa-svn] r6420 -
	contrib/classic/2.0/perl-mail-clamav/current/specs
Message-ID: <20050606051448.2E8AD344FC7@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 01:14:42 -0400 (Mon, 06 Jun 2005)
New Revision: 6420

Modified:
   contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
Log:
- BuildRequires: curl-devel


Modified: contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
===================================================================
--- contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-06 05:09:47 UTC (rev 6419)
+++ contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-06 05:14:42 UTC (rev 6420)
@@ -11,6 +11,7 @@
 Requires: perl = %{perl_version} perl-inline clamav zlib gmp-devel
 BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
 BuildRequires: perl-inline clamav-devel zlib-devel gmp-devel bzip2-devel
+BuildRequires: curl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
 



From svn at tinysofa.org  Mon Jun  6 05:49:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 01:49:00 -0400 (EDT)
Subject: [tinysofa-svn] r6421 - in contrib/classic/2.0/spamassassin/current:
	sources specs
Message-ID: <20050606054900.B75C2345190@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 01:48:51 -0400 (Mon, 06 Jun 2005)
New Revision: 6421

Added:
   contrib/classic/2.0/spamassassin/current/sources/spamassassin-3.02-makefile.patch
Modified:
   contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec
Log:
- patch makefile to build with spamc with correct flags


Added: contrib/classic/2.0/spamassassin/current/sources/spamassassin-3.02-makefile.patch
===================================================================
--- contrib/classic/2.0/spamassassin/current/sources/spamassassin-3.02-makefile.patch	2005-06-06 05:14:42 UTC (rev 6420)
+++ contrib/classic/2.0/spamassassin/current/sources/spamassassin-3.02-makefile.patch	2005-06-06 05:48:51 UTC (rev 6421)
@@ -0,0 +1,14 @@
+--- ./spamc/Makefile.in.orig	2005-06-06 08:41:05.000000000 +0300
++++ ./spamc/Makefile.in	2005-06-06 08:41:38.000000000 +0300
+@@ -1,9 +1,9 @@
+ CC = @CC@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = $(RPM_OPT_FLAGS)
+ SSLCFLAGS = @SSLCFLAGS@
+ 
+-CCDLFLAGS = @CCDLFLAGS@
++CCDLFLAGS = @CCDLFLAGS@ $(CFLAGS) -fPIC
+ LDFLAGS = @LDFLAGS@
+ LDDLFLAGS = @LDDLFLAGS@
+ 

Modified: contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec
===================================================================
--- contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec	2005-06-06 05:14:42 UTC (rev 6420)
+++ contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec	2005-06-06 05:48:51 UTC (rev 6421)
@@ -12,6 +12,7 @@
 Source2:   spamassassin.sysconfig
 Patch:     spamassassin-confdir-3.0.0.patch
 Patch1:	   spamassassin-2.63-archiveiterator.patch
+Patch2:    spamassassin-3.02-makefile.patch
 Buildroot: %{_tmppath}/%{name}-root
 Requires: perl-mail-spamassassin = %{version}-%{release}
 Requires: perl(Pod::Usage)
@@ -55,9 +56,9 @@
 %setup -q -n %{real_name}-%{version}
 %patch -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
 %{__perl} Makefile.PL PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} DESTDIR=$RPM_BUILD_ROOT INSTALLDIRS=vendor < /dev/null
 %{__make}
 %{__make} spamc/libspamc.so
@@ -85,6 +86,7 @@
   find $RPM_BUILD_ROOT -name $file | xargs rm
 done
 
+%{__chmod} 0755 %{buildroot}%{_bindir}/*
 
 %files 
 %defattr(-,root,root)



From svn at tinysofa.org  Mon Jun  6 06:05:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 02:05:15 -0400 (EDT)
Subject: [tinysofa-svn] r6422 - contrib/classic/2.0/xorg-x11/current/specs
Message-ID: <20050606060515.027B43451A3@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 02:05:09 -0400 (Mon, 06 Jun 2005)
New Revision: 6422

Modified:
   contrib/classic/2.0/xorg-x11/current/specs/xorg-x11.spec
Log:
- run ldconfig for devel


Modified: contrib/classic/2.0/xorg-x11/current/specs/xorg-x11.spec
===================================================================
--- contrib/classic/2.0/xorg-x11/current/specs/xorg-x11.spec	2005-06-06 05:48:51 UTC (rev 6421)
+++ contrib/classic/2.0/xorg-x11/current/specs/xorg-x11.spec	2005-06-06 06:05:09 UTC (rev 6422)
@@ -1851,6 +1851,16 @@
   /sbin/ldconfig
 }
 
+%post devel
+{
+  /sbin/ldconfig
+}
+
+%postun devel
+{
+  /sbin/ldconfig
+}
+
 %post deprecated-libs
 {
   /sbin/ldconfig



From svn at tinysofa.org  Mon Jun  6 06:19:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 02:19:34 -0400 (EDT)
Subject: [tinysofa-svn] r6423 - contrib/classic/2.0/irssi/current/specs
Message-ID: <20050606061934.1DA62345118@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 02:19:28 -0400 (Mon, 06 Jun 2005)
New Revision: 6423

Modified:
   contrib/classic/2.0/irssi/current/specs/irssi.spec
Log:
- more perl path fixes


Modified: contrib/classic/2.0/irssi/current/specs/irssi.spec
===================================================================
--- contrib/classic/2.0/irssi/current/specs/irssi.spec	2005-06-06 06:05:09 UTC (rev 6422)
+++ contrib/classic/2.0/irssi/current/specs/irssi.spec	2005-06-06 06:19:28 UTC (rev 6423)
@@ -42,7 +42,7 @@
         --with-socks \
         --with-proxy \
         --with-perl="yes" \
-	--with-perl-lib=%{buildroot}%{perl_sitearch} \
+	--with-perl-lib=%{buildroot}%{perl_sitelib} \
 	--with-gc \
         --with-ncurses
 



From svn at tinysofa.org  Mon Jun  6 06:25:51 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 02:25:51 -0400 (EDT)
Subject: [tinysofa-svn] r6424 - contrib/classic/2.0/gtk/current/specs
Message-ID: <20050606062551.C74573451CE@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 02:25:45 -0400 (Mon, 06 Jun 2005)
New Revision: 6424

Modified:
   contrib/classic/2.0/gtk/current/specs/gtk.spec
Log:
- make it build on x86_64


Modified: contrib/classic/2.0/gtk/current/specs/gtk.spec
===================================================================
--- contrib/classic/2.0/gtk/current/specs/gtk.spec	2005-06-06 06:19:28 UTC (rev 6423)
+++ contrib/classic/2.0/gtk/current/specs/gtk.spec	2005-06-06 06:25:45 UTC (rev 6424)
@@ -80,8 +80,8 @@
 done
 
 %build
-
-
+export CFLAGS="$RPM_OPT_FLAGS -L/usr/X11R6/%{_lib}"
+export LDFLAGS="-L/usr/X11R6/%{_lib}"
 # Patch3 modifies Makefile.am
 # aclocal-1.8
 # automake-1.8
@@ -93,7 +93,6 @@
         exit 1
 fi
 
-export LD_LIBRARY_PATH=/usr/X11R6/%{_lib}
 %configure --with-xinput=xfree --disable-gtk-doc
 
 ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed 



From svn at tinysofa.org  Mon Jun  6 06:37:33 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 02:37:33 -0400 (EDT)
Subject: [tinysofa-svn] r6425 -
	contrib/classic/2.0/perl-mail-clamav/current/specs
Message-ID: <20050606063733.3932D34510A@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 02:37:27 -0400 (Mon, 06 Jun 2005)
New Revision: 6425

Modified:
   contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
Log:
- BR: openssl-devel


Modified: contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
===================================================================
--- contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-06 06:25:45 UTC (rev 6424)
+++ contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-06 06:37:27 UTC (rev 6425)
@@ -11,7 +11,7 @@
 Requires: perl = %{perl_version} perl-inline clamav zlib gmp-devel
 BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
 BuildRequires: perl-inline clamav-devel zlib-devel gmp-devel bzip2-devel
-BuildRequires: curl-devel
+BuildRequires: curl-devel openssl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
 



From svn at tinysofa.org  Mon Jun  6 06:45:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 02:45:35 -0400 (EDT)
Subject: [tinysofa-svn] r6426 - contrib/classic/2.0/irssi/current/specs
Message-ID: <20050606064535.CB46F345171@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 02:45:29 -0400 (Mon, 06 Jun 2005)
New Revision: 6426

Modified:
   contrib/classic/2.0/irssi/current/specs/irssi.spec
Log:
- perllib again


Modified: contrib/classic/2.0/irssi/current/specs/irssi.spec
===================================================================
--- contrib/classic/2.0/irssi/current/specs/irssi.spec	2005-06-06 06:37:27 UTC (rev 6425)
+++ contrib/classic/2.0/irssi/current/specs/irssi.spec	2005-06-06 06:45:29 UTC (rev 6426)
@@ -42,7 +42,7 @@
         --with-socks \
         --with-proxy \
         --with-perl="yes" \
-	--with-perl-lib=%{buildroot}%{perl_sitelib} \
+	--with-perl-lib=%{buildroot}%{_libdir}/perl5/site_perl/%{perl_version} \
 	--with-gc \
         --with-ncurses
 



From svn at tinysofa.org  Mon Jun  6 07:55:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 03:55:59 -0400 (EDT)
Subject: [tinysofa-svn] r6427 - in contrib/classic/2.0/lesstif/current:
	sources specs
Message-ID: <20050606075559.A82DB345172@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 03:54:58 -0400 (Mon, 06 Jun 2005)
New Revision: 6427

Added:
   contrib/classic/2.0/lesstif/current/sources/lesstif-0.94.4-libdir.patch
   contrib/classic/2.0/lesstif/current/sources/lesstif-0.94.4.tar.bz2
Removed:
   contrib/classic/2.0/lesstif/current/sources/lesstif-0.93.95b-xpm.patch
   contrib/classic/2.0/lesstif/current/sources/lesstif-0.94.0.tar.bz2
Modified:
   contrib/classic/2.0/lesstif/current/specs/lesstif.spec
Log:
- 0.94.4
- add libdir patch to make it work with multilib


Deleted: contrib/classic/2.0/lesstif/current/sources/lesstif-0.93.95b-xpm.patch
===================================================================
--- contrib/classic/2.0/lesstif/current/sources/lesstif-0.93.95b-xpm.patch	2005-06-06 06:45:29 UTC (rev 6426)
+++ contrib/classic/2.0/lesstif/current/sources/lesstif-0.93.95b-xpm.patch	2005-06-06 07:54:58 UTC (rev 6427)
@@ -1,1002 +0,0 @@
-diff -urN lesstif-0.93.95b/include/Motif-1.2/XmI/XmXpmI.h lesstif-0.93.95b.xpm/include/Motif-1.2/XmI/XmXpmI.h
---- lesstif-0.93.95b/include/Motif-1.2/XmI/XmXpmI.h	2000-09-21 15:49:43.000000000 +0300
-+++ lesstif-0.93.95b.xpm/include/Motif-1.2/XmI/XmXpmI.h	2004-10-12 23:15:15.257558000 +0300
-@@ -42,6 +42,21 @@
- #ifndef _XPMI_h
- #define _XPMI_h
- 
-+#ifdef HAVE_LIMITS_H
-+#include <limits.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+
-+#ifndef        SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #include <XmI/XmXpm.h>
- 
- /*
-@@ -50,6 +65,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
- #ifdef sequent
- extern FILE *popen();
-@@ -187,9 +203,9 @@
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
- 
-@@ -198,8 +214,8 @@
- FUNC(_LtxpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
- FUNC(_LtxpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
- 
--#define HashAtomData(i) ((void *)i)
--#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
-+#define HashAtomData(i) ((void *)(uintptr_t)i)
-+#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
- #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
- 
- /* I/O utility */
-diff -urN lesstif-0.93.95b/include/Motif-2.0/XmI/XpmI.h lesstif-0.93.95b.xpm/include/Motif-2.0/XmI/XpmI.h
---- lesstif-0.93.95b/include/Motif-2.0/XmI/XpmI.h	2000-09-21 15:56:42.000000000 +0300
-+++ lesstif-0.93.95b.xpm/include/Motif-2.0/XmI/XpmI.h	2004-10-12 23:15:15.262557000 +0300
-@@ -44,6 +44,21 @@
- #ifndef _XPMI_h
- #define _XPMI_h
- 
-+#ifdef HAVE_LIMITS_H
-+#include <limits.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+
-+#ifndef        SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #include <Xm/XpmP.h>
- 
- /*
-@@ -52,6 +67,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
- #ifdef sequent
- extern FILE *popen();
-@@ -189,9 +205,9 @@
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
- 
-@@ -200,8 +216,8 @@
- FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
- FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
- 
--#define HashAtomData(i) ((void *)i)
--#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
-+#define HashAtomData(i) ((void *)(uintptr_t)i)
-+#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
- #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
- 
- /* I/O utility */
-diff -urN lesstif-0.93.95b/include/Motif-2.1/XmI/XmXpmI.h lesstif-0.93.95b.xpm/include/Motif-2.1/XmI/XmXpmI.h
---- lesstif-0.93.95b/include/Motif-2.1/XmI/XmXpmI.h	2000-09-21 15:49:43.000000000 +0300
-+++ lesstif-0.93.95b.xpm/include/Motif-2.1/XmI/XmXpmI.h	2004-10-12 23:15:15.266557000 +0300
-@@ -42,6 +42,21 @@
- #ifndef _XPMI_h
- #define _XPMI_h
- 
-+#ifdef HAVE_LIMITS_H
-+#include <limits.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+
-+#ifndef        SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #include <XmI/XmXpm.h>
- 
- /*
-@@ -50,6 +65,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
- #ifdef sequent
- extern FILE *popen();
-@@ -187,9 +203,9 @@
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
- 
-@@ -198,8 +214,8 @@
- FUNC(_LtxpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
- FUNC(_LtxpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
- 
--#define HashAtomData(i) ((void *)i)
--#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
-+#define HashAtomData(i) ((void *)(uintptr_t)i)
-+#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
- #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
- 
- /* I/O utility */
-diff -urN lesstif-0.93.95b/include/Motif-2.1/XmI/XpmI.h lesstif-0.93.95b.xpm/include/Motif-2.1/XmI/XpmI.h
---- lesstif-0.93.95b/include/Motif-2.1/XmI/XpmI.h	2000-09-21 15:56:42.000000000 +0300
-+++ lesstif-0.93.95b.xpm/include/Motif-2.1/XmI/XpmI.h	2004-10-12 23:15:15.270556000 +0300
-@@ -44,6 +44,21 @@
- #ifndef _XPMI_h
- #define _XPMI_h
- 
-+#ifdef	HAVE_LIMITS_H
-+#include <limits.h>
-+#endif
-+#ifdef	HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+
-+#ifndef	SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #include <Xm/XpmP.h>
- 
- /*
-@@ -52,6 +67,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
- #ifdef sequent
- extern FILE *popen();
-@@ -189,9 +205,9 @@
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
- 
-@@ -200,8 +216,8 @@
- FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
- FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
- 
--#define HashAtomData(i) ((void *)i)
--#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
-+#define HashAtomData(i) ((void *)(uintptr_t)i)
-+#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
- #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
- 
- /* I/O utility */
-diff -urN lesstif-0.93.95b/lib/Xm/LTXpm.c lesstif-0.93.95b.xpm/lib/Xm/LTXpm.c
---- lesstif-0.93.95b/lib/Xm/LTXpm.c	2002-02-27 21:45:22.000000000 +0200
-+++ lesstif-0.93.95b.xpm/lib/Xm/LTXpm.c	2004-10-12 23:15:15.207566000 +0300
-@@ -62,10 +62,45 @@
- /* #if !defined(WITH_DBMALLOC) && !defined(WITH_DMALLOC) */
- #include <XmI/DebugUtil.h>
- 
-+#ifdef HAVE_STRLCAT
-+# define STRLCAT(dst, src, dstsize) { \
-+       if (strlcat(dst, src, dstsize) >= (dstsize)) \
-+           return (_LtXpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+       if (strlcpy(dst, src, dstsize) >= (dstsize)) \
-+           return (_LtXpmFileInvalid); }
-+#else
-+# define STRLCAT(dst, src, dstsize) { \
-+       if ((strlen(dst) + strlen(src)) < (dstsize)) \
-+           strcat(dst, src); \
-+       else return (_LtXpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+       if (strlen(src) < (dstsize)) \
-+           strcpy(dst, src); \
-+       else return (_LtXpmFileInvalid); }
-+#endif
- 
- /* #ifdef VOID_SPRINTF is a non-ANSI catch -
-    we don't support those systems any longer ... */
- 
-+#ifdef HAVE_STRLCAT
-+# define STRLCAT(dst, src, dstsize) { \
-+ 	if (strlcat(dst, src, dstsize) >= (dstsize)) \
-+	    return (_LtXpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+  	if (strlcpy(dst, src, dstsize) >= (dstsize)) \
-+	    return (_LtXpmFileInvalid); }
-+#else
-+# define STRLCAT(dst, src, dstsize) { \
-+	if ((strlen(dst) + strlen(src)) < (dstsize)) \
-+ 	    strcat(dst, src); \
-+	else return (_LtXpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+	if (strlen(src) < (dstsize)) \
-+ 	    strcpy(dst, src); \
-+	else return (_LtXpmFileInvalid); }
-+#endif
-+
- /*****************************************************************************\
- * Attrib.c:                                                                   *
- *                                                                             *
-@@ -88,7 +123,7 @@
- 	_LtXpmAttributes *attributes);
- 
- /* 3.2 backward compatibility code */
--LFUNC(CreateOldColorTable, int, (_LtXpmColor *ct, int ncolors,
-+LFUNC(CreateOldColorTable, int, (_LtXpmColor *ct, unsigned int ncolors,
- 				 _LtXpmColor ***oldct));
- 
- LFUNC(FreeOldColorTable, void, (_LtXpmColor **colorTable, int ncolors));
-@@ -99,12 +134,15 @@
- static int
- CreateOldColorTable(ct, ncolors, oldct)
-     _LtXpmColor *ct;
--    int ncolors;
-+    unsigned int ncolors;
-     _LtXpmColor ***oldct;
- {
-     _LtXpmColor **colorTable, **color;
-     int a;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(_LtXpmColor *))
-+	return (_LtXpmNoMemory);
-+
-     colorTable = (_LtXpmColor **) _LtXpmMalloc(ncolors * sizeof(_LtXpmColor *));
-     if (!colorTable) {
- 	*oldct = NULL;
-@@ -1338,6 +1376,8 @@
-     unsigned int x, y, h;
- 
-     h = height - 1;
-+    if (cpp != 0 && width >= (SIZE_MAX - 3) / cpp)
-+	return (_LtXpmNoMemory);
-     p = buf = (char *) _LtXpmMalloc(width * cpp + 3);
-     if (!buf)
- 	return (_LtXpmNoMemory);
-@@ -2325,7 +2365,12 @@
- 
-     ErrorStatus = _LtXpmSuccess;
- 
-+    if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
-+	    return _LtXpmNoMemory;
-+
-     /* malloc pixels index tables */
-+    if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
-+	return (_LtXpmNoMemory);
-     image_pixels = (Pixel *) _LtXpmMalloc(sizeof(Pixel) * image->ncolors);
-     if (!image_pixels)
- 	return (_LtXpmNoMemory);
-@@ -2497,6 +2542,8 @@
- 	return (_LtXpmNoMemory);
- 
- #if !defined(FOR_MSW) && !defined(AMIGA)
-+    if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
-+	return _LtXpmNoMemory;
-     /* now that bytes_per_line must have been set properly alloc data */
-     (*image_return)->data =
- 	(char *) _LtXpmMalloc((*image_return)->bytes_per_line * height);
-@@ -3813,6 +3860,7 @@
- 					 * colors */
- 	{
- 	    unsigned short colidx[256];
-+
- #ifdef FOR_MSW
- 	    HDC shapedc;
- 	    HBITMAP obm, sobm;
-@@ -3827,6 +3875,8 @@
- #endif
- 
- 
-+	    if (ncolors > 256)
-+		return (_LtXpmFileInvalid);
- 	    memset((char *)colidx, 0, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -3930,6 +3980,8 @@
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		return (_LtXpmFileInvalid);
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
-@@ -4336,7 +4388,7 @@
- {
-     if (!mdata->type)
- 	*cmt = NULL;
--    else if (mdata->CommentLength) {
-+    else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) {
- 	*cmt = (char *) _LtXpmMalloc(mdata->CommentLength + 1);
- 	strncpy(*cmt, mdata->Comment, mdata->CommentLength);
- 	(*cmt)[mdata->CommentLength] = '\0';
-@@ -4546,7 +4598,7 @@
-     xpmHashTable *table;
- {
-     xpmHashAtom *atomTable = table->atomTable;
--    int size = table->size;
-+    unsigned int size = table->size;
-     xpmHashAtom *t, *p;
-     int i;
-     int oldSize = size;
-@@ -4555,6 +4607,8 @@
-     HASH_TABLE_GROWS
- 	table->size = size;
-     table->limit = size / 3;
-+    if (size >= SIZE_MAX / sizeof(*atomTable))
-+	return (_LtXpmNoMemory);
-     atomTable = (xpmHashAtom *) _LtXpmMalloc(size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (_LtXpmNoMemory);
-@@ -4615,6 +4669,8 @@
-     table->size = INITIAL_HASH_SIZE;
-     table->limit = table->size / 3;
-     table->used = 0;
-+    if (table->size += SIZE_MAX / sizeof(*atomTable))
-+	return (_LtXpmNoMemory);
-     atomTable = (xpmHashAtom *) _LtXpmMalloc(table->size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (_LtXpmNoMemory);
-@@ -5044,10 +5100,10 @@
-     _LtXpmColor **colorTablePtr;
-     xpmHashTable *hashtable;
- {
--    unsigned int key, 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;
-     _LtXpmColor *color;
-@@ -5055,6 +5111,8 @@
-     char **defaults;
-     int ErrorStatus;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(_LtXpmColor))
-+	return (_LtXpmNoMemory);
-     colorTable = (_LtXpmColor *) _LtXpmCalloc(ncolors, sizeof(_LtXpmColor));
-     if (!colorTable)
- 	return (_LtXpmNoMemory);
-@@ -5066,6 +5124,10 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		    _LtxpmFreeColorTable(colorTable, ncolors);
-+		    return (_LtXpmNoMemory);
-+	    }
- 	    color->string = (char *) _LtXpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		_LtxpmFreeColorTable(colorTable, ncolors);
-@@ -5103,13 +5165,14 @@
- 		}
- 		if (!lastwaskey && key < NKEYS) {	/* open new key */
- 		    if (curkey) {	/* flush string */
--			s = (char *) _LtXpmMalloc(strlen(curbuf) + 1);
-+			len = strlen(curbuf) + 1;
-+			s = (char *) _LtXpmMalloc(len);
- 			if (!s) {
- 			    _LtxpmFreeColorTable(colorTable, ncolors);
- 			    return (_LtXpmNoMemory);
- 			}
- 			defaults[curkey] = s;
--			strcpy(s, curbuf);
-+			memcpy(s, curbuf, len);
- 		    }
- 		    curkey = key + 1;	/* set new key  */
- 		    *curbuf = '\0';	/* reset curbuf */
-@@ -5120,9 +5183,9 @@
- 			return (_LtXpmFileInvalid);
- 		    }
- 		    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;
- 		}
- 	    }
-@@ -5130,12 +5193,13 @@
- 		_LtxpmFreeColorTable(colorTable, ncolors);
- 		return (_LtXpmFileInvalid);
- 	    }
--	    s = defaults[curkey] = (char *) _LtXpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = defaults[curkey] = (char *) _LtXpmMalloc(len);
- 	    if (!s) {
- 		_LtxpmFreeColorTable(colorTable, ncolors);
- 		return (_LtXpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	}
-     } else {				/* XPM 1 */
- 	/* get to the beginning of the first string */
-@@ -5148,6 +5212,10 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		    _LtxpmFreeColorTable(colorTable, ncolors);
-+		    return (_LtXpmNoMemory);
-+	    }
- 	    color->string = (char *) _LtXpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		_LtxpmFreeColorTable(colorTable, ncolors);
-@@ -5176,16 +5244,17 @@
- 	    *curbuf = '\0';		/* init curbuf */
- 	    while ((l = _LtxpmNextWord(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 *) _LtXpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = (char *) _LtXpmMalloc(len);
- 	    if (!s) {
- 		_LtxpmFreeColorTable(colorTable, ncolors);
- 		return (_LtXpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	    color->c_color = s;
- 	    *curbuf = '\0';		/* reset curbuf */
- 	    if (a < ncolors - 1)
-@@ -5210,6 +5279,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 _LtXpmNoMemory;
- #ifndef FOR_MSW
-     iptr2 = (unsigned int *) _LtXpmMalloc(sizeof(unsigned int) * width * height);
- #else
-@@ -5233,6 +5305,9 @@
- 	{
- 	    unsigned short colidx[256];
- 
-+	    if (ncolors > 256)
-+		    return (_LtXpmFileInvalid);
-+
- 	    memset((char *)colidx, 0, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -5310,6 +5385,9 @@
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		return (_LtXpmFileInvalid);
-+
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
-@@ -5793,7 +5871,7 @@
- LFUNC(ScanTransparentColor, int, (_LtXpmColor *color, unsigned int cpp,
- 				  _LtXpmAttributes *attributes));
- 
--LFUNC(ScanOtherColors, int, (Display *display, _LtXpmColor *colors, int ncolors,
-+LFUNC(ScanOtherColors, int, (Display *display, _LtXpmColor *colors, unsigned int ncolors,
- 			     Pixel *pixels, unsigned int mask,
- 			     unsigned int cpp, _LtXpmAttributes *attributes));
- 
-@@ -5918,11 +5996,16 @@
-     else
- 	cpp = 0;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+		  width * height >= SIZE_MAX / sizeof(unsigned int))
-+	    RETURN(_LtXpmNoMemory);
-     pmap.pixelindex =
- 	(unsigned int *) _LtXpmCalloc(width * height, sizeof(unsigned int));
-     if (!pmap.pixelindex)
- 	RETURN(_LtXpmNoMemory);
- 
-+    if (pmap.size >= SIZE_MAX / sizeof(Pixel))
-+	RETURN(_LtXpmNoMemory);
-     pmap.pixels = (Pixel *) _LtXpmMalloc(sizeof(Pixel) * pmap.size);
-     if (!pmap.pixels)
- 	RETURN(_LtXpmNoMemory);
-@@ -5988,6 +6071,8 @@
-      * color
-      */
- 
-+    if (pmap.ncolors >= SIZE_MAX / sizeof(_LtXpmColor))
-+	RETURN(_LtXpmNoMemory);
-     colorTable = (_LtXpmColor *) _LtXpmCalloc(pmap.ncolors, sizeof(_LtXpmColor));
-     if (!colorTable)
- 	RETURN(_LtXpmNoMemory);
-@@ -6046,6 +6131,8 @@
- 
-     /* first get a character string */
-     a = 0;
-+    if (cpp >= SIZE_MAX - 1)
-+	return (_LtXpmNoMemory);
-     if (!(s = color->string = (char *) _LtXpmMalloc(cpp + 1)))
- 	return (_LtXpmNoMemory);
-     *s++ = printable[c = a % MAXPRINTABLE];
-@@ -6093,7 +6180,7 @@
- ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
-     Display *display;
-     _LtXpmColor *colors;
--    int ncolors;
-+    unsigned int ncolors;
-     Pixel *pixels;
-     unsigned int mask;
-     unsigned int cpp;
-@@ -6137,6 +6224,8 @@
-     }
- 
-     /* first get character strings and rgb values */
-+    if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
-+	return (_LtXpmNoMemory);
-     xcolors = (XColor *) _LtXpmMalloc(sizeof(XColor) * ncolors);
-     if (!xcolors)
- 	return (_LtXpmNoMemory);
-@@ -7052,6 +7141,8 @@
-      */
-     header_nlines = 1 + image->ncolors;
-     header_size = sizeof(char *) * header_nlines;
-+    if (header_size >= SIZE_MAX / sizeof(char *))
-+	return (_LtXpmNoMemory);
-     header = (char **) _LtXpmCalloc(header_size, sizeof(char *));
-     if (!header)
- 	return (_LtXpmNoMemory);
-diff -urN lesstif-0.93.95b/lib/Xm/ScrolledW.c lesstif-0.93.95b.xpm/lib/Xm/ScrolledW.c
---- lesstif-0.93.95b/lib/Xm/ScrolledW.c	2004-06-17 19:20:25.000000000 +0300
-+++ lesstif-0.93.95b.xpm/lib/Xm/ScrolledW.c	2004-10-12 23:15:15.199567000 +0300
-@@ -1964,17 +1964,14 @@
- 	 */
- 	if (child == (Widget)SW_WorkWindow(w))
- 	{
--		/* T. Straumann: added support for borderWidth
--		 * (border width of scrollbars and clip are 0)
--		 */
--		Dimension bw = 2 * (childgeom->request_mode & CWBorderWidth	? childgeom->border_width
--																	: XtBorderWidth(child) );
--		Dimension ww = childgeom->request_mode & CWWidth ? childgeom->width
--											             : XtWidth(child);
--		Dimension hh = childgeom->request_mode & CWHeight ? childgeom->height
--											              : XtHeight(child);
--		vals->WorkW = ww + bw;
--		vals->WorkH = hh + bw;
-+	    if (childgeom->request_mode & CWWidth)
-+	    {
-+		vals->WorkW = childgeom->width;
-+	    }
-+	    if (childgeom->request_mode & CWHeight)
-+	    {
-+		vals->WorkH = childgeom->height;
-+	    }
- 	}
- 	/* only happens for AUTOMATIC */
- 	if (child == (Widget)SW_ClipWindow(w))
-diff -urN lesstif-0.93.95b/lib/Xm-2.0/Xpm.c lesstif-0.93.95b.xpm/lib/Xm-2.0/Xpm.c
---- lesstif-0.93.95b/lib/Xm-2.0/Xpm.c	2002-02-27 21:45:22.000000000 +0200
-+++ lesstif-0.93.95b.xpm/lib/Xm-2.0/Xpm.c	2004-10-12 23:15:15.216564000 +0300
-@@ -62,6 +62,24 @@
- /* #if !defined(WITH_DBMALLOC) && !defined(WITH_DMALLOC) */
- #include <XmI/DebugUtil.h>
- 
-+#ifdef HAVE_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
-+
- /*****************************************************************************\
- * Attrib.c:                                                                   *
- *                                                                             *
-@@ -84,7 +102,7 @@
- 	XpmAttributes *attributes);
- 
- /* 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));
-@@ -95,12 +113,15 @@
- 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) {
- 	*oldct = NULL;
-@@ -1333,6 +1354,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);
-@@ -2320,6 +2343,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)
-@@ -2492,6 +2518,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);
-@@ -3562,6 +3590,8 @@
- 	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);
-@@ -3808,6 +3838,7 @@
- 					 * colors */
- 	{
- 	    unsigned short colidx[256];
-+
- #ifdef FOR_MSW
- 	    HDC shapedc;
- 	    HBITMAP obm, sobm;
-@@ -3822,6 +3853,8 @@
- #endif
- 
- 
-+	    if (ncolors > 256)
-+		    return XpmFileInvalid;
- 	    memset((char *)colidx, 0, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -3925,6 +3958,8 @@
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		    return XpmFileInvalid;
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
-@@ -4331,7 +4366,7 @@
- {
-     if (!mdata->type)
- 	*cmt = NULL;
--    else if (mdata->CommentLength) {
-+    else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) {
- 	*cmt = (char *) XpmMalloc(mdata->CommentLength + 1);
- 	strncpy(*cmt, mdata->Comment, mdata->CommentLength);
- 	(*cmt)[mdata->CommentLength] = '\0';
-@@ -4541,7 +4576,7 @@
-     xpmHashTable *table;
- {
-     xpmHashAtom *atomTable = table->atomTable;
--    int size = table->size;
-+    unsigned int size = table->size;
-     xpmHashAtom *t, *p;
-     int i;
-     int oldSize = size;
-@@ -4550,6 +4585,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);
-@@ -4610,6 +4647,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);
-@@ -5039,10 +5078,10 @@
-     XpmColor **colorTablePtr;
-     xpmHashTable *hashtable;
- {
--    unsigned int key, 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;
-@@ -5050,6 +5089,8 @@
-     char **defaults;
-     int ErrorStatus;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	    return XpmNoMemory;
-     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	return (XpmNoMemory);
-@@ -5061,6 +5102,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);
-@@ -5098,13 +5143,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 */
-@@ -5115,9 +5161,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;
- 		}
- 	    }
-@@ -5125,12 +5171,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 */
-@@ -5143,6 +5190,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);
-@@ -5171,16 +5222,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)
-@@ -5205,6 +5257,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
-@@ -5228,6 +5283,9 @@
- 	{
- 	    unsigned short colidx[256];
- 
-+	    if (ncolors > 256)
-+		    return XpmFileInvalid;
-+
- 	    memset((char *)colidx, 0, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -5305,6 +5363,9 @@
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		    return XpmFileInvalid;
-+
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
-@@ -5788,7 +5849,7 @@
- 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));
- 
-@@ -5913,11 +5974,16 @@
-     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);
-@@ -5983,6 +6049,8 @@
-      * color
-      */
- 
-+    if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	    RETURN(XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	RETURN(XpmNoMemory);
-@@ -6041,6 +6109,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];
-@@ -6088,7 +6158,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;
-@@ -6132,6 +6202,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);
-@@ -7047,6 +7119,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);

Deleted: contrib/classic/2.0/lesstif/current/sources/lesstif-0.94.0.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/lesstif/current/sources/lesstif-0.94.4-libdir.patch
===================================================================
--- contrib/classic/2.0/lesstif/current/sources/lesstif-0.94.4-libdir.patch	2005-06-06 06:45:29 UTC (rev 6426)
+++ contrib/classic/2.0/lesstif/current/sources/lesstif-0.94.4-libdir.patch	2005-06-06 07:54:58 UTC (rev 6427)
@@ -0,0 +1,137 @@
+--- ./lib/Dt/Makefile.am.libdir	2005-03-26 08:52:25.000000000 +0200
++++ ./lib/Dt/Makefile.am	2005-06-06 10:44:21.000000000 +0300
+@@ -5,7 +5,7 @@
+ MAINTAINERCLEANFILES=Makefile.in
+ 
+ libDtPrint_la_LDFLAGS=	-version-info 1:0 -no-undefined
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ 
+ if BuildLibDtPrint
+ 
+--- ./lib/Dt/Makefile.in.libdir	2005-03-31 22:45:03.000000000 +0300
++++ ./lib/Dt/Makefile.in	2005-06-06 10:44:21.000000000 +0300
+@@ -248,7 +248,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ lib_version_suffix = @lib_version_suffix@
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ man2html_cmd = @man2html_cmd@
+--- ./lib/Xm-2.1/Makefile.am.libdir	2005-03-26 08:52:26.000000000 +0200
++++ ./lib/Xm-2.1/Makefile.am	2005-06-06 10:44:21.000000000 +0300
+@@ -3,7 +3,7 @@
+ #
+ MAINTAINERCLEANFILES=Makefile.in
+ 
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ libXm_la_LDFLAGS=	-version-info 2:1  $(X_LIBS)  -no-undefined
+ 
+ #
+--- ./lib/Xm-2.1/Makefile.in.libdir	2005-03-31 22:45:05.000000000 +0300
++++ ./lib/Xm-2.1/Makefile.in	2005-06-06 10:44:21.000000000 +0300
+@@ -297,7 +297,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ lib_version_suffix = @lib_version_suffix@
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ man2html_cmd = @man2html_cmd@
+--- ./lib/config/Makefile.am.libdir	2003-03-17 22:34:18.000000000 +0200
++++ ./lib/config/Makefile.am	2005-06-06 10:44:21.000000000 +0300
+@@ -4,7 +4,7 @@
+ MAINTAINERCLEANFILES=Makefile.in
+ bin_SCRIPTS=	mxmkmf
+ 
+-configdir=	$(libdir)/LessTif/config
++configdir=	$(prefix)/lib/X11/config
+ 
+ EXTRA_DIST =    LessTif.rules LessTif.tmpl host.def Imake.tmpl
+ 
+--- ./lib/config/Makefile.in.libdir	2005-03-31 22:45:05.000000000 +0300
++++ ./lib/config/Makefile.in	2005-06-06 10:44:21.000000000 +0300
+@@ -251,7 +251,7 @@
+ #
+ MAINTAINERCLEANFILES = Makefile.in
+ bin_SCRIPTS = mxmkmf
+-configdir = $(libdir)/LessTif/config
++configdir = $(prefix)/lib/X11/config
+ EXTRA_DIST = LessTif.rules LessTif.tmpl host.def Imake.tmpl
+ # so being R5 
+ @XIsR6_FALSE at config_DATA = Imake.tmpl LessTif.rules LessTif.tmpl
+--- ./lib/Mrm-2.1/Makefile.am.libdir	2005-03-26 08:52:26.000000000 +0200
++++ ./lib/Mrm-2.1/Makefile.am	2005-06-06 10:44:21.000000000 +0300
+@@ -4,7 +4,7 @@
+ MAINTAINERCLEANFILES=Makefile.in
+ 
+ libMrm_la_LDFLAGS= -version-info 2:1 -no-undefined
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ 
+ #
+ # Sources in this directory
+--- ./lib/Mrm-2.1/Makefile.in.libdir	2005-03-31 22:45:04.000000000 +0300
++++ ./lib/Mrm-2.1/Makefile.in	2005-06-06 10:44:21.000000000 +0300
+@@ -235,7 +235,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ lib_version_suffix = @lib_version_suffix@
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ man2html_cmd = @man2html_cmd@
+--- ./lib/Uil-2.1/Makefile.am.libdir	2005-03-26 08:52:26.000000000 +0200
++++ ./lib/Uil-2.1/Makefile.am	2005-06-06 10:44:21.000000000 +0300
+@@ -5,7 +5,7 @@
+ MAINTAINERCLEANFILES=Makefile.in
+ 
+ libUil_la_LDFLAGS= -version-info 2:1 -no-undefined
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ 
+ #
+ # Sources in this directory
+--- ./lib/Uil-2.1/Makefile.in.libdir	2005-03-31 22:45:04.000000000 +0300
++++ ./lib/Uil-2.1/Makefile.in	2005-06-06 10:44:21.000000000 +0300
+@@ -238,7 +238,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ lib_version_suffix = @lib_version_suffix@
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ man2html_cmd = @man2html_cmd@
+--- ./clients/Motif-2.1/mwm/Makefile.am.libdir	2005-06-06 10:44:40.000000000 +0300
++++ ./clients/Motif-2.1/mwm/Makefile.am	2005-06-06 10:45:40.000000000 +0300
+@@ -35,9 +35,9 @@
+ LDADD=		../../../lib/Xm-2.1/libXm.la \
+ 		$(X_LIBS) $(XPLIB) -lXt $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
+ 
+-appdir=		$(libdir)/X11/app-defaults
++appdir=		$(prefix)/lib/X11/app-defaults
+ 
+-mwmddir=	$(libdir)/X11/mwm
++mwmddir=	$(prefix)/lib/X11/mwm
+ mwmd_DATA=	system.mwmrc alt.map README
+ 
+ 
+--- ./clients/Motif-2.1/mwm/Makefile.in.libdir	2005-06-06 10:44:46.000000000 +0300
++++ ./clients/Motif-2.1/mwm/Makefile.in	2005-06-06 10:46:10.000000000 +0300
+@@ -300,8 +300,8 @@
+ LDADD = ../../../lib/Xm-2.1/libXm.la \
+ 		$(X_LIBS) $(XPLIB) -lXt $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
+ 
+-appdir = $(libdir)/X11/app-defaults
+-mwmddir = $(libdir)/X11/mwm
++appdir = $(prefix)/lib/X11/app-defaults
++mwmddir = $(prefix)/lib/X11/mwm
+ mwmd_DATA = system.mwmrc alt.map README
+ AM_YFLAGS = -d
+ all: all-am

Added: contrib/classic/2.0/lesstif/current/sources/lesstif-0.94.4.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/lesstif/current/sources/lesstif-0.94.4.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/lesstif/current/specs/lesstif.spec
===================================================================
--- contrib/classic/2.0/lesstif/current/specs/lesstif.spec	2005-06-06 06:45:29 UTC (rev 6426)
+++ contrib/classic/2.0/lesstif/current/specs/lesstif.spec	2005-06-06 07:54:58 UTC (rev 6427)
@@ -2,11 +2,12 @@
 
 Summary: An OSF/Motif(R) clone.
 Name: lesstif
-Version: 0.94.0
-Release: 2gd
+Version: 0.94.4
+Release: 1jh
 License: LGPL
 Group: contrib
 Source: ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/lesstif-%{version}.tar.bz2
+Patch0: lesstif-0.94.4-libdir.patch
 Url: http://www.lesstif.org/
 
 Obsoletes: lesstif-clients
@@ -52,6 +53,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .libdir
 
 
 %build
@@ -86,7 +88,7 @@
 mv $RPM_BUILD_ROOT%{prefix}/include $RPM_BUILD_ROOT%{prefix}/LessTif/Motif2.1/
 
 # don't include
-rm -rf $RPM_BUILD_ROOT%{prefix}/%{_lib}/X11/config \
+rm -rf $RPM_BUILD_ROOT%{prefix}/lib/X11/config \
        $RPM_BUILD_ROOT%{prefix}/LessTif/Motif2.1/bin/xmbind \
        $RPM_BUILD_ROOT%{prefix}/man \
        $RPM_BUILD_ROOT/usr/share
@@ -147,6 +149,7 @@
 %defattr(-,root,root)
 %doc %{prefix}/LessTif/doc
 %{prefix}/LessTif/Motif2.1/bin/uil
+%{prefix}/LessTif/Motif2.1/bin/motif-config
 %{prefix}/LessTif/Motif2.1/bin/mxmkmf
 %{prefix}/LessTif/Motif2.1/include
 %{prefix}/LessTif/Motif2.1/%{_lib}/lib*.a
@@ -155,6 +158,10 @@
 
 
 %changelog
+* Sun Jun  5 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.94.4-1jh
+- 0.94.4
+- add libdir patch to make it work with multilib
+
 * Mon Dec 20 2004 Gerald Dachs <gda at tinysofa dot org> 0.94.0-2gd
 - fixed requirements for xorg-x11 6.8.1
 



From svn at tinysofa.org  Mon Jun  6 10:54:16 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 06:54:16 -0400 (EDT)
Subject: [tinysofa-svn] r6428 - contrib/classic/2.0/firefox/current/specs
Message-ID: <20050606105416.66ECD344BDE@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 06:54:10 -0400 (Mon, 06 Jun 2005)
New Revision: 6428

Modified:
   contrib/classic/2.0/firefox/current/specs/firefox.spec
Log:
- cflags


Modified: contrib/classic/2.0/firefox/current/specs/firefox.spec
===================================================================
--- contrib/classic/2.0/firefox/current/specs/firefox.spec	2005-06-06 07:54:58 UTC (rev 6427)
+++ contrib/classic/2.0/firefox/current/specs/firefox.spec	2005-06-06 10:54:10 UTC (rev 6428)
@@ -166,12 +166,13 @@
 EOF
 
 %build
+export CFLAGS="$CFLAGS -L/usr/X11R6/%{_lib}"
+export LDFLAGS="$LDFLAGS -L/usr/X11R6/%{_lib}"
 export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
 MAKE="gmake %{?_smp_mflags}" make -f client.mk build
 
 %install
-%{__rm} -rf %{buildroot}
 %{__make} -C xpinstall/packager/ \
 	MOZILLA_BIN="\$(DIST)/bin/firefox-bin"
 



From svn at tinysofa.org  Mon Jun  6 11:42:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  6 Jun 2005 07:42:29 -0400 (EDT)
Subject: [tinysofa-svn] r6429 - contrib/classic/2.0/xfe/current/specs
Message-ID: <20050606114229.28B163450DA@minbar.tinysofa.org>

Author: jh
Date: 2005-06-06 07:42:23 -0400 (Mon, 06 Jun 2005)
New Revision: 6429

Modified:
   contrib/classic/2.0/xfe/current/specs/xfe.spec
Log:
- multilib tweak


Modified: contrib/classic/2.0/xfe/current/specs/xfe.spec
===================================================================
--- contrib/classic/2.0/xfe/current/specs/xfe.spec	2005-06-06 10:54:10 UTC (rev 6428)
+++ contrib/classic/2.0/xfe/current/specs/xfe.spec	2005-06-06 11:42:23 UTC (rev 6429)
@@ -51,7 +51,7 @@
 %doc AUTHORS COPYING README TODO FAQ BUGS
 %attr(755,root,root) %{_bindir}/*
 /usr/lib/foxicons
-%{_libdir}/foxrc
+/usr/lib/foxrc
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 %if %{icewm_menu}



From svn at tinysofa.org  Tue Jun  7 05:42:09 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  7 Jun 2005 01:42:09 -0400 (EDT)
Subject: [tinysofa-svn] r6430 -
	tinysofa/releases/classic/2.0/rpm/current/specs
Message-ID: <20050607054209.DC0073450F2@minbar.tinysofa.org>

Author: jh
Date: 2005-06-07 01:42:03 -0400 (Tue, 07 Jun 2005)
New Revision: 6430

Modified:
   tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec
Log:
- add Requires: perl python to rpm-build


Modified: tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec
===================================================================
--- tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec	2005-06-06 11:42:23 UTC (rev 6429)
+++ tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec	2005-06-07 05:42:03 UTC (rev 6430)
@@ -98,6 +98,8 @@
 Requires: rpm = %{rpm_version}, patch >= 2.5, file
 Requires: findutils
 Requires: tinysofa-rpm-config
+# some post build scripts require perl or python
+Requires: perl python
 Provides: rpmbuild(VendorConfig) = 4.1-1
 
 %description build



From svn at tinysofa.org  Wed Jun  8 07:04:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  8 Jun 2005 03:04:35 -0400 (EDT)
Subject: [tinysofa-svn] r6431 - in
	tinysofa/releases/classic/2.0/less/current: sources specs
Message-ID: <20050608070435.D0083345125@minbar.tinysofa.org>

Author: jh
Date: 2005-06-08 03:04:22 -0400 (Wed, 08 Jun 2005)
New Revision: 6431

Added:
   tinysofa/releases/classic/2.0/less/current/sources/less-382-utf8detect.patch
Modified:
   tinysofa/releases/classic/2.0/less/current/sources/lesspipe.sh
   tinysofa/releases/classic/2.0/less/current/specs/less.spec
Log:
- add patch for proper UTF-8 detection (Peter Rockai)
- improve lesspipe to handle .tar.bz2 files more nicely


Added: tinysofa/releases/classic/2.0/less/current/sources/less-382-utf8detect.patch
===================================================================
--- tinysofa/releases/classic/2.0/less/current/sources/less-382-utf8detect.patch	2005-06-07 05:42:03 UTC (rev 6430)
+++ tinysofa/releases/classic/2.0/less/current/sources/less-382-utf8detect.patch	2005-06-08 07:04:22 UTC (rev 6431)
@@ -0,0 +1,52 @@
+--- less-382/charset.c.utf8detect	2004-02-04 04:52:26.000000000 +0000
++++ less-382/charset.c	2005-02-16 13:50:39.935278768 +0000
+@@ -18,6 +18,7 @@
+ #if HAVE_LOCALE
+ #include <locale.h>
+ #include <ctype.h>
++#include <langinfo.h>
+ #endif
+ 
+ public int utf_mode = 0;
+@@ -243,25 +244,19 @@
+ 		return;
+ 	}
+ 
+-#if HAVE_STRSTR
+-	/*
+-	 * Check whether LC_ALL, LC_CTYPE or LANG look like UTF-8 is used.
+-	 */
+-	if ((s = lgetenv("LC_ALL")) != NULL ||
+-	    (s = lgetenv("LC_CTYPE")) != NULL ||
+-	    (s = lgetenv("LANG")) != NULL)
+-	{
+-		if (strstr(s, "UTF-8") != NULL || strstr(s, "utf-8") != NULL)
+-			if (icharset("utf-8"))
+-				return;
+-	}
+-#endif
+-
+ #if HAVE_LOCALE
+ 	/*
+ 	 * Use setlocale.
+ 	 */
+ 	ilocale();
++
++	/* if the locale is using UTF-8, fix up charset accordingly */
++	if ((s = nl_langinfo(CODESET)))
++	{	
++		if (!strcmp(s, "UTF-8"))
++			if (icharset("utf-8"))
++				return;
++	}
+ #else
+ #if MSDOS_COMPILER
+ 	/*
+@@ -274,6 +269,7 @@
+ 	 */
+ 	(void) icharset("latin1");
+ #endif
++
+ #endif
+ }
+ 

Modified: tinysofa/releases/classic/2.0/less/current/sources/lesspipe.sh
===================================================================
--- tinysofa/releases/classic/2.0/less/current/sources/lesspipe.sh	2005-06-07 05:42:03 UTC (rev 6430)
+++ tinysofa/releases/classic/2.0/less/current/sources/lesspipe.sh	2005-06-08 07:04:22 UTC (rev 6431)
@@ -22,7 +22,7 @@
 	fi ;;
   *.tar) tar tvvf "$1" ;;
   *.tgz|*.tar.gz|*.tar.[zZ]) tar tzvvf "$1" ;;
-  *.tar.bz2|*.tbz2) bzip2 -dc "$1" | tar tvvf - ;;
+  *.tar.bz2|*.tbz2) tar tjvvf "$1" ;;
   *.[zZ]|*.gz) gzip -dc -- "$1" ;;
   *.bz2) bzip2 -dc -- "$1" ;;
   *.zip) zipinfo -- "$1" ;;

Modified: tinysofa/releases/classic/2.0/less/current/specs/less.spec
===================================================================
--- tinysofa/releases/classic/2.0/less/current/specs/less.spec	2005-06-07 05:42:03 UTC (rev 6430)
+++ tinysofa/releases/classic/2.0/less/current/specs/less.spec	2005-06-08 07:04:22 UTC (rev 6431)
@@ -9,6 +9,7 @@
 Source2: less.sh
 Source3: less.csh
 Patch0:	less-382-ncursesw.patch
+Patch1:	less-382-utf8detect.patch
 URL: http://www.greenwoodsoftware.com/less/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ncurses-devel autoconf
@@ -27,7 +28,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .ncursesw
-chmod -R u+w *
+%patch1 -p1 -b .utf8detect
+chmod -R a+w *
 
 
 %build
@@ -58,6 +60,10 @@
 
 
 %changelog
+* Wed Jun  8 2005 Jaakko Heinonen <jh at tinysofa dot org> 382-7jh
+- add patch for proper UTF-8 detection (Peter Rockai)
+- improve lesspipe to handle .tar.bz2 files more nicely
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 382-6ts
 - current (382-6jh) integrated as 382-6ts for release 1.1
 



From svn at tinysofa.org  Wed Jun  8 11:11:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  8 Jun 2005 07:11:25 -0400 (EDT)
Subject: [tinysofa-svn] r6432 - in
	tinysofa/releases/classic/2.0/shadow-utils/current: sources specs
Message-ID: <20050608111125.EBDD03451E2@minbar.tinysofa.org>

Author: jh
Date: 2005-06-08 07:11:16 -0400 (Wed, 08 Jun 2005)
New Revision: 6432

Modified:
   tinysofa/releases/classic/2.0/shadow-utils/current/sources/shadow-4.0.3.login.defs
   tinysofa/releases/classic/2.0/shadow-utils/current/specs/shadow-utils.spec
Log:
- remove some obsolete options from default login.defs

Modified: tinysofa/releases/classic/2.0/shadow-utils/current/sources/shadow-4.0.3.login.defs
===================================================================
--- tinysofa/releases/classic/2.0/shadow-utils/current/sources/shadow-4.0.3.login.defs	2005-06-08 07:04:22 UTC (rev 6431)
+++ tinysofa/releases/classic/2.0/shadow-utils/current/sources/shadow-4.0.3.login.defs	2005-06-08 11:11:16 UTC (rev 6432)
@@ -1,16 +1,11 @@
-#
 # /etc/login.defs - Configuration control definitions for the login package.
 #
-#	$Id: login.defs.linux,v 1.12 2000/08/26 18:27:10 marekm Exp $
-#
 # Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
 # If unspecified, some arbitrary (and possibly incorrect) value will
 # be assumed.  All other items are optional - if not specified then
 # the described action or option will be inhibited.
 #
 # Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
 
 #
 # Delay in seconds before being allowed another attempt after a login failure
@@ -78,7 +73,6 @@
 # upon these devices.
 #
 CONSOLE		/etc/securetty
-#CONSOLE	console:tty01:tty02:tty03:tty04
 
 #
 # If defined, all su activity is logged to this file.
@@ -90,7 +84,6 @@
 # be displayed upon login.
 #
 MOTD_FILE	/etc/motd
-#MOTD_FILE	/etc/motd:/usr/lib/news/news-motd
 
 #
 # If defined, this file will be output before each login prompt.
@@ -104,12 +97,6 @@
 #TTYTYPE_FILE	/etc/ttytype
 
 #
-# If defined, login failures will be logged here in a utmp format.
-# last, when invoked as lastb, will read /var/log/btmp, so...
-#
-FTMP_FILE	/var/log/btmp
-
-#
 # If defined, name of file whose presence which will inhibit non-root
 # logins.  The contents of this file should be a message indicating
 # why logins are inhibited.
@@ -152,21 +139,6 @@
 NOLOGIN_STR	NOLOGIN
 
 #
-# If defined, either a TZ environment parameter spec or the
-# fully-rooted pathname of a file containing such a spec.
-#
-#ENV_TZ		TZ=CST6CDT
-#ENV_TZ		/etc/tzname
-
-#
-# If defined, an HZ environment parameter spec.
-#
-# for Linux/x86
-ENV_HZ		HZ=100
-# For Linux/Alpha...
-#ENV_HZ		HZ=1024
-
-#
 # *REQUIRED*  The default PATH settings, for superuser and normal users.
 #
 # (they are minimal, add the rest in the shell startup files)
@@ -220,19 +192,6 @@
 PASS_WARN_AGE	7
 
 #
-# If "yes", the user must be listed as a member of the first gid 0 group
-# in /etc/group (called "root" on most Linux systems) to be able to "su"
-# to uid 0 accounts.  If the group doesn't exist or is empty, no one
-# will be able to "su" to uid 0.
-#
-SU_WHEEL_ONLY	yes
-
-#
-# If compiled with cracklib support, where are the dictionaries
-#
-#CRACKLIB_DICTPATH	/var/cache/cracklib/cracklib_dict
-
-#
 # Min/max values for automatic uid selection in useradd
 #
 UID_MIN			 500
@@ -284,15 +243,6 @@
 # 
 CHFN_RESTRICT		rwh
 
-#
-# Password prompt (%s will be replaced by user name).
-#
-# XXX - it doesn't work correctly yet, for now leave it commented out
-# to use the default which is just "Password: ".
-#LOGIN_STRING		"%s's Password: "
-
-#
-# Only works if compiled with MD5_CRYPT defined:
 # If set to "yes", new passwords will be encrypted using the MD5-based
 # algorithm compatible with the one used by recent releases of FreeBSD.
 # It supports passwords of unlimited length and longer salt strings.
@@ -360,15 +310,6 @@
 #GETPASS_ASTERISKS 1
 
 #
-# Enable setting of the umask group bits to be the same as owner bits
-# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
-# the same as gid, and username is the same as the primary group name.
-#
-# This also enables userdel to remove user groups if no members exist.
-#
-USERGROUPS_ENAB no
-
-#
 # If useradd should create home directories for users by default
 # On tinysofa systems, we do. This option is ORed with the -m flag on
 # useradd command line.

Modified: tinysofa/releases/classic/2.0/shadow-utils/current/specs/shadow-utils.spec
===================================================================
--- tinysofa/releases/classic/2.0/shadow-utils/current/specs/shadow-utils.spec	2005-06-08 07:04:22 UTC (rev 6431)
+++ tinysofa/releases/classic/2.0/shadow-utils/current/specs/shadow-utils.spec	2005-06-08 11:11:16 UTC (rev 6432)
@@ -3,7 +3,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.3
-Release: 29jh
+Release: 30jh
 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
@@ -276,7 +276,10 @@
 
 
 %changelog
-* Thu Jan 13 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.0.5-1jh
+* Wed Jun  8 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.0.3-30jh
+- remove some obsolete options from default login.defs
+
+* Thu Jan 13 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - add malloc patch to make it compile with gcc 3.4
 - add more patches
 



From svn at tinysofa.org  Wed Jun  8 18:22:21 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  8 Jun 2005 14:22:21 -0400 (EDT)
Subject: [tinysofa-svn] r6433 - in contrib/classic/2.0/spamassassin/current:
	sources specs
Message-ID: <20050608182221.87C5434523F@minbar.tinysofa.org>

Author: gda
Date: 2005-06-08 14:21:51 -0400 (Wed, 08 Jun 2005)
New Revision: 6433

Added:
   contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.4.tar.bz2
Removed:
   contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.3.tar.bz2
Modified:
   contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec
Log:
3.0.4

Deleted: contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.3.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.4.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.4.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec
===================================================================
--- contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec	2005-06-08 11:11:16 UTC (rev 6432)
+++ contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec	2005-06-08 18:21:51 UTC (rev 6433)
@@ -3,7 +3,7 @@
 Summary:        a spam filter for email which can be invoked from mail delivery agents
 Group:          contrib
 Name: spamassassin
-Version: 3.0.3
+Version: 3.0.4
 Release: 1gd
 License: Apache License 2.0
 URL: http://spamassassin.apache.org/
@@ -124,6 +124,9 @@
 %service_postun spamassassin
 
 %changelog
+* Wed Jun  8 2005 Gerald Dachs <gda at tinysofa dot org> 3.0.4-1gd
+- 3.0.4
+
 * Thu May 19 2005 Gerald Dachs <gda at tinysofa dot org> 3.0.3-1gd
 - 3.0.3
 



From svn at tinysofa.org  Thu Jun  9 21:43:46 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  9 Jun 2005 17:43:46 -0400 (EDT)
Subject: [tinysofa-svn] r6434 - in
	contrib/classic/2.0/perl-mail-clamav/current: sources specs
Message-ID: <20050609214346.81A793450B8@minbar.tinysofa.org>

Author: gda
Date: 2005-06-09 17:43:36 -0400 (Thu, 09 Jun 2005)
New Revision: 6434

Added:
   contrib/classic/2.0/perl-mail-clamav/current/sources/Mail-ClamAV-0.17.tar.gz
Removed:
   contrib/classic/2.0/perl-mail-clamav/current/sources/Mail-ClamAV-0.13.tar.gz
Modified:
   contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
Log:
0.17

Deleted: contrib/classic/2.0/perl-mail-clamav/current/sources/Mail-ClamAV-0.13.tar.gz
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/perl-mail-clamav/current/sources/Mail-ClamAV-0.17.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/perl-mail-clamav/current/sources/Mail-ClamAV-0.17.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec
===================================================================
--- contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-08 18:21:51 UTC (rev 6433)
+++ contrib/classic/2.0/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-06-09 21:43:36 UTC (rev 6434)
@@ -2,8 +2,8 @@
 
 Summary: Perl extension for the clamav virus scanner
 Name: perl-mail-clamav
-Version: 0.13
-Release: 2jh
+Version: 0.17
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %doc Changes INSTALL README
 
 %changelog
+* Thu Jun  9 2005 Gerald Dachs <gda at tinysofa dot org> 0.17-1gd
+- new upstream
+
 * Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 0.13-1gd
 - new upstream
 



From svn at tinysofa.org  Fri Jun 10 09:27:58 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 10 Jun 2005 05:27:58 -0400 (EDT)
Subject: [tinysofa-svn] r6436 - in
	tinysofa/releases/classic/2.0/tar/current: sources specs
Message-ID: <20050610092758.398973451AE@minbar.tinysofa.org>

Author: jh
Date: 2005-06-10 05:27:48 -0400 (Fri, 10 Jun 2005)
New Revision: 6436

Added:
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.026-err-reporting.patch
Modified:
   tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
Log:
- improve error reporting in failed write

Added: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.026-err-reporting.patch
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.026-err-reporting.patch	2005-06-10 06:50:27 UTC (rev 6435)
+++ tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.026-err-reporting.patch	2005-06-10 09:27:48 UTC (rev 6436)
@@ -0,0 +1,22 @@
+--- ./archive_read_data_into_fd.c.err-reporting~	2005-06-04 09:47:07.000000000 +0300
++++ ./archive_read_data_into_fd.c	2005-06-10 12:23:49.000000000 +0300
+@@ -29,6 +29,7 @@
+ 
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <errno.h>
+ 
+ #include "archive.h"
+ #include "archive_private.h"
+@@ -65,8 +66,10 @@
+ 			if (bytes_to_write > MAX_WRITE)
+ 				bytes_to_write = MAX_WRITE;
+ 			bytes_written = write(fd, buff, bytes_to_write);
+-			if (bytes_written < 0)
++			if (bytes_written < 0) {
++				archive_set_error(a, errno, "Write error");
+ 				return (-1);
++			}
+ 			output_offset += bytes_written;
+ 			total_written += bytes_written;
+ 			size -= bytes_written;

Modified: tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-06-10 06:50:27 UTC (rev 6435)
+++ tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-06-10 09:27:48 UTC (rev 6436)
@@ -3,7 +3,7 @@
 Name: tar
 Epoch: 1
 Version: 1.02.026
-Release: 1jh
+Release: 2jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Patch0: bsdtar-1.01.022-setlocale.patch
 Patch1: bsdtar-1.02.006-malloc.patch
 Patch3: libarchive-1.02.009-eilseq.patch
+Patch4: libarchive-1.02.026-err-reporting.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -32,6 +33,7 @@
 
 pushd libarchive-%{libarchive_version}
 %patch3 -p1 -b .eilseq~
+%patch4 -p1 -b .err-reporting~
 popd
 
 
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Fri Jun 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.026-2jh
+- improve error reporting in failed write
+
 * Sat Jun  4 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.026-1jh
 - 1.02.026
 



From svn at tinysofa.org  Fri Jun 10 09:44:54 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 10 Jun 2005 05:44:54 -0400 (EDT)
Subject: [tinysofa-svn] r6437 - in
	tinysofa/releases/classic/2.0/tcpdump/current: sources specs
Message-ID: <20050610094454.DB2543450F2@minbar.tinysofa.org>

Author: jh
Date: 2005-06-10 05:44:45 -0400 (Fri, 10 Jun 2005)
New Revision: 6437

Added:
   tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-bgp-dos-2.patch
Modified:
   tinysofa/releases/classic/2.0/tcpdump/current/specs/tcpdump.spec
Log:
- fix CAN-2005-1267 (BGP DoS)

Added: tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-bgp-dos-2.patch
===================================================================
--- tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-bgp-dos-2.patch	2005-06-10 09:27:48 UTC (rev 6436)
+++ tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-bgp-dos-2.patch	2005-06-10 09:44:45 UTC (rev 6437)
@@ -0,0 +1,15 @@
+--- tcpdump-3.8.2/print-bgp.c.old	2005-05-31 11:58:00.000000000 +0200
++++ tcpdump-3.8.2/print-bgp.c	2005-05-31 12:01:01.000000000 +0200
+@@ -1706,9 +1706,10 @@
+ 		while (dat + length > p) {
+ 			char buf[MAXHOSTNAMELEN + 100];
+ 			i = decode_prefix4(p, buf, sizeof(buf));
+-			if (i == -1)
++			if (i == -1) {
+ 				printf("\n\t    (illegal prefix length)");
+-			else if (i == -2)
++				break;
++                        } else if (i == -2)
+ 				goto trunc;
+ 			else {
+ 				printf("\n\t    %s", buf);

Modified: tinysofa/releases/classic/2.0/tcpdump/current/specs/tcpdump.spec
===================================================================
--- tinysofa/releases/classic/2.0/tcpdump/current/specs/tcpdump.spec	2005-06-10 09:27:48 UTC (rev 6436)
+++ tinysofa/releases/classic/2.0/tcpdump/current/specs/tcpdump.spec	2005-06-10 09:44:45 UTC (rev 6437)
@@ -1,7 +1,7 @@
 Summary: A network traffic monitoring tool.
 Name: tcpdump
 Version: 3.8.3
-Release: 5jh
+Release: 6jh
 License: BSD
 Group: main
 Source: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
@@ -9,6 +9,7 @@
 Patch1: tcpdump-3.8.2-isis-dos.patch
 Patch2: tcpdump-3.8.2-ldp-dos.patch
 Patch3: tcpdump-3.8.2-rsvp-dos.patch
+Patch4: tcpdump-3.8.2-bgp-dos-2.patch
 BuildRequires: libpcap-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -27,6 +28,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -58,6 +60,9 @@
 
 
 %changelog
+* Fri Jun 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.8.3-6jh
+- fix CAN-2005-1267 (BGP DoS)
+
 * Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.8.3-5jh
 - fix CAN-2005-1280 (multiple DoS)
 



From svn at tinysofa.org  Mon Jun 13 08:45:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 13 Jun 2005 04:45:40 -0400 (EDT)
Subject: [tinysofa-svn] r6438 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050613084540.29927345110@minbar.tinysofa.org>

Author: jh
Date: 2005-06-13 04:45:30 -0400 (Mon, 13 Jun 2005)
New Revision: 6438

Added:
   tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.12.patch
Modified:
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- 2.6.11.12

Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.12.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.12.patch	2005-06-10 09:44:45 UTC (rev 6437)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.12.patch	2005-06-13 08:45:30 UTC (rev 6438)
@@ -0,0 +1,281 @@
+diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
+--- a/arch/x86_64/kernel/apic.c
++++ b/arch/x86_64/kernel/apic.c
+@@ -775,9 +775,7 @@ void __init setup_boot_APIC_clock (void)
+ 
+ void __init setup_secondary_APIC_clock(void)
+ {
+-	local_irq_disable(); /* FIXME: Do we need this? --RR */
+ 	setup_APIC_timer(calibration_result);
+-	local_irq_enable();
+ }
+ 
+ void __init disable_APIC_timer(void)
+diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
+--- a/arch/x86_64/kernel/ptrace.c
++++ b/arch/x86_64/kernel/ptrace.c
+@@ -252,7 +252,7 @@ asmlinkage long sys_ptrace(long request,
+ 			break;
+ 
+ 		switch (addr) { 
+-		case 0 ... sizeof(struct user_regs_struct):
++		case 0 ... sizeof(struct user_regs_struct) - sizeof(long):
+ 			tmp = getreg(child, addr);
+ 			break;
+ 		case offsetof(struct user, u_debugreg[0]):
+@@ -297,7 +297,7 @@ asmlinkage long sys_ptrace(long request,
+ 			break;
+ 
+ 		switch (addr) { 
+-		case 0 ... sizeof(struct user_regs_struct): 
++		case 0 ... sizeof(struct user_regs_struct) - sizeof(long):
+ 			ret = putreg(child, addr, data);
+ 			break;
+ 		/* Disallows to set a breakpoint into the vsyscall */
+diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
+--- a/arch/x86_64/kernel/smpboot.c
++++ b/arch/x86_64/kernel/smpboot.c
+@@ -309,8 +309,6 @@ void __init smp_callin(void)
+ 	Dprintk("CALLIN, before setup_local_APIC().\n");
+ 	setup_local_APIC();
+ 
+-	local_irq_enable();
+-
+ 	/*
+ 	 * Get our bogomips.
+ 	 */
+@@ -324,8 +322,6 @@ void __init smp_callin(void)
+ 	 */
+  	smp_store_cpu_info(cpuid);
+ 
+-	local_irq_disable();
+-
+ 	/*
+ 	 * Allow the master to continue.
+ 	 */
+diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
+--- a/drivers/media/video/bttv-cards.c
++++ b/drivers/media/video/bttv-cards.c
+@@ -1939,7 +1939,6 @@ struct tvcard bttv_tvcards[] = {
+         .no_tda9875     = 1,
+         .no_tda7432     = 1,
+         .tuner_type     = TUNER_ABSENT,
+-        .no_video       = 1,
+ 	.pll            = PLL_28,
+ },{
+ 	.name           = "Teppro TEV-560/InterVision IV-560",
+diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c
+--- a/fs/hfs/mdb.c
++++ b/fs/hfs/mdb.c
+@@ -333,6 +333,8 @@ void hfs_mdb_close(struct super_block *s
+  * Release the resources associated with the in-core MDB.  */
+ void hfs_mdb_put(struct super_block *sb)
+ {
++	if (!HFS_SB(sb))
++		return;
+ 	/* free the B-trees */
+ 	hfs_btree_close(HFS_SB(sb)->ext_tree);
+ 	hfs_btree_close(HFS_SB(sb)->cat_tree);
+@@ -340,4 +342,7 @@ void hfs_mdb_put(struct super_block *sb)
+ 	/* free the buffers holding the primary and alternate MDBs */
+ 	brelse(HFS_SB(sb)->mdb_bh);
+ 	brelse(HFS_SB(sb)->alt_mdb_bh);
++
++	kfree(HFS_SB(sb));
++	sb->s_fs_info = NULL;
+ }
+diff --git a/fs/hfs/super.c b/fs/hfs/super.c
+--- a/fs/hfs/super.c
++++ b/fs/hfs/super.c
+@@ -263,7 +263,7 @@ static int hfs_fill_super(struct super_b
+ 	res = -EINVAL;
+ 	if (!parse_options((char *)data, sbi)) {
+ 		hfs_warn("hfs_fs: unable to parse mount options.\n");
+-		goto bail3;
++		goto bail;
+ 	}
+ 
+ 	sb->s_op = &hfs_super_operations;
+@@ -276,7 +276,7 @@ static int hfs_fill_super(struct super_b
+ 			hfs_warn("VFS: Can't find a HFS filesystem on dev %s.\n",
+ 				hfs_mdb_name(sb));
+ 		res = -EINVAL;
+-		goto bail2;
++		goto bail;
+ 	}
+ 
+ 	/* try to get the root inode */
+@@ -306,10 +306,8 @@ bail_iput:
+ 	iput(root_inode);
+ bail_no_root:
+ 	hfs_warn("hfs_fs: get root inode failed.\n");
++bail:
+ 	hfs_mdb_put(sb);
+-bail2:
+-bail3:
+-	kfree(sbi);
+ 	return res;
+ }
+ 
+diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
+--- a/fs/hfsplus/super.c
++++ b/fs/hfsplus/super.c
+@@ -207,7 +207,9 @@ static void hfsplus_write_super(struct s
+ static void hfsplus_put_super(struct super_block *sb)
+ {
+ 	dprint(DBG_SUPER, "hfsplus_put_super\n");
+-	if (!(sb->s_flags & MS_RDONLY)) {
++	if (!sb->s_fs_info)
++		return;
++	if (!(sb->s_flags & MS_RDONLY) && HFSPLUS_SB(sb).s_vhdr) {
+ 		struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr;
+ 
+ 		vhdr->modify_date = hfsp_now2mt();
+@@ -223,6 +225,8 @@ static void hfsplus_put_super(struct sup
+ 	iput(HFSPLUS_SB(sb).alloc_file);
+ 	iput(HFSPLUS_SB(sb).hidden_dir);
+ 	brelse(HFSPLUS_SB(sb).s_vhbh);
++	kfree(sb->s_fs_info);
++	sb->s_fs_info = NULL;
+ }
+ 
+ static int hfsplus_statfs(struct super_block *sb, struct kstatfs *buf)
+diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
+--- a/fs/jbd/checkpoint.c
++++ b/fs/jbd/checkpoint.c
+@@ -339,8 +339,10 @@ int log_do_checkpoint(journal_t *journal
+ 			}
+ 		} while (jh != last_jh && !retry);
+ 
+-		if (batch_count)
++		if (batch_count) {
+ 			__flush_batch(journal, bhs, &batch_count);
++			retry = 1;
++		}
+ 
+ 		/*
+ 		 * If someone cleaned up this transaction while we slept, we're
+diff --git a/mm/rmap.c b/mm/rmap.c
+--- a/mm/rmap.c
++++ b/mm/rmap.c
+@@ -641,7 +641,7 @@ static void try_to_unmap_cluster(unsigne
+ 	pgd_t *pgd;
+ 	pud_t *pud;
+ 	pmd_t *pmd;
+-	pte_t *pte;
++	pte_t *pte, *original_pte;
+ 	pte_t pteval;
+ 	struct page *page;
+ 	unsigned long address;
+@@ -673,7 +673,7 @@ static void try_to_unmap_cluster(unsigne
+ 	if (!pmd_present(*pmd))
+ 		goto out_unlock;
+ 
+-	for (pte = pte_offset_map(pmd, address);
++	for (original_pte = pte = pte_offset_map(pmd, address);
+ 			address < end; pte++, address += PAGE_SIZE) {
+ 
+ 		if (!pte_present(*pte))
+@@ -710,7 +710,7 @@ static void try_to_unmap_cluster(unsigne
+ 		(*mapcount)--;
+ 	}
+ 
+-	pte_unmap(pte);
++	pte_unmap(original_pte);
+ 
+ out_unlock:
+ 	spin_unlock(&mm->page_table_lock);
+diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -54,6 +54,9 @@ int br_handle_frame_finish(struct sk_buf
+ 	struct net_bridge_fdb_entry *dst;
+ 	int passedup = 0;
+ 
++	/* insert into forwarding database after filtering to avoid spoofing */
++	br_fdb_insert(p->br, p, eth_hdr(skb)->h_source, 0);
++
+ 	if (br->dev->flags & IFF_PROMISC) {
+ 		struct sk_buff *skb2;
+ 
+@@ -108,8 +111,7 @@ int br_handle_frame(struct net_bridge_po
+ 	if (eth_hdr(skb)->h_source[0] & 1)
+ 		goto err;
+ 
+-	if (p->state == BR_STATE_LEARNING ||
+-	    p->state == BR_STATE_FORWARDING)
++	if (p->state == BR_STATE_LEARNING)
+ 		br_fdb_insert(p->br, p, eth_hdr(skb)->h_source, 0);
+ 
+ 	if (p->br->stp_enabled &&
+diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -140,6 +140,9 @@ int br_stp_handle_bpdu(struct sk_buff *s
+ 	struct net_bridge *br = p->br;
+ 	unsigned char *buf;
+ 
++	/* insert into forwarding database after filtering to avoid spoofing */
++	br_fdb_insert(p->br, p, eth_hdr(skb)->h_source, 0);
++
+ 	/* need at least the 802 and STP headers */
+ 	if (!pskb_may_pull(skb, sizeof(header)+1) ||
+ 	    memcmp(skb->data, header, sizeof(header)))
+diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
+--- a/net/ipv4/netfilter/ip_queue.c
++++ b/net/ipv4/netfilter/ip_queue.c
+@@ -3,6 +3,7 @@
+  * communicating with userspace via netlink.
+  *
+  * (C) 2000-2002 James Morris <jmorris at intercode.com.au>
++ * (C) 2003-2005 Netfilter Core Team <coreteam at netfilter.org>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+@@ -14,6 +15,7 @@
+  *             Zander).
+  * 2000-08-01: Added Nick Williams' MAC support.
+  * 2002-06-25: Code cleanup.
++ * 2005-05-26: local_bh_{disable,enable} around nf_reinject (Harald Welte)
+  *
+  */
+ #include <linux/module.h>
+@@ -66,7 +68,15 @@ static DECLARE_MUTEX(ipqnl_sem);
+ static void
+ ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict)
+ {
++	/* TCP input path (and probably other bits) assume to be called
++	 * from softirq context, not from syscall, like ipq_issue_verdict is
++	 * called.  TCP input path deadlocks with locks taken from timer
++	 * softirq, e.g.  We therefore emulate this by local_bh_disable() */
++
++	local_bh_disable();
+ 	nf_reinject(entry->skb, entry->info, verdict);
++	local_bh_enable();
++
+ 	kfree(entry);
+ }
+ 
+diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
+--- a/net/sched/sch_netem.c
++++ b/net/sched/sch_netem.c
+@@ -184,10 +184,15 @@ static int netem_enqueue(struct sk_buff 
+ 	/* Random duplication */
+ 	if (q->duplicate && q->duplicate >= get_crandom(&q->dup_cor)) {
+ 		struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
+-
+-		pr_debug("netem_enqueue: dup %p\n", skb2);
+-		if (skb2)
+-			delay_skb(sch, skb2);
++		if (skb2) {
++			struct Qdisc *rootq = sch->dev->qdisc;
++			u32 dupsave = q->duplicate;
++
++			/* prevent duplicating a dup... */
++			q->duplicate = 0;
++			rootq->enqueue(skb2, rootq);
++			q->duplicate = dupsave;
++		}
+ 	}
+ 
+ 	/* If doing simple delay then gap == 0 so all packets

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-06-10 09:44:45 UTC (rev 6437)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-06-13 08:45:30 UTC (rev 6438)
@@ -89,7 +89,8 @@
 Patch8: 2.6.11.9.patch
 Patch9: 2.6.11.10.patch
 Patch10: 2.6.11.11-mod.patch
-Patch11: acpi-20050309-2.6.11.diff
+Patch11: 2.6.11.12.patch
+Patch12: acpi-20050309-2.6.11.diff
 
 Patch101: linux-2.6.11-epoll.patch
 Patch102: linux-2.6.11-compile.patch
@@ -245,6 +246,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %patch101 -p1 -b .epoll~
 %patch102 -p1 -b .compile~
@@ -607,6 +609,9 @@
 
 
 %changelog
+* Mon Jun 13 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- 2.6.11.12
+
 * Thu Jun  9 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - fix get_unmapped_area sanity tests
 - update cifs to 1.34a



From svn at tinysofa.org  Wed Jun 15 08:23:19 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 15 Jun 2005 04:23:19 -0400 (EDT)
Subject: [tinysofa-svn] r6440 - contrib/1.1/clamav
Message-ID: <20050615082319.A8914344B07@minbar.tinysofa.org>

Author: jh
Date: 2005-06-15 04:23:13 -0400 (Wed, 15 Jun 2005)
New Revision: 6440

Removed:
   contrib/1.1/clamav/current/
Log:
- remove




From svn at tinysofa.org  Wed Jun 15 08:24:02 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 15 Jun 2005 04:24:02 -0400 (EDT)
Subject: [tinysofa-svn] r6441 - contrib/1.1/clamav
Message-ID: <20050615082402.037CC344AD0@minbar.tinysofa.org>

Author: jh
Date: 2005-06-15 04:23:51 -0400 (Wed, 15 Jun 2005)
New Revision: 6441

Added:
   contrib/1.1/clamav/current/
Log:
- copy from 2.0


Copied: contrib/1.1/clamav/current (from rev 6440, contrib/classic/2.0/clamav/current)



From svn at tinysofa.org  Wed Jun 15 08:31:20 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 15 Jun 2005 04:31:20 -0400 (EDT)
Subject: [tinysofa-svn] r6442 - contrib/classic/2.0/net-snmp/current/specs
Message-ID: <20050615083120.C50F8344AE1@minbar.tinysofa.org>

Author: jh
Date: 2005-06-15 04:31:14 -0400 (Wed, 15 Jun 2005)
New Revision: 6442

Modified:
   contrib/classic/2.0/net-snmp/current/specs/net-snmp.spec
Log:
- BuildPrereq: zlib-devel, bzip2-devel


Modified: contrib/classic/2.0/net-snmp/current/specs/net-snmp.spec
===================================================================
--- contrib/classic/2.0/net-snmp/current/specs/net-snmp.spec	2005-06-15 08:23:51 UTC (rev 6441)
+++ contrib/classic/2.0/net-snmp/current/specs/net-snmp.spec	2005-06-15 08:31:14 UTC (rev 6442)
@@ -47,6 +47,7 @@
 BuildPrereq: tcp_wrappers-devel
 %endif
 BuildPrereq: perl-devel, coreutils, grep, sed, findutils
+BuildPrereq: zlib-devel, bzip2-devel
 
 #%define __libtoolize /bin/true
 %{expand: %%define _includedir	%{_includedir}/%{name}}



From svn at tinysofa.org  Mon Jun 20 07:21:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 20 Jun 2005 03:21:25 -0400 (EDT)
Subject: [tinysofa-svn] r6443 - in contrib/classic/2.0: . smart
	smart/current smart/current/sources smart/current/specs
Message-ID: <20050620072125.642133451B5@minbar.tinysofa.org>

Author: jh
Date: 2005-06-20 03:21:04 -0400 (Mon, 20 Jun 2005)
New Revision: 6443

Added:
   contrib/classic/2.0/smart/
   contrib/classic/2.0/smart/current/
   contrib/classic/2.0/smart/current/sources/
   contrib/classic/2.0/smart/current/sources/distro.py
   contrib/classic/2.0/smart/current/sources/smart-0.36.tar.bz2
   contrib/classic/2.0/smart/current/sources/smart.console
   contrib/classic/2.0/smart/current/sources/smart.desktop
   contrib/classic/2.0/smart/current/sources/smart.pam
   contrib/classic/2.0/smart/current/specs/
   contrib/classic/2.0/smart/current/specs/smart.spec
   contrib/classic/2.0/smart/pristine/
   contrib/classic/2.0/smart/releases/
Log:
- add smartpm


Added: contrib/classic/2.0/smart/current/sources/distro.py
===================================================================
--- contrib/classic/2.0/smart/current/sources/distro.py	2005-06-15 08:31:14 UTC (rev 6442)
+++ contrib/classic/2.0/smart/current/sources/distro.py	2005-06-20 07:21:04 UTC (rev 6443)
@@ -0,0 +1,38 @@
+if not sysconf.getReadOnly():
+    if not sysconf.has("channels"):
+        sysconf.set(("channels", "rpm-sys"),
+                    {"type": "rpm-sys",
+                     "name": "RPM Database"})
+
+        sysconf.set(("channels", "main"),
+                    {"type": "apt-rpm",
+                     "name": "tinysofa main site (HTTP)",
+                     "baseurl": "http://minbar.tinysofa.org/pub/tinysofa/"
+                                "releases/classic-2.0/i586/tinysofa",
+                     "components": "all"})
+
+        sysconf.set(("channels", "updates"),
+                    {"type": "apt-rpm",
+                     "name": "tinysofa main site (HTTP) updates",
+                     "baseurl": "http://minbar.tinysofa.org/pub/tinysofa/"
+                                "updates/classic-2.0/i586/tinysofa",
+                     "components": "updates"})
+
+        sysconf.set(("channels", "contrib"),
+                    {"type": "apt-rpm",
+                     "name": "tinysofa main site (HTTP) contrib",
+                     "baseurl": "http://minbar.tinysofa.org/pub/tinysofa/"
+                                "contrib/classic-2.0/i586/tinysofa",
+                     "components": "contrib"})
+
+    for type in ("",
+                 "BOOT",
+                 "devel",
+                 "smp",
+                 "smp-devel"):
+        if type:
+            kernel = "kernel-%s" % type
+        else:
+            kernel = "kernel"
+        pkgconf.setFlag("multi-version", kernel)
+

Added: contrib/classic/2.0/smart/current/sources/smart-0.36.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/smart/current/sources/smart-0.36.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/smart/current/sources/smart.console
===================================================================
--- contrib/classic/2.0/smart/current/sources/smart.console	2005-06-15 08:31:14 UTC (rev 6442)
+++ contrib/classic/2.0/smart/current/sources/smart.console	2005-06-20 07:21:04 UTC (rev 6443)
@@ -0,0 +1,3 @@
+USER=root
+PROGRAM=/usr/bin/smart
+SESSION=true

Added: contrib/classic/2.0/smart/current/sources/smart.desktop
===================================================================
--- contrib/classic/2.0/smart/current/sources/smart.desktop	2005-06-15 08:31:14 UTC (rev 6442)
+++ contrib/classic/2.0/smart/current/sources/smart.desktop	2005-06-20 07:21:04 UTC (rev 6443)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Smart Package Manager
+Name[pt_BR]=Gerenciador de Pacotes Smart
+Comment=Next generation package handling tool
+Comment[pt_BR]=Gerenciador de pacotes de pr?xima gera??o
+Icon=smart-package-manager.png
+Exec=/usr/bin/smart-root --gui
+Type=Application
+Terminal=false
+StartupNotify=true
+Categories=Application;System
+X-Desktop-File-Install-Version=0.2


Property changes on: contrib/classic/2.0/smart/current/sources/smart.desktop
___________________________________________________________________
Name: svn:executable
   + *

Added: contrib/classic/2.0/smart/current/sources/smart.pam
===================================================================
--- contrib/classic/2.0/smart/current/sources/smart.pam	2005-06-15 08:31:14 UTC (rev 6442)
+++ contrib/classic/2.0/smart/current/sources/smart.pam	2005-06-20 07:21:04 UTC (rev 6443)
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth       sufficient	pam_rootok.so
+auth       sufficient	pam_timestamp.so
+auth       required	pam_stack.so service=system-auth
+session    required	pam_permit.so
+session    optional	pam_timestamp.so
+session    optional	pam_xauth.so
+account    required	pam_permit.so

Added: contrib/classic/2.0/smart/current/specs/smart.spec
===================================================================
--- contrib/classic/2.0/smart/current/specs/smart.spec	2005-06-15 08:31:14 UTC (rev 6442)
+++ contrib/classic/2.0/smart/current/specs/smart.spec	2005-06-20 07:21:04 UTC (rev 6443)
@@ -0,0 +1,147 @@
+%define with_psyco		0
+%define with_smart_update	1
+Name: smart
+Version: 0.36
+Release: 1jh
+Group: contrib
+Summary: Next generation package handling tool
+Source0: smart-%{version}.tar.bz2
+Source1: distro.py
+Source2: smart.console
+Source3: smart.pam
+Source4: smart.desktop
+License: GPL
+URL: http://smartpm.org/
+Requires: python rpm-python
+%if %{with_psyco}
+%ifarch %{ix86}
+Requires: python-psyco
+%endif
+%endif
+BuildRequires: python-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+Smart Package Manager is a next generation package handling tool.
+
+%if %with_smart_update 
+%package update
+Summary: Allows execution of 'smart update' by normal users (suid)
+Group: contrib
+Requires: smart
+
+%description update
+Allows execution of 'smart update' by normal users through a
+special suid command.
+%endif
+
+
+%prep
+%setup -q
+
+
+%build
+env CFLAGS="%{optflags}" python setup.py build
+
+%if %with_smart_update 
+pushd contrib/smart-update
+%make
+popd
+%endif
+
+
+%install
+python setup.py install --root=%{buildroot} --record=INSTALLED_FILES
+
+mkdir -p %{buildroot}%{_libdir}/smart \
+	%{buildroot}%{_localstatedir}/smart/channels \
+	%{buildroot}%{_localstatedir}/lib/smart
+install -m 644 %{SOURCE1} %{buildroot}%{_libdir}/smart/distro.py
+
+#ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
+
+#mkdir -p %{buildroot}/%{_sysconfdir}/security/console.apps
+#mkdir -p %{buildroot}/%{_sysconfdir}/pam.d
+#install -m 644 %{_sourcedir}/smart.console \
+#	%{buildroot}/%{_sysconfdir}/security/console.apps/smart-root
+#install -m 644 %{_sourcedir}/smart.pam \
+#	%{buildroot}/%{_sysconfdir}/pam.d/smart-root
+
+%if %with_smart_update 
+pushd contrib/smart-update
+cp -f smart-update %{buildroot}%{_bindir}
+popd
+%endif
+
+
+%clean
+%clean_buildroot
+
+
+%files -f INSTALLED_FILES
+%defattr(0644,root,root,0755)
+%doc HACKING README LICENSE TODO IDEAS doc
+%defattr(-,root,root)
+%{_libdir}/smart/distro.py
+#%{_bindir}/smart-root
+#%config(noreplace) %{_sysconfdir}/security/console.apps/smart-root
+#%config(noreplace) %{_sysconfdir}/pam.d/smart-root
+%{_localstatedir}/smart
+%dir %{_localstatedir}/lib/smart
+
+%if %with_smart_update
+%files update
+%attr(4755,root,root) %{_bindir}/smart-update
+%endif
+
+%changelog
+* Mon Jun 20 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.36-1jh
+- tinysofa contrib
+
+* Fri Jun 17 2005 Gustavo Niemeyer <gustavo at niemeyer.net> 0.36-1mdk 
+- New upstream version: 0.36
+
+* Mon May 30 2005 Helio Chissini de Castro <helio at mandriva.com> 0.35-2mdk
+- Added modifications from last package
+
+* Mon May 30 2005 Helio Chissini de Castro <helio at mandriva.com> 0.35-1mdk
+- New upstream version
+
+* Tue Mar 29 2005 Helio Chissini de castro <helio at mandrakesoft.com> 0.30.2-1mdk
+- Fixed minor flaw introduced by latest package
+
+* Tue Mar 29 2005 Helio Chissini de castro <helio at mandrakesoft.com> 0.30.1-1mdk
+- Minor fix for Python 2.3 backports
+
+* Thu Mar 24 2005 Helio Chissini de Castro <helio at mandrakesoft.com> 0.30-1mdk
+- Changed spec layout and add the ability to generates just smart utilty
+- Search option now available to regular users
+- provides: path: requires: methods are available, allowing usual mdk devel
+  requires match
+- config is no longer available on package, as smart is in charge of handle this
+  file now
+
+* Wed Mar 16 2005 Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com> 0.29.2-2mdk
+- amd64 compilation fix (by trem)
+
+* Mon Mar 07 2005 Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com> 0.29.2-1mdk
+- New version
+- Remove patch2, integrated upstream
+
+* Fri Mar 04 2005 Laurent MONTEL <lmontel at mandrakesoft.com> 0.29-3mdk
+- Patch2: fix qtooltips, remove it before to add it.
+
+* Fri Mar 04 2005 Laurent MONTEL <lmontel at mandrakesoft.com> 0.29-2mdk
+- Patch1: Includemoc into ksmarttray
+
+* Wed Mar 02 2005 Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com> 0.29-1mdk
+- 0.29
+- Require rpm-python for GUI
+- Remove inter-package requires on release
+
+* Wed Dec 08 2004 Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com> 0.28-1mdk
+- New version 0.28
+
+* Mon Dec 06 2004 Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com> 0.27.1-1mdk
+- First Mandrakelinux package, based on Guilherme Manika's FC3 spec file,
+  with the help of Michael Scherer.



From svn at tinysofa.org  Mon Jun 20 09:37:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 20 Jun 2005 05:37:29 -0400 (EDT)
Subject: [tinysofa-svn] r6444 - in
	tinysofa/releases/classic/2.0/telnet/current: sources specs
Message-ID: <20050620093729.16F6A3452AD@minbar.tinysofa.org>

Author: jh
Date: 2005-06-20 05:37:19 -0400 (Mon, 20 Jun 2005)
New Revision: 6444

Added:
   tinysofa/releases/classic/2.0/telnet/current/sources/telnet-owl-env-export.diff
Modified:
   tinysofa/releases/classic/2.0/telnet/current/specs/telnet.spec
Log:
- fix IDEF0865 (ENV overflow)

Added: tinysofa/releases/classic/2.0/telnet/current/sources/telnet-owl-env-export.diff
===================================================================
--- tinysofa/releases/classic/2.0/telnet/current/sources/telnet-owl-env-export.diff	2005-06-20 07:21:04 UTC (rev 6443)
+++ tinysofa/releases/classic/2.0/telnet/current/sources/telnet-owl-env-export.diff	2005-06-20 09:37:19 UTC (rev 6444)
@@ -0,0 +1,101 @@
+--- telnet-bsd-1.1/telnet/commands.c
++++ telnet-bsd-1.1/telnet/commands.c
+@@ -1795,7 +1795,10 @@
+   struct env_lst *prev;		/* pointer to previous structure */
+   unsigned char *var;		/* pointer to variable name */
+   unsigned char *value;		/* pointer to variable value */
+-  int export;			/* 1 -> export with default list of variables */
++  int export;			/* whether and how to export this variable: */
++  /* 0: don't permit export */
++  /* 1: export with default list of variables */
++  /* 2: export if explicitly requested by the server only */
+   int welldefined;		/* A well defined variable */
+ };
+ 
+@@ -1873,6 +1876,8 @@
+       env_define ((unsigned char *) "USER", ep->value);
+       env_unexport ((unsigned char *) "USER");
+     }
++  if ((ep = env_find("TERM")))
++    ep->export = 2;
+   env_export ((unsigned char *) "DISPLAY");
+   env_export ((unsigned char *) "PRINTER");
+   env_export ((unsigned char *) "XAUTHORITY");
+@@ -1975,7 +1980,8 @@
+ 
+   for (ep = envlisthead.next; ep; ep = ep->next)
+     {
+-      printf ("%c %-20s %s\r\n", ep->export ? '*' : ' ', ep->var, ep->value);
++      printf("%c %-20s %s\r\n", " *+"[ep->export],
++		      ep->var, ep->value);
+     }
+ }
+ 
+@@ -1993,7 +1999,7 @@
+     {
+       while ((nep = nep->next))
+ 	{
+-	  if (nep->export && (nep->welldefined == welldefined))
++	  if (nep->export == 1 && nep->welldefined == welldefined)
+ 	    return (nep->var);
+ 	}
+     }
+@@ -2005,7 +2011,7 @@
+ {
+   struct env_lst *ep;
+ 
+-  if ((ep = env_find (var)))
++  if ((ep = env_find (var)) && ep->export)
+     return (ep->value);
+   return (NULL);
+ }
+--- telnet-bsd-1.1/telnet/telnet.1
++++ telnet-bsd-1.1/telnet/telnet.1
+@@ -437,11 +437,12 @@
+ variables that may be sent through the
+ .Dv TELNET ENVIRON
+ option.
+-The initial set of variables is taken from the users
++The initial set of variables is taken from the user's
+ environment, with only the
+-.Ev DISPLAY
++.Ev DISPLAY ,
++.Ev PRINTER ,
+ and
+-.Ev PRINTER
++.Ev XAUTHORITY
+ variables being exported by default.
+ The
+ .Ev USER
+@@ -450,7 +451,10 @@
+ or
+ .Fl l
+ options are used.
+-.br
++Additionally, the value of the
++.Ev TERM
++variable is by default available to be queried by the server.
++.Pp
+ Valid arguments for the
+ .Ic environ
+ command are:
+@@ -476,14 +480,16 @@
+ .It Ic unexport Ar variable
+ Mark the variable
+ .Ar variable
+-to not be exported unless
+-explicitly asked for by the remote side.
++to not be exported.
+ .It Ic list
+ List the current set of environment variables.
+ Those marked with a
+ .Cm *
+ will be sent automatically,
+-other variables will only be sent if explicitly requested.
++those marked with a
++.Cm +
++will only be sent if explicitly requested by the server,
++and others won't be revealed to the server even if requested.
+ .It Ic \&?
+ Prints out help information for the
+ .Ic environ

Modified: tinysofa/releases/classic/2.0/telnet/current/specs/telnet.spec
===================================================================
--- tinysofa/releases/classic/2.0/telnet/current/specs/telnet.spec	2005-06-20 07:21:04 UTC (rev 6443)
+++ tinysofa/releases/classic/2.0/telnet/current/specs/telnet.spec	2005-06-20 09:37:19 UTC (rev 6444)
@@ -1,12 +1,13 @@
 Summary: A client for the telnet remote login protocol.
 Name: telnet
 Version: 1.1
-Release: 2jh
+Release: 3jh
 License: BSD
 Group: main
 Source: telnet-bsd-%{version}.tar.bz2
 Patch0: telnet-bsd-1.1.diff
 Patch1: telnet-bsd-1.1-SLC+ENV-fix.diff
+Patch2: telnet-owl-env-export.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ncurses-devel
 
@@ -23,6 +24,7 @@
 %setup -q -n telnet-bsd-%{version}
 %patch0 -p0
 %patch1 -p1 -b .security~
+%patch2 -p1 -b .security2~
 
 
 %build
@@ -53,6 +55,9 @@
 
 
 %changelog
+* Mon Jun 20 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1-3jh
+- fix IDEF0865 (ENV overflow)
+
 * Wed Mar 30 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1-2jh
 - fixes for CAN-2005-0468 and CAN-2005-0469 (telnet-bsd-1.1-SLC+ENV-fix.diff)
 



From svn at tinysofa.org  Mon Jun 20 19:59:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 20 Jun 2005 15:59:26 -0400 (EDT)
Subject: [tinysofa-svn] r6445 - in contrib/classic/2.0/smart/current:
	sources specs
Message-ID: <20050620195926.51E90345224@minbar.tinysofa.org>

Author: jh
Date: 2005-06-20 15:59:19 -0400 (Mon, 20 Jun 2005)
New Revision: 6445

Added:
   contrib/classic/2.0/smart/current/sources/smart-0.36-rpm-check-signatures.patch
Modified:
   contrib/classic/2.0/smart/current/specs/smart.spec
Log:
- check rpm signatures as default
- require gnupg


Added: contrib/classic/2.0/smart/current/sources/smart-0.36-rpm-check-signatures.patch
===================================================================
--- contrib/classic/2.0/smart/current/sources/smart-0.36-rpm-check-signatures.patch	2005-06-20 09:37:19 UTC (rev 6444)
+++ contrib/classic/2.0/smart/current/sources/smart-0.36-rpm-check-signatures.patch	2005-06-20 19:59:19 UTC (rev 6445)
@@ -0,0 +1,11 @@
+--- ./smart/backends/rpm/pm.py.orig	2005-06-20 22:55:22.000000000 +0300
++++ ./smart/backends/rpm/pm.py	2005-06-20 22:55:32.000000000 +0300
+@@ -94,7 +94,7 @@
+             flags |= rpm.RPMTRANS_FLAG_TEST
+         ts.setFlags(flags)
+ 
+-        if not sysconf.get("rpm-check-signatures", False):
++        if not sysconf.get("rpm-check-signatures", True):
+             ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
+ 
+         # Let's help RPM, since it doesn't do a good

Modified: contrib/classic/2.0/smart/current/specs/smart.spec
===================================================================
--- contrib/classic/2.0/smart/current/specs/smart.spec	2005-06-20 09:37:19 UTC (rev 6444)
+++ contrib/classic/2.0/smart/current/specs/smart.spec	2005-06-20 19:59:19 UTC (rev 6445)
@@ -2,7 +2,7 @@
 %define with_smart_update	1
 Name: smart
 Version: 0.36
-Release: 1jh
+Release: 2jh
 Group: contrib
 Summary: Next generation package handling tool
 Source0: smart-%{version}.tar.bz2
@@ -10,9 +10,11 @@
 Source2: smart.console
 Source3: smart.pam
 Source4: smart.desktop
+Patch0: smart-0.36-rpm-check-signatures.patch
 License: GPL
 URL: http://smartpm.org/
 Requires: python rpm-python
+Requires: gnupg
 %if %{with_psyco}
 %ifarch %{ix86}
 Requires: python-psyco
@@ -38,6 +40,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .rpm-check-signatures~
 
 
 %build
@@ -94,7 +97,12 @@
 %attr(4755,root,root) %{_bindir}/smart-update
 %endif
 
+
 %changelog
+* Mon Jun 20 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.36-2jh
+- check rpm signatures as default
+- require gnupg
+
 * Mon Jun 20 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.36-1jh
 - tinysofa contrib
 



From svn at tinysofa.org  Mon Jun 20 21:10:10 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 20 Jun 2005 17:10:10 -0400 (EDT)
Subject: [tinysofa-svn] r6446 - in contrib/classic/2.0: . pygtk
	pygtk/current pygtk/current/sources pygtk/current/specs
Message-ID: <20050620211010.836D33451F8@minbar.tinysofa.org>

Author: gda
Date: 2005-06-20 17:09:43 -0400 (Mon, 20 Jun 2005)
New Revision: 6446

Added:
   contrib/classic/2.0/pygtk/
   contrib/classic/2.0/pygtk/current/
   contrib/classic/2.0/pygtk/current/sources/
   contrib/classic/2.0/pygtk/current/sources/pygtk-2.4.1.tar.bz2
   contrib/classic/2.0/pygtk/current/specs/
   contrib/classic/2.0/pygtk/current/specs/pygtk.spec
   contrib/classic/2.0/pygtk/pristine/
   contrib/classic/2.0/pygtk/releases/
Log:
new in contrib

Added: contrib/classic/2.0/pygtk/current/sources/pygtk-2.4.1.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/pygtk/current/sources/pygtk-2.4.1.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/pygtk/current/specs/pygtk.spec
===================================================================
--- contrib/classic/2.0/pygtk/current/specs/pygtk.spec	2005-06-20 19:59:19 UTC (rev 6445)
+++ contrib/classic/2.0/pygtk/current/specs/pygtk.spec	2005-06-20 21:09:43 UTC (rev 6446)
@@ -0,0 +1,126 @@
+Summary: Python bindings for the GTK+ widget set.
+Name: pygtk
+Version: 2.4.1
+Release: 1gd
+Copyright: LGPL
+Group: contrib
+Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
+BuildRoot: /var/tmp/pygtk-root
+Requires: gtk >= 2.0.0
+Requires: python >= 2.2
+Buildrequires: python-devel >= 2.2
+Buildrequires: libglade-devel gcc-c++
+
+%description
+PyGTK is an extension module for python that gives you access to the GTK+
+widget set.  Just about anything you can write in C with GTK+ you can write
+in python with PyGTK (within reason), but with all the benefits of python.
+
+%package libglade
+Summary: A wrapper for the libglade library for use with PyGTK
+Group: contrib
+Requires: pygtk = %{version}
+
+%description libglade
+This module contains a wrapper for the libglade library.  Libglade allows
+a program to construct its user interface from an XML description, which
+allows the programmer to keep the UI and program logic separate.
+
+%package devel
+Summary: files needed to build wrappers for GTK+ addon libraries
+Group: contrib
+Requires: pygtk = %{version}
+
+%description devel
+This package contains files required to build wrappers for GTK+ addon
+libraries so that they interoperate with pygtk.
+
+%prep
+%setup -q -n pygtk-%{version}
+%configure
+
+%build
+%make
+
+%install
+%makeinstall
+
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(644, root, root, 755)
+%{_prefix}/lib/python?.?/site-packages/pygtk.pth
+%{_prefix}/lib/python?.?/site-packages/pygtk.py*
+%dir %{_prefix}/lib/python?.?/site-packages/gtk-2.0
+%dir %{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/__init__.py*
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/compat.*
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/keysyms.py*
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/dsextras*
+
+%defattr(755, root, root, 755)
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/atk.so
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gobject.so
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/pango.so
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/_gtk.so
+
+%doc AUTHORS NEWS README MAPPING ChangeLog
+%doc examples
+
+%files libglade
+%defattr(755, root, root, 755)
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/glade.so
+
+%files devel
+%defattr(755, root, root, 755)
+%{_prefix}/bin/pygtk-codegen-2.0
+%defattr(644, root, root, 755)
+%dir %{_prefix}/include/pygtk-2.0
+%{_prefix}/include/pygtk-2.0/*.h
+%dir %{_prefix}/include/pygtk-2.0/pygtk
+%{_prefix}/include/pygtk-2.0/pygtk/*.h
+%{_libdir}/pkgconfig/pygtk-2.0.pc
+%dir %{_prefix}/share/pygtk
+%dir %{_prefix}/share/pygtk/2.0
+%dir %{_prefix}/share/pygtk/2.0/codegen
+%dir %{_prefix}/share/pygtk/2.0/defs
+%{_prefix}/share/pygtk/2.0/codegen/*
+%{_prefix}/share/pygtk/2.0/defs/atk.defs
+%{_prefix}/share/pygtk/2.0/defs/atk-types.defs
+%{_prefix}/share/pygtk/2.0/defs/pango.defs
+%{_prefix}/share/pygtk/2.0/defs/pango-types.defs
+%{_prefix}/share/pygtk/2.0/defs/gdk.defs
+%{_prefix}/share/pygtk/2.0/defs/gdk-types.defs
+%{_prefix}/share/pygtk/2.0/defs/gtk.defs
+%{_prefix}/share/pygtk/2.0/defs/gtk-types.defs
+%{_prefix}/share/pygtk/2.0/defs/gtk-extrafuncs.defs
+%{_prefix}/share/pygtk/2.0/defs/libglade.defs
+
+%changelog
+* Mon Jun 20 2005 <gda at tinysofa dot org> 2.4.1-1gd
+- adopted for tinysofa contrib
+
+* Thu Oct 31 2002 Matt Wilson <msw at redhat.com>
+- use libdir for .pc files
+
+* Wed Feb 27 2002 Matt Wilson <msw at redhat.com>
+- 1.99.8
+
+* Mon Jan 28 2002 Matt Wilson <msw at redhat.com>
+- added atkmodule.so to file list
+
+* Thu Oct 18 2001 Matt Wilson <msw at redhat.com>
+- fix devel filelist to match new header location
+
+* Mon Oct 15 2001 Matt Wilson <msw at redhat.com>
+- get the headers from their new version-specific location
+
+* Thu Oct 11 2001 Matt Wilson <msw at redhat.com>
+- fixed typo in devel filelist
+- added macro that tests to see if we have libglade2, make the
+  filelist a condition of that
+- changed name to 'pygtk2' to avoid name conflict with pygtk
+



From svn at tinysofa.org  Mon Jun 20 21:18:09 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 20 Jun 2005 17:18:09 -0400 (EDT)
Subject: [tinysofa-svn] r6447 -
	contrib/classic/2.0/spamassassin/current/specs
Message-ID: <20050620211809.08C7034521D@minbar.tinysofa.org>

Author: gda
Date: 2005-06-20 17:18:03 -0400 (Mon, 20 Jun 2005)
New Revision: 6447

Modified:
   contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec
Log:
fixed group

Modified: contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec
===================================================================
--- contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec	2005-06-20 21:09:43 UTC (rev 6446)
+++ contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec	2005-06-20 21:18:03 UTC (rev 6447)
@@ -4,7 +4,7 @@
 Group:          contrib
 Name: spamassassin
 Version: 3.0.4
-Release: 1gd
+Release: 2gd
 License: Apache License 2.0
 URL: http://spamassassin.apache.org/
 Source: http://spamassassin.apache.org/released/Mail-SpamAssassin-%{version}.tar.bz2
@@ -42,7 +42,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
@@ -124,6 +124,9 @@
 %service_postun spamassassin
 
 %changelog
+* Mon Jun 20 2005 Gerald Dachs <gda at tinysofa dot org> 3.0.4-2gd
+- fixed group
+
 * Wed Jun  8 2005 Gerald Dachs <gda at tinysofa dot org> 3.0.4-1gd
 - 3.0.4
 



From svn at tinysofa.org  Tue Jun 21 08:42:10 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 21 Jun 2005 04:42:10 -0400 (EDT)
Subject: [tinysofa-svn] r6448 - contrib/classic/2.0/smart/current/specs
Message-ID: <20050621084210.9EB6F344B82@minbar.tinysofa.org>

Author: jh
Date: 2005-06-21 04:42:06 -0400 (Tue, 21 Jun 2005)
New Revision: 6448

Modified:
   contrib/classic/2.0/smart/current/specs/smart.spec
Log:
- split gtk version to gui subpackage

Modified: contrib/classic/2.0/smart/current/specs/smart.spec
===================================================================
--- contrib/classic/2.0/smart/current/specs/smart.spec	2005-06-20 21:18:03 UTC (rev 6447)
+++ contrib/classic/2.0/smart/current/specs/smart.spec	2005-06-21 08:42:06 UTC (rev 6448)
@@ -2,7 +2,7 @@
 %define with_smart_update	1
 Name: smart
 Version: 0.36
-Release: 2jh
+Release: 3jh
 Group: contrib
 Summary: Next generation package handling tool
 Source0: smart-%{version}.tar.bz2
@@ -37,7 +37,16 @@
 special suid command.
 %endif
 
+%package gui
+Summary: Next generation package handling tool GUI interface
+Group: contrib
+Requires: smart = %{version}-%{release}
+Requires: pygtk
 
+%description gui
+GTK based interface for Smart Package Manager.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpm-check-signatures~
@@ -54,7 +63,7 @@
 
 
 %install
-python setup.py install --root=%{buildroot} --record=INSTALLED_FILES
+python setup.py install --root=%{buildroot}
 
 mkdir -p %{buildroot}%{_libdir}/smart \
 	%{buildroot}%{_localstatedir}/smart/channels \
@@ -76,15 +85,20 @@
 popd
 %endif
 
+rm -fr %{buildroot}%{_datadir}/locale
 
+
 %clean
 %clean_buildroot
 
 
-%files -f INSTALLED_FILES
+%files
 %defattr(0644,root,root,0755)
 %doc HACKING README LICENSE TODO IDEAS doc
 %defattr(-,root,root)
+%{_bindir}/smart
+%{py_sitedir}/smart
+%exclude %{py_sitedir}/smart/interfaces/gtk
 %{_libdir}/smart/distro.py
 #%{_bindir}/smart-root
 #%config(noreplace) %{_sysconfdir}/security/console.apps/smart-root
@@ -97,8 +111,15 @@
 %attr(4755,root,root) %{_bindir}/smart-update
 %endif
 
+%files gui
+%defattr(-,root,root)
+%{py_sitedir}/smart/interfaces/gtk
 
+
 %changelog
+* Tue Jun 21 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.36-3jh
+- split gtk version to gui subpackage
+
 * Mon Jun 20 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.36-2jh
 - check rpm signatures as default
 - require gnupg



From svn at tinysofa.org  Tue Jun 21 11:23:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 21 Jun 2005 07:23:44 -0400 (EDT)
Subject: [tinysofa-svn] r6449 - in contrib/classic/2.0: . python-psyco
	python-psyco/current python-psyco/current/sources
	python-psyco/current/specs
Message-ID: <20050621112344.5D45634529B@minbar.tinysofa.org>

Author: jh
Date: 2005-06-21 07:23:27 -0400 (Tue, 21 Jun 2005)
New Revision: 6449

Added:
   contrib/classic/2.0/python-psyco/
   contrib/classic/2.0/python-psyco/current/
   contrib/classic/2.0/python-psyco/current/sources/
   contrib/classic/2.0/python-psyco/current/sources/psyco-1.4-src.tar.gz
   contrib/classic/2.0/python-psyco/current/specs/
   contrib/classic/2.0/python-psyco/current/specs/python-psyco.spec
   contrib/classic/2.0/python-psyco/pristine/
   contrib/classic/2.0/python-psyco/releases/
Log:
- add python-psyco


Added: contrib/classic/2.0/python-psyco/current/sources/psyco-1.4-src.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/python-psyco/current/sources/psyco-1.4-src.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/python-psyco/current/specs/python-psyco.spec
===================================================================
--- contrib/classic/2.0/python-psyco/current/specs/python-psyco.spec	2005-06-21 08:42:06 UTC (rev 6448)
+++ contrib/classic/2.0/python-psyco/current/specs/python-psyco.spec	2005-06-21 11:23:27 UTC (rev 6449)
@@ -0,0 +1,56 @@
+Name:           python-psyco
+Version:        1.4
+Release:        1jh
+Summary:        The Python Specialing Compiler
+Group:          contrib
+License:        MIT
+URL:            http://psyco.sourceforge.net/
+Source0:        http://prdownloads.sourceforge.net/psyco/psyco-1.4-src.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+ExclusiveArch:  %{ix86}
+%py_requires -d
+
+%description
+Psyco is a Python extension module which can massively speed up the
+execution of any Python code.
+
+
+%prep
+%setup -q -n psyco-%{version}
+
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
+
+%install
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
+ 
+%clean
+%clean_buildroot
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.txt INSTALL.txt README.txt doc/
+%{py_sitedir}/psyco/*.so
+%{py_sitedir}/psyco/*.py
+%{py_sitedir}/psyco/*.pyc
+%dir %{py_sitedir}/psyco
+%ghost %{py_sitedir}/psyco/*.pyo
+
+
+%changelog
+* Tue Jun 21 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- tinysofa contrib
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
+* Mon Mar 21 2005 Shahms E. King <shahms at shahms.com> 1.4-2 -
+- Added ExclusiveArch: i386
+- Remove unnecessary python_sitelib define
+
+* Tue Mar 01 2005 Shahms E. King <shahms at shahms.com> 1.4-1
+- Repackage for Fedora Extras



From svn at tinysofa.org  Tue Jun 21 19:02:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 21 Jun 2005 15:02:38 -0400 (EDT)
Subject: [tinysofa-svn] r6450 - in contrib/classic/2.0/clamav/current:
	sources specs
Message-ID: <20050621190238.2338134537C@minbar.tinysofa.org>

Author: gda
Date: 2005-06-21 15:01:02 -0400 (Tue, 21 Jun 2005)
New Revision: 6450

Added:
   contrib/classic/2.0/clamav/current/sources/clamav-0.86.tar.gz
Removed:
   contrib/classic/2.0/clamav/current/sources/clamav-0.85.1.tar.gz
Modified:
   contrib/classic/2.0/clamav/current/specs/clamav.spec
Log:
0.86

Deleted: contrib/classic/2.0/clamav/current/sources/clamav-0.85.1.tar.gz
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/clamav/current/sources/clamav-0.86.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/clamav/current/sources/clamav-0.86.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/clamav/current/specs/clamav.spec
===================================================================
--- contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-06-21 11:23:27 UTC (rev 6449)
+++ contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-06-21 19:01:02 UTC (rev 6450)
@@ -1,6 +1,6 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
-Version: 0.85.1
+Version: 0.86
 Release: 1gd
 License: GPL
 Group: contrib
@@ -13,9 +13,8 @@
 Source7: freshclam.logrotate
 Source8: freshclam.conf
 Source10: clamd.conf
-Requires: curl-libs openssl
 BuildRequires: sed, zlib-devel, gmp-devel, bzip2-devel
-BuildRequires: zlib, gmp, curl-devel, openssl-devel
+BuildRequires: zlib, gmp
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %define user_name  amavis
@@ -178,6 +177,9 @@
 
 
 %changelog
+* Tue Jun 21 2005 Gerald Dachs <gda at tinysofa dot org> 0.86-1gd
+- 0.86
+
 * Thu May 19 2005 Gerald Dachs <gda at tinysofa dot org> 0.85.1-1gd
 - 0.85.1
 



From svn at tinysofa.org  Wed Jun 22 06:23:01 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 22 Jun 2005 02:23:01 -0400 (EDT)
Subject: [tinysofa-svn] r6451 - in
	tinysofa/releases/classic/2.0/sudo/current: sources specs
Message-ID: <20050622062301.C712934533E@minbar.tinysofa.org>

Author: jh
Date: 2005-06-22 02:22:39 -0400 (Wed, 22 Jun 2005)
New Revision: 6451

Added:
   tinysofa/releases/classic/2.0/sudo/current/sources/sudo-1.6.8p9.tar.gz
Removed:
   tinysofa/releases/classic/2.0/sudo/current/sources/sudo-1.6.8p5.tar.gz
Modified:
   tinysofa/releases/classic/2.0/sudo/current/specs/sudo.spec
Log:
- 1.6.8p9, fixes CAN-2005-1993

Deleted: tinysofa/releases/classic/2.0/sudo/current/sources/sudo-1.6.8p5.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/sudo/current/sources/sudo-1.6.8p9.tar.gz
===================================================================
(Binary files differ)


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

Modified: tinysofa/releases/classic/2.0/sudo/current/specs/sudo.spec
===================================================================
--- tinysofa/releases/classic/2.0/sudo/current/specs/sudo.spec	2005-06-21 19:01:02 UTC (rev 6450)
+++ tinysofa/releases/classic/2.0/sudo/current/specs/sudo.spec	2005-06-22 06:22:39 UTC (rev 6451)
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users.
 Name: sudo
-Version: 1.6.8p5
-Release: 2jh
+Version: 1.6.8p9
+Release: 1jh
 License: BSD
 Group: main
 Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
@@ -69,6 +69,9 @@
 %exclude %attr(0755,root,root) %{_libdir}/sudo_noexec.la
 
 %changelog
+* Wed Jun 22 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.6.8p9-1jh
+- 1.6.8p9, fixes CAN-2005-1993
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 1.6.8p5-1ts
 - current (1.6.8p5-1jh) integrated as 1.6.8p5-1ts for release 1.1-U3
 



From svn at tinysofa.org  Wed Jun 22 16:07:46 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 22 Jun 2005 12:07:46 -0400 (EDT)
Subject: [tinysofa-svn] r6452 -
	tinysofa/releases/classic/2.0/groff/current/specs
Message-ID: <20050622160746.EC406345397@minbar.tinysofa.org>

Author: jh
Date: 2005-06-22 12:07:40 -0400 (Wed, 22 Jun 2005)
New Revision: 6452

Modified:
   tinysofa/releases/classic/2.0/groff/current/specs/groff.spec
Log:
- fix incorrect groups


Modified: tinysofa/releases/classic/2.0/groff/current/specs/groff.spec
===================================================================
--- tinysofa/releases/classic/2.0/groff/current/specs/groff.spec	2005-06-22 06:22:39 UTC (rev 6451)
+++ tinysofa/releases/classic/2.0/groff/current/specs/groff.spec	2005-06-22 16:07:40 UTC (rev 6452)
@@ -51,7 +51,7 @@
 
 %package perl
 Summary: Parts of the groff formatting system that require Perl.
-Group: Applications/Publishing
+Group: extra
 
 %description perl
 The groff-perl package contains the parts of the groff text processor
@@ -63,7 +63,7 @@
 %if %{with_x}
 %package gxditview
 Summary: An X previewer for groff text processor output.
-Group: Applications/Publishing
+Group: extra
 
 %description gxditview
 Gxditview displays the groff text processor's output on an X Window



From svn at tinysofa.org  Wed Jun 22 18:19:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 22 Jun 2005 14:19:15 -0400 (EDT)
Subject: [tinysofa-svn] r6453 - in contrib/classic/2.0/squirrelmail/current:
	sources specs
Message-ID: <20050622181915.9135A3452AC@minbar.tinysofa.org>

Author: gda
Date: 2005-06-22 14:19:05 -0400 (Wed, 22 Jun 2005)
New Revision: 6453

Added:
   contrib/classic/2.0/squirrelmail/current/sources/sqm-144-xss.patch
Modified:
   contrib/classic/2.0/squirrelmail/current/specs/squirrelmail.spec
Log:
applied xss patch

Added: contrib/classic/2.0/squirrelmail/current/sources/sqm-144-xss.patch
===================================================================
--- contrib/classic/2.0/squirrelmail/current/sources/sqm-144-xss.patch	2005-06-22 16:07:40 UTC (rev 6452)
+++ contrib/classic/2.0/squirrelmail/current/sources/sqm-144-xss.patch	2005-06-22 18:19:05 UTC (rev 6453)
@@ -0,0 +1,650 @@
+diff -urw squirrelmail-1.4.4.orig/functions/addressbook.php squirrelmail-1.4.4/functions/addressbook.php
+--- squirrelmail-1.4.4.orig/functions/addressbook.php	Mon Dec 27 16:03:42 2004
++++ squirrelmail-1.4.4/functions/addressbook.php	Wed Jun 15 23:50:03 2005
+@@ -108,7 +108,7 @@
+                 if (!$r && $showerr) {
+                     printf( '&nbsp;' . _("Error initializing LDAP server %s:") .
+                             "<br />\n", $param['host']);
+-                    echo '&nbsp;' . $abook->error;
++                    echo '&nbsp;' . htmlspecialchars($abook->error);
+                     exit;
+                 }
+             }
+@@ -239,7 +239,7 @@
+                 if (is_array($res)) {
+                     $ret = array_merge($ret, $res);
+                 } else {
+-                    $this->error .= "<br />\n" . $backend->error;
++                    $this->error .= "\n" . $backend->error;
+                     $failed++;
+                 }
+             }
+@@ -255,7 +255,7 @@
+ 
+             $ret = $this->backends[$bnum]->search($expression);
+             if (!is_array($ret)) {
+-                $this->error .= "<br />\n" . $this->backends[$bnum]->error;
++                $this->error .= "\n" . $this->backends[$bnum]->error;
+                 $ret = FALSE;
+             }
+         }
+diff -urw squirrelmail-1.4.4.orig/functions/mime.php squirrelmail-1.4.4/functions/mime.php
+--- squirrelmail-1.4.4.orig/functions/mime.php	Mon Jan 10 19:52:48 2005
++++ squirrelmail-1.4.4/functions/mime.php	Wed Jun 15 23:50:03 2005
+@@ -1388,12 +1388,33 @@
+                 }
+             }
+         }
++
++        /**
++         * Replace empty src tags with the blank image.  src is only used
++         * for frames, images, and image inputs.  Doing a replace should
++         * not affect them working as should be, however it will stop
++         * IE from being kicked off when src for img tags are not set
++         */
++        if (($attname == 'src') && ($attvalue == '""')) {
++            $attary{$attname} = '"' . SM_PATH . 'images/blank.png"';
++        }
++
+         /**
+          * Turn cid: urls into http-friendly ones.
+          */
+         if (preg_match("/^[\'\"]\s*cid:/si", $attvalue)){
+             $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox);
+         }
++
++        /**
++         * "Hack" fix for Outlook using propriatary outbind:// protocol in img tags.
++         * One day MS might actually make it match something useful, for now, falling
++         * back to using cid2http, so we can grab the blank.png.
++         */
++        if (preg_match("/^[\'\"]\s*outbind:\/\//si", $attvalue)) {
++            $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox);
++        }
++
+     }
+     /**
+      * See if we need to append any attributes to this tag.
+@@ -1408,7 +1429,7 @@
+ 
+ /**
+  * This function edits the style definition to make them friendly and
+- * usable in squirrelmail.
++ * usable in SquirrelMail.
+  *
+  * @param  $message  the message object
+  * @param  $id       the message id
+@@ -1436,27 +1457,54 @@
+     /**
+      * Fix url('blah') declarations.
+      */
+-    $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si",
+-                            "url(\\1$secremoveimg\\2)", $content);
++    //   $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si",
++    //                           "url(\\1$secremoveimg\\2)", $content);
++    // remove NUL
++    $content = str_replace("\0", "", $content);
++    // NB I insert NUL characters to keep to avoid an infinite loop. They are removed after the loop.
++    while (preg_match("/url\s*\(\s*[\'\"]?([^:]+):(.*)?[\'\"]?\s*\)/si", $content, $matches)) {
++        $sProto = strtolower($matches[1]);
++        switch ($sProto) {
+     /**
+      * Fix url('https*://.*) declarations but only if $view_unsafe_images
+      * is false.
+      */
++          case 'https':
++          case 'http':
+     if (!$view_unsafe_images){
+-        $content = preg_replace("|url\s*\(\s*([\'\"])\s*https*:.*?([\'\"])\s*\)|si",
+-                                "url(\\1$secremoveimg\\2)", $content);
++                $sExpr = "/url\s*\(\s*([\'\"])\s*$sProto*:.*?([\'\"])\s*\)/si";
++                $content = preg_replace($sExpr, "u\0r\0l(\\1$secremoveimg\\2)", $content);
+     }
+-
++            break;
+     /**
+      * Fix urls that refer to cid:
+      */
+-    while (preg_match("|url\s*\(\s*([\'\"]\s*cid:.*?[\'\"])\s*\)|si",
+-                      $content, $matches)){
+-        $cidurl = $matches{1};
++          case 'cid':
++            $cidurl = 'cid:'. $matches[2];
+         $httpurl = sq_cid2http($message, $id, $cidurl, $mailbox);
+         $content = preg_replace("|url\s*\(\s*$cidurl\s*\)|si",
+-                                "url($httpurl)", $content);
++                                "u\0r\0l($httpurl)", $content);
++            break;
++          default:
++            /**
++             * replace url with protocol other then the white list
++             * http,https and cid by an empty string.
++             */
++            $content = preg_replace("/url\s*\(\s*[\'\"]?([^:]+):(.*)?[\'\"]?\s*\)/si",
++                                "", $content);
++            break;
+     }
++        break;
++    }
++    // remove NUL
++    $content = str_replace("\0", "", $content);
++
++   /**
++    * Remove any backslashes, entities, and extraneous whitespace.
++    */
++    $contentTemp = $content;
++    sq_defang($contentTemp);
++    sq_unspace($contentTemp);
+ 
+     /**
+      * Fix stupid css declarations which lead to vulnerabilities
+@@ -1467,10 +1515,16 @@
+                      '/binding/i',
+                      '/include-source/i');
+     $replace = Array('idiocy', 'idiocy', 'idiocy', 'idiocy');
+-    $content = preg_replace($match, $replace, $content);
++    $contentNew = preg_replace($match, $replace, $contentTemp);
++    if ($contentNew !== $contentTemp) {
++        // insecure css declarations are used. From now on we don't care
++        // anymore if the css is destroyed by sq_deent, sq_unspace or sq_unbackslash
++        $content = $contentNew;
++    }
+     return array($content, $newpos);
+ }
+ 
++
+ /**
+  * This function converts cid: url's into the ones that can be viewed in
+  * the browser.
+@@ -1492,15 +1546,46 @@
+         $quotchar = '';
+     }
+     $cidurl = substr(trim($cidurl), 4);
++
++    $match_str = '/\{.*?\}\//';
++    $str_rep = '';
++    $cidurl = preg_replace($match_str, $str_rep, $cidurl);
++
+     $linkurl = find_ent_id($cidurl, $message);
+     /* in case of non-save cid links $httpurl should be replaced by a sort of
+        unsave link image */
+     $httpurl = '';
+-    if ($linkurl) {
++
++    /**
++     * This is part of a fix for Outlook Express 6.x generating
++     * cid URLs without creating content-id headers. These images are
++     * not part of the multipart/related html mail. The html contains
++     * <img src="cid:{some_id}/image_filename.ext"> references to
++     * attached images with as goal to render them inline although
++     * the attachment disposition property is not inline.
++     */
++
++    if (empty($linkurl)) {
++        if (preg_match('/{.*}\//', $cidurl)) {
++            $cidurl = preg_replace('/{.*}\//','', $cidurl);
++            if (!empty($cidurl)) {
++                $linkurl = find_ent_id($cidurl, $message);
++            }
++        }
++    }
++
++    if (!empty($linkurl)) {
+         $httpurl = $quotchar . SM_PATH . 'src/download.php?absolute_dl=true&amp;' .
+                    "passed_id=$id&amp;mailbox=" . urlencode($mailbox) .
+                    '&amp;ent_id=' . $linkurl . $quotchar;
++    } else {
++        /**
++         * If we couldn't generate a proper img url, drop in a blank image
++         * instead of sending back empty, otherwise it causes unusual behaviour
++         */
++        $httpurl = $quotchar . SM_PATH . 'images/blank.png';
+     }
++
+     return $httpurl;
+ }
+ 
+@@ -1526,8 +1611,7 @@
+             $attvalue = str_replace($quotchar, "", $attvalue);
+             switch ($attname){
+                 case 'background':
+-                    $attvalue = sq_cid2http($message, $id,
+-                                            $attvalue, $mailbox);
++                    $attvalue = sq_cid2http($message, $id, $attvalue, $mailbox);
+                     $styledef .= "background-image: url('$attvalue'); ";
+                     break;
+                 case 'bgcolor':
+@@ -1754,6 +1838,7 @@
+                                   "embed",
+                                   "title",
+                                   "frameset",
++            "xmp",
+                                   "xml"
+                                   );
+ 
+@@ -1761,7 +1846,8 @@
+                                 "img",
+                                 "br",
+                                 "hr",
+-                                "input"
++            "input",
++            "outbind"
+                                 );
+ 
+     $force_tag_closing = true;
+@@ -1816,6 +1902,7 @@
+                                 "/binding/i",
+                                 "/behaviou*r/i",
+                                 "/include-source/i",
++                    "/position\s*:\s*absolute/i",
+                                 "/url\s*\(\s*([\'\"])\s*\S+script\s*:.*([\'\"])\s*\)/si",
+                                 "/url\s*\(\s*([\'\"])\s*mocha\s*:.*([\'\"])\s*\)/si",
+                                 "/url\s*\(\s*([\'\"])\s*about\s*:.*([\'\"])\s*\)/si",
+@@ -1826,6 +1913,7 @@
+                                 "idiocy",
+                                 "idiocy",
+                                 "idiocy",
++                    "",
+                                 "url(\\1#\\1)",
+                                 "url(\\1#\\1)",
+                                 "url(\\1#\\1)",
+@@ -1856,7 +1944,7 @@
+ 
+     $add_attr_to_tag = Array(
+         "/^a$/i" =>
+-            Array('target'=>'"_new"',
++            Array('target'=>'"_blank"',
+                   'title'=>'"'._("This external link will open in a new window").'"'
+             )
+     );
+diff -urw squirrelmail-1.4.4.orig/functions/page_header.php squirrelmail-1.4.4/functions/page_header.php
+--- squirrelmail-1.4.4.orig/functions/page_header.php	Mon Dec 27 22:08:58 2004
++++ squirrelmail-1.4.4/functions/page_header.php	Wed Jun 15 23:50:03 2005
+@@ -275,6 +275,7 @@
+                                  : html_tag( 'td', '', 'left' ) )
+         . "\n";
+     $urlMailbox = urlencode($mailbox);
++    $startMessage = (int)$startMessage;
+     echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox.'&amp;startMessage='.$startMessage);
+     echo "&nbsp;&nbsp;\n";
+     displayInternalLink ('src/addressbook.php', _("Addresses"));
+diff -urw squirrelmail-1.4.4.orig/plugins/calendar/calendar.php squirrelmail-1.4.4/plugins/calendar/calendar.php
+--- squirrelmail-1.4.4.orig/plugins/calendar/calendar.php	Mon Dec 27 16:03:49 2004
++++ squirrelmail-1.4.4/plugins/calendar/calendar.php	Wed Jun 15 23:51:15 2005
+@@ -28,17 +28,17 @@
+ require_once(SM_PATH . 'functions/html.php');
+ 
+ /* get globals */
+-
+-if (isset($_GET['month'])) {
++unset($month, $year);
++if (isset($_GET['month']) && is_numeric($_GET['month'])) {
+     $month = $_GET['month'];
+ }
+-if (isset($_GET['year'])) {
++if (isset($_GET['year']) && is_numeric($_GET['year'])) {
+     $year = $_GET['year'];
+ }
+-if (isset($_POST['year'])) {
++if (isset($_POST['year']) && is_numeric($_POST['year'])) {
+     $year = $_POST['year'];
+ }
+-if (isset($_POST['month'])) {
++if (isset($_POST['month']) && is_numeric($_POST['month'])) {
+     $month = $_POST['month'];
+ }
+ /* got 'em */
+diff -urw squirrelmail-1.4.4.orig/plugins/calendar/day.php squirrelmail-1.4.4/plugins/calendar/day.php
+--- squirrelmail-1.4.4.orig/plugins/calendar/day.php	Mon Dec 27 16:03:49 2004
++++ squirrelmail-1.4.4/plugins/calendar/day.php	Wed Jun 15 23:51:52 2005
+@@ -29,22 +29,23 @@
+ require_once(SM_PATH . 'functions/html.php');
+ 
+ /* get globals */
+-if (isset($_GET['year'])) {
++unset($year, $month, $day);
++if (isset($_GET['year']) && is_numeric($_GET['year'])) {
+     $year = $_GET['year'];
+ }
+-elseif (isset($_POST['year'])) {
++elseif (isset($_POST['year']) && is_numeric($_POST['year'])) {
+     $year = $_POST['year'];
+ }
+-if (isset($_GET['month'])) {
++if (isset($_GET['month']) && is_numeric($_GET['month'])) {
+     $month = $_GET['month'];
+ }
+-elseif (isset($_POST['month'])) {
++elseif (isset($_POST['month']) && is_numeric($_POST['month'])) {
+     $month = $_POST['month'];
+ }
+-if (isset($_GET['day'])) {
++if (isset($_GET['day']) && is_numeric($_GET['day'])) {
+     $day = $_GET['day'];
+ }
+-elseif (isset($_POST['day'])) {
++elseif (isset($_POST['day']) && is_numeric($_POST['day'])) {
+     $day = $_POST['day'];
+ }
+ 
+diff -urw squirrelmail-1.4.4.orig/plugins/calendar/event_create.php squirrelmail-1.4.4/plugins/calendar/event_create.php
+--- squirrelmail-1.4.4.orig/plugins/calendar/event_create.php	Mon Dec 27 16:03:49 2004
++++ squirrelmail-1.4.4/plugins/calendar/event_create.php	Wed Jun 15 23:52:34 2005
+@@ -28,41 +28,42 @@
+ require_once(SM_PATH . 'functions/html.php');
+ 
+ /* get globals */
+-
+-if (isset($_POST['year'])) {
++unset($year, $month, $day, $hour, $event_hour, $event_minute,
++    $event_length, $event_priority);
++if (isset($_POST['year']) && is_numeric($_POST['year'])) {
+     $year = $_POST['year'];
+ }
+-elseif (isset($_GET['year'])) {
++elseif (isset($_GET['year']) && is_numeric($_GET['year'])) {
+     $year = $_GET['year'];
+ }
+-if (isset($_POST['month'])) {
++if (isset($_POST['month']) && is_numeric($_POST['month'])) {
+     $month = $_POST['month'];
+ }
+-elseif (isset($_GET['month'])) {
++elseif (isset($_GET['month']) && is_numeric($_GET['month'])) {
+     $month = $_GET['month'];
+ }
+-if (isset($_POST['day'])) {
++if (isset($_POST['day']) && is_numeric($_POST['day'])) {
+     $day = $_POST['day'];
+ }
+-elseif (isset($_GET['day'])) {
++elseif (isset($_GET['day']) && is_numeric($_GET['day'])) {
+     $day = $_GET['day'];
+ }
+-if (isset($_POST['hour'])) {
++if (isset($_POST['hour']) && is_numeric($_POST['hour'])) {
+     $hour = $_POST['hour'];
+ }
+-elseif (isset($_GET['hour'])) {
++elseif (isset($_GET['hour']) && is_numeric($_GET['hour'])) {
+     $hour = $_GET['hour'];
+ }
+-if (isset($_POST['event_hour'])) {
++if (isset($_POST['event_hour']) && is_numeric($_POST['event_hour'])) {
+     $event_hour = $_POST['event_hour'];
+ }
+-if (isset($_POST['event_minute'])) {
++if (isset($_POST['event_minute']) && is_numeric($_POST['event_minute'])) {
+     $event_minute = $_POST['event_minute'];
+ }
+-if (isset($_POST['event_length'])) {
++if (isset($_POST['event_length']) && is_numeric($_POST['event_length'])) {
+     $event_length = $_POST['event_length'];
+ }
+-if (isset($_POST['event_priority'])) {
++if (isset($_POST['event_priority']) && is_numeric($_POST['event_priority'])) {
+     $event_priority = $_POST['event_priority'];
+ }
+ if (isset($_POST['event_title'])) {
+diff -urw squirrelmail-1.4.4.orig/plugins/calendar/event_edit.php squirrelmail-1.4.4/plugins/calendar/event_edit.php
+--- squirrelmail-1.4.4.orig/plugins/calendar/event_edit.php	Mon Dec 27 16:03:49 2004
++++ squirrelmail-1.4.4/plugins/calendar/event_edit.php	Wed Jun 15 23:53:22 2005
+@@ -29,26 +29,27 @@
+ 
+ 
+ /* get globals */
+-
++unset($event_year, $event_month, $event_day, $event_hour, $event_minute,
++    $event_length, $event_priority, $year, $month, $day, $hour, $minute);
+ if (isset($_POST['updated'])) {
+     $updated = $_POST['updated'];
+ }
+-if (isset($_POST['event_year'])) {
++if (isset($_POST['event_year']) && is_numeric($_POST['event_year'])) {
+     $event_year = $_POST['event_year'];
+ }
+-if (isset($_POST['event_month'])) {
++if (isset($_POST['event_month']) && is_numeric($_POST['event_month'])) {
+     $event_month = $_POST['event_month'];
+ }
+-if (isset($_POST['event_day'])) {
++if (isset($_POST['event_day']) && is_numeric($_POST['event_day'])) {
+     $event_day = $_POST['event_day'];
+ }
+-if (isset($_POST['event_hour'])) {
++if (isset($_POST['event_hour']) && is_numeric($_POST['event_hour'])) {
+     $event_hour = $_POST['event_hour'];
+ }
+-if (isset($_POST['event_minute'])) {
++if (isset($_POST['event_minute']) && is_numeric($_POST['event_minute'])) {
+     $event_minute = $_POST['event_minute'];
+ }
+-if (isset($_POST['event_length'])) {
++if (isset($_POST['event_length']) && is_numeric($_POST['event_length'])) {
+     $event_length = $_POST['event_length'];
+ }
+ if (isset($_POST['event_title'])) {
+@@ -60,40 +61,40 @@
+ if (isset($_POST['send'])) {
+     $send = $_POST['send'];
+ }
+-if (isset($_POST['event_priority'])) {
++if (isset($_POST['event_priority']) && is_numeric($_POST['event_priority'])) {
+     $event_priority = $_POST['event_priority'];
+ }
+ if (isset($_POST['confirmed'])) {
+     $confirmed = $_POST['confirmed'];
+ }
+-if (isset($_POST['year'])) {
++if (isset($_POST['year']) && is_numeric($_POST['year'])) {
+     $year = $_POST['year'];
+ }
+-elseif (isset($_GET['year'])) {
++elseif (isset($_GET['year']) && is_numeric($_GET['year'])) {
+     $year = $_GET['year'];
+ }
+-if (isset($_POST['month'])) {
++if (isset($_POST['month']) && is_numeric($_POST['month'])) {
+     $month = $_POST['month'];
+ }
+-elseif (isset($_GET['month'])) {
++elseif (isset($_GET['month']) && is_numeric($_GET['month'])) {
+     $month = $_GET['month'];
+ }
+-if (isset($_POST['day'])) {
++if (isset($_POST['day']) && is_numeric($_POST['day'])) {
+     $day = $_POST['day'];
+ }
+-elseif (isset($_GET['day'])) {
++elseif (isset($_GET['day']) && is_numeric($_GET['day'])) {
+     $day = $_GET['day'];
+ }
+-if (isset($_POST['hour'])) {
++if (isset($_POST['hour']) && is_numeric($_POST['hour'])) {
+     $hour = $_POST['hour'];
+ }
+-elseif (isset($_GET['hour'])) {
++elseif (isset($_GET['hour']) && is_numeric($_GET['hour'])) {
+     $hour = $_GET['hour'];
+ }
+-if (isset($_POST['minute'])) {
++if (isset($_POST['minute']) && is_numeric($_POST['minute'])) {
+     $minute = $_POST['minute'];
+ }
+-elseif (isset($_GET['minute'])) {
++elseif (isset($_GET['minute']) && is_numeric($_GET['minute'])) {
+     $minute = $_GET['minute'];
+ }
+ /* got 'em */
+diff -urw squirrelmail-1.4.4.orig/plugins/filters/options.php squirrelmail-1.4.4/plugins/filters/options.php
+--- squirrelmail-1.4.4.orig/plugins/filters/options.php	Mon Dec 27 16:03:57 2004
++++ squirrelmail-1.4.4/plugins/filters/options.php	Wed Jun 15 23:50:03 2005
+@@ -189,7 +189,7 @@
+                 html_tag( 'td', '', 'left' ) .
+                     '<input type="text" size="32" name="filter_what" value="';
+         if (isset($filters[$theid]['what'])) {
+-            echo $filters[$theid]['what'];
++            echo htmlspecialchars($filters[$theid]['what']);
+         }
+         echo '" />'.
+                 '</td>'.
+diff -urw squirrelmail-1.4.4.orig/plugins/filters/spamoptions.php squirrelmail-1.4.4/plugins/filters/spamoptions.php
+--- squirrelmail-1.4.4.orig/plugins/filters/spamoptions.php	Mon Dec 27 16:03:57 2004
++++ squirrelmail-1.4.4/plugins/filters/spamoptions.php	Wed Jun 15 23:50:03 2005
+@@ -199,7 +199,7 @@
+     echo html_tag( 'p', '', 'center' ) .
+          '[<a href="spamoptions.php?action=spam">' . _("Edit") . '</a>]' .
+          ' - [<a href="../../src/options.php">' . _("Done") . '</a>]</center><br /><br />';
+-    printf( _("Spam is sent to %s."), ($filters_spam_folder?'<b>'.imap_utf7_decode_local($filters_spam_folder).'</b>':'[<i>'._("not set yet").'</i>]' ) );
++    printf( _("Spam is sent to %s."), ($filters_spam_folder?'<b>'.htmlspecialchars(imap_utf7_decode_local($filters_spam_folder)).'</b>':'[<i>'._("not set yet").'</i>]' ) );
+     echo '<br />';
+     printf( _("Spam scan is limited to %s."), '<b>' . ( ($filters_spam_scan == 'new')?_("Unread messages only"):_("All messages") ) . '</b>' );
+     echo '</p>'.
+diff -urw squirrelmail-1.4.4.orig/plugins/listcommands/mailout.php squirrelmail-1.4.4/plugins/listcommands/mailout.php
+--- squirrelmail-1.4.4.orig/plugins/listcommands/mailout.php	Mon Dec 27 16:03:58 2004
++++ squirrelmail-1.4.4/plugins/listcommands/mailout.php	Wed Jun 15 23:50:03 2005
+@@ -25,14 +25,6 @@
+ sqgetGlobalVar('body',    $body,    SQ_GET);
+ sqgetGlobalVar('action',  $action,  SQ_GET);
+ 
+-echo html_tag('p', '', 'left' ) .
+-html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .
+-    html_tag( 'tr',
+-        html_tag( 'th', _("Mailinglist") . ' ' . _($action), '', $color[9] )
+-    ) .
+-    html_tag( 'tr' ) .
+-    html_tag( 'td', '', 'left' );
+-
+ switch ( $action ) {
+ case 'help':
+     $out_string = _("This will send a message to %s requesting help for this list. You will receive an emailed response at the address below.");
+@@ -42,7 +34,19 @@
+     break;
+ case 'unsubscribe':
+     $out_string = _("This will send a message to %s requesting that you will be unsubscribed from this list. It will try to unsubscribe the adress below.");
++default:
++    error_box(sprintf(_("Unknown action: %s"),htmlspecialchars($action)), $color);
++    exit;
+ }
++
++echo html_tag('p', '', 'left' ) .
++html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .
++    html_tag( 'tr',
++        html_tag( 'th', _("Mailinglist") . ' ' . _($action), '', $color[9] )
++    ) .
++    html_tag( 'tr' ) .
++    html_tag( 'td', '', 'left' );
++
+ 
+ printf( $out_string, htmlspecialchars($send_to) );
+ 
+diff -urw squirrelmail-1.4.4.orig/plugins/newmail/newmail.php squirrelmail-1.4.4/plugins/newmail/newmail.php
+--- squirrelmail-1.4.4.orig/plugins/newmail/newmail.php	Mon Dec 27 16:03:58 2004
++++ squirrelmail-1.4.4/plugins/newmail/newmail.php	Wed Jun 15 23:50:03 2005
+@@ -22,6 +22,7 @@
+ require_once(SM_PATH . 'functions/page_header.php');
+ 
+ sqGetGlobalVar('numnew', $numnew, SQ_GET);
++$numnew = (int)$numnew;
+ 
+    displayHtmlHeader( _("New Mail"), '', FALSE );
+ 
+diff -urw squirrelmail-1.4.4.orig/plugins/spamcop/setup.php squirrelmail-1.4.4/plugins/spamcop/setup.php
+--- squirrelmail-1.4.4.orig/plugins/spamcop/setup.php	Mon Dec 27 16:03:58 2004
++++ squirrelmail-1.4.4/plugins/spamcop/setup.php	Wed Jun 15 23:50:03 2005
+@@ -75,6 +75,9 @@
+    sqgetGlobalVar('passed_ent_id',$passed_ent_id,SQ_FORM);
+    sqgetGlobalVar('mailbox',      $mailbox,      SQ_FORM);
+    sqgetGlobalVar('startMessage', $startMessage, SQ_FORM);
++   if ( sqgetGlobalVar('startMessage', $startMessage, SQ_FORM) ) {
++       $startMessage = (int)$startMessage;
++   }
+    /* END GLOBALS */
+ 
+    // catch unset passed_ent_id
+diff -urw squirrelmail-1.4.4.orig/plugins/squirrelspell/modules/lang_change.mod squirrelmail-1.4.4/plugins/squirrelspell/modules/lang_change.mod
+--- squirrelmail-1.4.4.orig/plugins/squirrelspell/modules/lang_change.mod	Sat Jun 12 18:39:48 2004
++++ squirrelmail-1.4.4/plugins/squirrelspell/modules/lang_change.mod	Wed Jun 15 23:50:03 2005
+@@ -69,11 +69,11 @@
+   $lang_array = explode( ',', $lang_string );
+   $dsp_string = '';
+   foreach( $lang_array as $a) {
+-    $dsp_string .= _(trim($a)) . ', ';
++    $dsp_string .= _(htmlspecialchars(trim($a))) . ', ';
+   }
+   $dsp_string = substr( $dsp_string, 0, -2 );
+   $msg = '<p>'
+-    . sprintf(_("Settings adjusted to: %s with %s as default dictionary."), '<strong>'.$dsp_string.'</strong>', '<strong>'._($lang_default).'</strong>')
++    . sprintf(_("Settings adjusted to: %s with %s as default dictionary."), '<strong>'.$dsp_string.'</strong>', '<strong>'._(htmlspecialchars($lang_default)).'</strong>')
+     . '</p>';
+ } else {
+   /**
+diff -urw squirrelmail-1.4.4.orig/src/addressbook.php squirrelmail-1.4.4/src/addressbook.php
+--- squirrelmail-1.4.4.orig/src/addressbook.php	Mon Dec 27 16:03:59 2004
++++ squirrelmail-1.4.4/src/addressbook.php	Wed Jun 15 23:50:03 2005
+@@ -279,7 +279,7 @@
+                                     html_tag( 'tr',
+                                         html_tag( 'td',
+                                             "\n". '<strong><font color="' . $color[2] .
+-                                            '">' . _("ERROR") . ': ' . $abook->error . '</font></strong>' ."\n",
++                                            '">' . _("ERROR") . ': ' . htmlspecialchars($abook->error) . '</font></strong>' ."\n",
+                                             'center' )
+                                         ),
+                                     'center', '', 'width="100%"' );
+@@ -331,7 +331,7 @@
+             html_tag( 'tr',
+                 html_tag( 'td',
+                     "\n". '<br /><strong><font color="' . $color[2] .
+-                    '">' . _("ERROR") . ': ' . $formerror . '</font></strong>' ."\n",
++                    '">' . _("ERROR") . ': ' . htmlspecialchars($formerror) . '</font></strong>' ."\n",
+                     'center' )
+                 ),
+             'center', '', 'width="100%"' );
+@@ -343,6 +343,7 @@
+     /* Get and sort address list */
+     $alist = $abook->list_addr();
+     if(!is_array($alist)) {
++        $abook->error = htmlspecialchars($abook->error);
+         plain_error_message($abook->error, $color);
+         exit;
+     }
+diff -urw squirrelmail-1.4.4.orig/src/compose.php squirrelmail-1.4.4/src/compose.php
+--- squirrelmail-1.4.4.orig/src/compose.php	Mon Jan  3 16:06:28 2005
++++ squirrelmail-1.4.4/src/compose.php	Wed Jun 15 23:50:03 2005
+@@ -76,6 +76,11 @@
+ sqgetGlobalVar('saved_draft',$saved_draft);
+ sqgetGlobalVar('delete_draft',$delete_draft);
+ sqgetGlobalVar('startMessage',$startMessage);
++if ( sqgetGlobalVar('startMessage',$startMessage) ) {
++    $startMessage = (int)$startMessage;
++} else {
++    $startMessage = 1;
++}
+ 
+ /** POST VARS */
+ sqgetGlobalVar('sigappend',             $sigappend,             SQ_POST);
+diff -urw squirrelmail-1.4.4.orig/src/printer_friendly_bottom.php squirrelmail-1.4.4/src/printer_friendly_bottom.php
+--- squirrelmail-1.4.4.orig/src/printer_friendly_bottom.php	Tue Dec 28 14:02:49 2004
++++ squirrelmail-1.4.4/src/printer_friendly_bottom.php	Wed Jun 15 23:50:03 2005
+@@ -33,7 +33,8 @@
+ sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
+ sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
+ 
+-if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
++if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ||
++    ! preg_match('/^\d+(\.\d+)*$/', $passed_ent_id) ) {
+     $passed_ent_id = '';
+ } 
+ /* end globals */
+diff -urw squirrelmail-1.4.4.orig/src/right_main.php squirrelmail-1.4.4/src/right_main.php
+--- squirrelmail-1.4.4.orig/src/right_main.php	Mon Dec 27 16:04:00 2004
++++ squirrelmail-1.4.4/src/right_main.php	Wed Jun 15 23:50:03 2005
+@@ -165,7 +165,7 @@
+ 
+ do_hook('right_main_after_header');
+ if (isset($note)) {
+-    echo html_tag( 'div', '<b>' . $note .'</b>', 'center' ) . "<br />\n";
++    echo html_tag( 'div', '<b>' . htmlspecialchars($note) .'</b>', 'center' ) . "<br />\n";
+ }
+ 
+ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {

Modified: contrib/classic/2.0/squirrelmail/current/specs/squirrelmail.spec
===================================================================
--- contrib/classic/2.0/squirrelmail/current/specs/squirrelmail.spec	2005-06-22 16:07:40 UTC (rev 6452)
+++ contrib/classic/2.0/squirrelmail/current/specs/squirrelmail.spec	2005-06-22 18:19:05 UTC (rev 6453)
@@ -3,7 +3,7 @@
 Summary:        SquirrelMail webmail client
 Name:           squirrelmail
 Version:        1.4.4
-Release:        3gd
+Release:        4gd
 License:        GPL
 URL:            http://www.squirrelmail.org/
 Vendor:         squirrelmail.org
@@ -11,6 +11,7 @@
 Source:         %{name}-%{version}.tar.bz2
 Source1:        all_locales-%{version}-%{locale_stamp}.tar.bz2
 Source2:	config.php.tinysofa
+Patch:		sqm-144-xss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
 Requires:       httpd, php, perl, tmpwatch >= 2.8, aspell
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q -a 1
+%patch -p1 -b .xss
 %{__rm} -f plugins/make_archive.pl
 
 # Rearrange the documentation
@@ -135,6 +137,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Jun 22 2005 Gerald Dachs <gda at tinysofa dot org> 1.4.4-4gd
+- applied xss patch
+
 * Thu Feb 19 2005 Gerald Dachs <gda at tinysofa dot org> 1.4.4-3gd
 - requires php4 -> php
 



From svn at tinysofa.org  Mon Jun 27 09:09:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 27 Jun 2005 05:09:55 -0400 (EDT)
Subject: [tinysofa-svn] r6454 -
	tinysofa/releases/classic/2.0/kernel/current/sources
Message-ID: <20050627090955.923C6344D8D@minbar.tinysofa.org>

Author: jh
Date: 2005-06-27 05:09:49 -0400 (Mon, 27 Jun 2005)
New Revision: 6454

Modified:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch
Log:
- correct task size on x86_64


Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch	2005-06-22 18:19:05 UTC (rev 6453)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch	2005-06-27 09:09:49 UTC (rev 6454)
@@ -6157,7 +6157,7 @@
   * User space process size. 47bits.
   */
 -#define TASK_SIZE	(0x800000000000UL)
-+#define TASK_SIZE_64	(0x800000000000)
++#define TASK_SIZE_64	(0x800000000000UL)
  
 +#define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64)
 +



From svn at tinysofa.org  Mon Jun 27 09:28:01 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 27 Jun 2005 05:28:01 -0400 (EDT)
Subject: [tinysofa-svn] r6455 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050627092801.55D92345098@minbar.tinysofa.org>

Author: jh
Date: 2005-06-27 05:27:52 -0400 (Mon, 27 Jun 2005)
New Revision: 6455

Modified:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- CAN-2005-1913

Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch	2005-06-27 09:09:49 UTC (rev 6454)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch	2005-06-27 09:27:52 UTC (rev 6455)
@@ -414,7 +414,7 @@
 - * User space process size. 47bits.
 + * User space process size. 47bits minus one guard page.
   */
--#define TASK_SIZE_64	(0x800000000000)
+-#define TASK_SIZE_64	(0x800000000000UL)
 +#define TASK_SIZE_64	(0x800000000000UL - 4096)
  
  #define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64)

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-06-27 09:09:49 UTC (rev 6454)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-06-27 09:27:52 UTC (rev 6455)
@@ -46,7 +46,7 @@
 Group: main
 License: GPLv2
 Version: %{rpmversion}
-Release: 16.1jh
+Release: 16.2jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
@@ -99,6 +99,7 @@
 Patch105: linux-2.6.11-mm-selected-bits.patch
 Patch106: linux-2.6.11-mmap.patch
 Patch107: linux-2.6.11-cifs.patch
+Patch108: linux-2.6.11-CAN-2005-1913.patch
 
 Patch20020: linux-2.6.8-tinysofa-syslog.patch
 
@@ -256,6 +257,7 @@
 %patch106 -p1 -b .mmap~
 # cifs
 %patch107 -p1
+%patch108 -p1 -b .CAN-2005-1913
 
 %patch20020 -p1 -b .tinysofa-syslog~
 
@@ -609,6 +611,10 @@
 
 
 %changelog
+* Mon Jun 27 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- CAN-2005-1913
+- correct TASK_SIZE_64 in exec shield patch
+
 * Mon Jun 13 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - 2.6.11.12
 



From svn at tinysofa.org  Mon Jun 27 09:28:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 27 Jun 2005 05:28:29 -0400 (EDT)
Subject: [tinysofa-svn] r6456 -
	tinysofa/releases/classic/2.0/kernel/current/sources
Message-ID: <20050627092829.5F9C334509E@minbar.tinysofa.org>

Author: jh
Date: 2005-06-27 05:28:22 -0400 (Mon, 27 Jun 2005)
New Revision: 6456

Added:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1913.patch
Log:
- add linux-2.6.11-CAN-2005-1913.patch


Added: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1913.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1913.patch	2005-06-27 09:27:52 UTC (rev 6455)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1913.patch	2005-06-27 09:28:22 UTC (rev 6456)
@@ -0,0 +1,11 @@
+diff --git a/fs/exec.c b/fs/exec.c
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -649,6 +649,7 @@ static inline int de_thread(struct task_
+ 	}
+ 	sig->group_exit_task = NULL;
+ 	sig->notify_count = 0;
++	sig->real_timer.data = (unsigned long)current;
+ 	spin_unlock_irq(lock);
+ 
+ 	/*



From svn at tinysofa.org  Mon Jun 27 19:59:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 27 Jun 2005 15:59:55 -0400 (EDT)
Subject: [tinysofa-svn] r6457 -
	tinysofa/releases/classic/2.0/python/current/specs
Message-ID: <20050627195955.9725C3451F7@minbar.tinysofa.org>

Author: jh
Date: 2005-06-27 15:59:51 -0400 (Mon, 27 Jun 2005)
New Revision: 6457

Modified:
   tinysofa/releases/classic/2.0/python/current/specs/python.spec
Log:
- create multilib site packages


Modified: tinysofa/releases/classic/2.0/python/current/specs/python.spec
===================================================================
--- tinysofa/releases/classic/2.0/python/current/specs/python.spec	2005-06-27 09:28:22 UTC (rev 6456)
+++ tinysofa/releases/classic/2.0/python/current/specs/python.spec	2005-06-27 19:59:51 UTC (rev 6457)
@@ -188,6 +188,9 @@
 
 %install
 %{__mkdir_p} %{buildroot}/usr %{buildroot}%{_mandir}
+%if %{_lib} == lib64
+%{__mkdir_p} %{buildroot}/usr/lib/python%{pybasever}/site-packages
+%endif
 
 # Clean up patched .py files that are saved as .lib64
 for f in distutils/command/install distutils/sysconfig; do



From svn at tinysofa.org  Mon Jun 27 20:00:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 27 Jun 2005 16:00:26 -0400 (EDT)
Subject: [tinysofa-svn] r6458 -
	tinysofa/releases/classic/2.0/php/current/specs
Message-ID: <20050627200026.4AA4A3451F7@minbar.tinysofa.org>

Author: jh
Date: 2005-06-27 16:00:21 -0400 (Mon, 27 Jun 2005)
New Revision: 6458

Modified:
   tinysofa/releases/classic/2.0/php/current/specs/php.spec
Log:
- fix groups


Modified: tinysofa/releases/classic/2.0/php/current/specs/php.spec
===================================================================
--- tinysofa/releases/classic/2.0/php/current/specs/php.spec	2005-06-27 19:59:51 UTC (rev 6457)
+++ tinysofa/releases/classic/2.0/php/current/specs/php.spec	2005-06-27 20:00:21 UTC (rev 6458)
@@ -176,7 +176,7 @@
 %endif
 
 %package soap
-Group: Development/Languages
+Group: extra
 Requires: php = %{version}-%{release}
 Summary: A module for PHP applications that use the SOAP protocol
 BuildRequires: libxml2-devel
@@ -187,7 +187,7 @@
 
 %if %{with_ibase}
 %package interbase
-Group: Development/Languages
+Group: extra
 Prereq: php = %{version}-%{release}, perl, grep
 Summary: A module for PHP applications that use Interbase databases.
 Provides: php_database



From svn at tinysofa.org  Mon Jun 27 20:01:04 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 27 Jun 2005 16:01:04 -0400 (EDT)
Subject: [tinysofa-svn] r6459 -
	tinysofa/releases/classic/2.0/gawk/current/specs
Message-ID: <20050627200104.C46903451F8@minbar.tinysofa.org>

Author: jh
Date: 2005-06-27 16:00:58 -0400 (Mon, 27 Jun 2005)
New Revision: 6459

Modified:
   tinysofa/releases/classic/2.0/gawk/current/specs/gawk.spec
Log:
- fix documentation group


Modified: tinysofa/releases/classic/2.0/gawk/current/specs/gawk.spec
===================================================================
--- tinysofa/releases/classic/2.0/gawk/current/specs/gawk.spec	2005-06-27 20:00:21 UTC (rev 6458)
+++ tinysofa/releases/classic/2.0/gawk/current/specs/gawk.spec	2005-06-27 20:00:58 UTC (rev 6459)
@@ -23,7 +23,7 @@
 
 %package doc
 Summary: GAWK documents
-Group: main
+Group: documentation
 %info_requires
 
 %description doc



From svn at tinysofa.org  Tue Jun 28 09:35:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 28 Jun 2005 05:35:43 -0400 (EDT)
Subject: [tinysofa-svn] r6460 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050628093543.4475C34528A@minbar.tinysofa.org>

Author: jh
Date: 2005-06-28 05:35:33 -0400 (Tue, 28 Jun 2005)
New Revision: 6460

Added:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1765.patch
Modified:
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- CAN-2005-1765 (x86_64 only)

Added: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1765.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1765.patch	2005-06-27 20:00:58 UTC (rev 6459)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1765.patch	2005-06-28 09:35:33 UTC (rev 6460)
@@ -0,0 +1,11 @@
+--- ./arch/x86_64/mm/fault.c.CAN-2005-1765	2005-06-28 12:28:33.000000000 +0300
++++ ./arch/x86_64/mm/fault.c	2005-06-28 12:29:34.000000000 +0300
+@@ -468,7 +468,7 @@
+ 
+ #ifdef CONFIG_IA32_EMULATION
+ 	/* 32bit vsyscall. map on demand. */
+-	if (test_thread_flag(TIF_IA32) &&
++	if (test_thread_flag(TIF_IA32) && ((error_code & 0x6) == 0x4) &&
+ 	    address >= VSYSCALL32_BASE && address < VSYSCALL32_END) {
+ 		if (map_syscall32(mm, address) < 0)
+ 			goto out_of_memory2;

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-06-27 20:00:58 UTC (rev 6459)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-06-28 09:35:33 UTC (rev 6460)
@@ -46,7 +46,7 @@
 Group: main
 License: GPLv2
 Version: %{rpmversion}
-Release: 16.2jh
+Release: 16.3jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
@@ -100,6 +100,7 @@
 Patch106: linux-2.6.11-mmap.patch
 Patch107: linux-2.6.11-cifs.patch
 Patch108: linux-2.6.11-CAN-2005-1913.patch
+Patch109: linux-2.6.11-CAN-2005-1765.patch
 
 Patch20020: linux-2.6.8-tinysofa-syslog.patch
 
@@ -258,6 +259,7 @@
 # cifs
 %patch107 -p1
 %patch108 -p1 -b .CAN-2005-1913
+%patch109 -p1 -b .CAN-2005-1765
 
 %patch20020 -p1 -b .tinysofa-syslog~
 
@@ -611,6 +613,9 @@
 
 
 %changelog
+* Tue Jun 28 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- CAN-2005-1765 (x86_64 only)
+
 * Mon Jun 27 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - CAN-2005-1913
 - correct TASK_SIZE_64 in exec shield patch



From svn at tinysofa.org  Tue Jun 28 16:51:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 28 Jun 2005 12:51:26 -0400 (EDT)
Subject: [tinysofa-svn] r6461 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050628165126.048A2345073@minbar.tinysofa.org>

Author: jh
Date: 2005-06-28 12:51:16 -0400 (Tue, 28 Jun 2005)
New Revision: 6461

Modified:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1913.patch
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- correct linux-2.6.11-CAN-2005-1913.patch


Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1913.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1913.patch	2005-06-28 09:35:33 UTC (rev 6460)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-CAN-2005-1913.patch	2005-06-28 16:51:16 UTC (rev 6461)
@@ -5,7 +5,7 @@
  	}
  	sig->group_exit_task = NULL;
  	sig->notify_count = 0;
-+	sig->real_timer.data = (unsigned long)current;
++	tsk->real_timer.data = (unsigned long)current;
  	spin_unlock_irq(lock);
  
  	/*

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-06-28 09:35:33 UTC (rev 6460)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-06-28 16:51:16 UTC (rev 6461)
@@ -46,7 +46,7 @@
 Group: main
 License: GPLv2
 Version: %{rpmversion}
-Release: 16.3jh
+Release: 17jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}



From svn at tinysofa.org  Tue Jun 28 19:52:12 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 28 Jun 2005 15:52:12 -0400 (EDT)
Subject: [tinysofa-svn] r6462 - in
	tinysofa/releases/classic/2.0/openssh/current: sources specs
Message-ID: <20050628195212.A7FE8344F33@minbar.tinysofa.org>

Author: jh
Date: 2005-06-28 15:51:42 -0400 (Tue, 28 Jun 2005)
New Revision: 6462

Added:
   tinysofa/releases/classic/2.0/openssh/current/sources/openssh-4.1p1-ssh_config.patch
   tinysofa/releases/classic/2.0/openssh/current/sources/openssh-4.1p1.tar.gz
Removed:
   tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.8p1-makecheck.patch
   tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.8p1-selinux.patch
   tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.9p1.tar.gz
Modified:
   tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec
Log:
- 4.1p1
- use hashed know hosts file as default


Deleted: tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.8p1-makecheck.patch
===================================================================
--- tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.8p1-makecheck.patch	2005-06-28 16:51:16 UTC (rev 6461)
+++ tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.8p1-makecheck.patch	2005-06-28 19:51:42 UTC (rev 6462)
@@ -1,12 +0,0 @@
-diff -Nru openssh-3.8p1.orig/Makefile.in openssh-3.8p1/Makefile.in
---- openssh-3.8p1.orig/Makefile.in	2004-02-18 04:35:11.000000000 +0100
-+++ openssh-3.8p1/Makefile.in	2004-02-25 10:43:01.000000000 +0100
-@@ -230,7 +230,7 @@
- install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
- 
- check-config:
--	-$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
-+	-$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config ||:
- 
- scard-install:
- 	(cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)

Deleted: tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.8p1-selinux.patch
===================================================================
--- tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.8p1-selinux.patch	2005-06-28 16:51:16 UTC (rev 6461)
+++ tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.8p1-selinux.patch	2005-06-28 19:51:42 UTC (rev 6462)
@@ -1,109 +0,0 @@
-diff -Nru openssh-3.8p1.orig/Makefile.in openssh-3.8p1/Makefile.in
---- openssh-3.8p1.orig/Makefile.in	2004-02-18 04:35:11.000000000 +0100
-+++ openssh-3.8p1/Makefile.in	2004-02-25 10:20:37.000000000 +0100
-@@ -40,7 +40,7 @@
- 
- CC=@CC@
- LD=@LD@
--CFLAGS=@CFLAGS@
-+CFLAGS=@CFLAGS@ -DWITH_SELINUX
- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
- LIBPAM=@LIBPAM@
-@@ -53,7 +53,7 @@
- SED=@SED@
- ENT=@ENT@
- XAUTH_PATH=@XAUTH_PATH@
--LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
-+LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ -lselinux
- EXEEXT=@EXEEXT@
- 
- INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
-diff -Nru openssh-3.8p1.orig/session.c openssh-3.8p1/session.c
---- openssh-3.8p1.orig/session.c	2004-02-23 14:01:27.000000000 +0100
-+++ openssh-3.8p1/session.c	2004-02-25 10:20:37.000000000 +0100
-@@ -62,6 +62,11 @@
- #include <kafs.h>
- #endif
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/get_context_list.h>
-+#include <selinux/selinux.h>
-+#endif
-+
- #ifdef GSSAPI
- #include "ssh-gss.h"
- #endif
-@@ -1297,6 +1302,18 @@
- #endif
- 	if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid)
- 		fatal("Failed to set uids to %u.", (u_int) pw->pw_uid);
-+#ifdef WITH_SELINUX
-+       if (is_selinux_enabled())
-+         {
-+           security_context_t scontext;
-+           if (get_default_context(pw->pw_name,NULL,&scontext))
-+             fatal("Failed to get default security context for %s.", pw->pw_name);
-+           if (setexeccon(scontext)) {
-+             fatal("Failed to set exec security context %s for %s.", scontext, pw->pw_name);
-+           }
-+           freecon(scontext);
-+         }
-+#endif
- }
- 
- static void
-diff -Nru openssh-3.8p1.orig/sshpty.c openssh-3.8p1/sshpty.c
---- openssh-3.8p1.orig/sshpty.c	2004-01-21 07:07:17.000000000 +0100
-+++ openssh-3.8p1/sshpty.c	2004-02-25 10:23:40.000000000 +0100
-@@ -22,6 +22,12 @@
- #include "log.h"
- #include "misc.h"
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/flask.h>
-+#include <selinux/get_context_list.h>
-+#include <selinux/selinux.h>
-+#endif
-+
- #ifdef HAVE_PTY_H
- # include <pty.h>
- #endif
-@@ -196,6 +202,37 @@
- 	 * Warn but continue if filesystem is read-only and the uids match/
- 	 * tty is owned by root.
- 	 */
-+#ifdef WITH_SELINUX
-+       if (is_selinux_enabled()) {
-+         security_context_t      new_tty_context=NULL,
-+           user_context=NULL, old_tty_context=NULL; 
-+
-+         if (get_default_context(pw->pw_name,NULL,&user_context))
-+             fatal("Failed to get default security context for %s.", pw->pw_name);
-+
-+         if (getfilecon(ttyname, &old_tty_context)<0) {
-+           error("getfilecon(%.100s) failed: %.100s", ttyname,
-+                 strerror(errno));
-+         }
-+         else 
-+           {
-+             if ( security_compute_relabel(user_context,old_tty_context,SECCLASS_CHR_FILE,&new_tty_context)!=0) {
-+               error("security_compute_relabel(%.100s) failed: %.100s", ttyname,
-+                     strerror(errno));
-+             } 
-+             else 
-+               {
-+                 if (setfilecon (ttyname, new_tty_context) != 0) {
-+                   error("setfilecon(%.100s, %s) failed: %.100s",
-+                         ttyname, new_tty_context, strerror(errno));
-+                 }
-+                 freecon(new_tty_context);
-+               }
-+             freecon(old_tty_context);
-+           }
-+         freecon(user_context);
-+       }
-+#endif
- 	if (stat(ttyname, &st))
- 		fatal("stat(%.100s) failed: %.100s", ttyname,
- 		    strerror(errno));

Deleted: tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.9p1.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/openssh/current/sources/openssh-4.1p1-ssh_config.patch
===================================================================
--- tinysofa/releases/classic/2.0/openssh/current/sources/openssh-4.1p1-ssh_config.patch	2005-06-28 16:51:16 UTC (rev 6461)
+++ tinysofa/releases/classic/2.0/openssh/current/sources/openssh-4.1p1-ssh_config.patch	2005-06-28 19:51:42 UTC (rev 6462)
@@ -0,0 +1,47 @@
+--- ./ssh_config.ssh_config	2005-06-28 22:44:53.000000000 +0300
++++ ./ssh_config	2005-06-28 22:45:46.000000000 +0300
+@@ -17,23 +17,24 @@
+ # list of available options, their meanings and defaults, please see the
+ # ssh_config(5) man page.
+ 
+-# Host *
+-#   ForwardAgent no
+-#   ForwardX11 no
+-#   RhostsRSAAuthentication no
+-#   RSAAuthentication yes
+-#   PasswordAuthentication yes
+-#   HostbasedAuthentication no
+-#   BatchMode no
+-#   CheckHostIP yes
+-#   AddressFamily any
+-#   ConnectTimeout 0
+-#   StrictHostKeyChecking ask
+-#   IdentityFile ~/.ssh/identity
+-#   IdentityFile ~/.ssh/id_rsa
+-#   IdentityFile ~/.ssh/id_dsa
+-#   Port 22
+-#   Protocol 2,1
+-#   Cipher 3des
+-#   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
+-#   EscapeChar ~
++Host *
++   ForwardAgent no
++   ForwardX11 no
++   RhostsRSAAuthentication no
++   RSAAuthentication yes
++   PasswordAuthentication yes
++   HostbasedAuthentication no
++   BatchMode no
++   CheckHostIP yes
++   AddressFamily any
++   ConnectTimeout 0
++   StrictHostKeyChecking ask
++   IdentityFile ~/.ssh/identity
++   IdentityFile ~/.ssh/id_rsa
++   IdentityFile ~/.ssh/id_dsa
++   Port 22
++   Protocol 2,1
++   Cipher 3des
++   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
++   EscapeChar ~
++   HashKnownHosts yes

Added: tinysofa/releases/classic/2.0/openssh/current/sources/openssh-4.1p1.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/classic/2.0/openssh/current/sources/openssh-4.1p1.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec
===================================================================
--- tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec	2005-06-28 16:51:16 UTC (rev 6461)
+++ tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec	2005-06-28 19:51:42 UTC (rev 6462)
@@ -1,19 +1,14 @@
-%define _noVersionedDependencies 1
-
 Summary: OpenSSH free Secure Shell (SSH) implementation
 Name: openssh
-Version: 3.9p1
-Release: 2jh
+Version: 4.1p1
+Release: 1jh
 License: BSD
 Group: main
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 Source1: sshd_config
 Source2: sshd.pam
 Source3: sshd.init
-# Originally from:
-# Source4: http://www.nsa.gov/selinux/patches/openssh-selinux.patch
-Source4: openssh-3.8p1-selinux.patch
-Patch1: openssh-3.8p1-makecheck.patch
+Patch0: openssh-4.1p1-ssh_config.patch
 Requires: openssl >= 0.9.5a, zlib >= 1.1.4
 BuildRequires: perl, openssl-devel, tcp_wrappers-devel, groff
 BuildRequires: zlib-devel >= 1.1.4, pam-devel >= 0.77
@@ -83,17 +78,10 @@
 
 %prep
 %setup -q 
-%if %{with_selinux}
-patch -p1 < %{SOURCE4}
-%endif
-%patch1 -p1
+%patch0 -p1 -b .ssh_config~
 
 
 %build
-%if %{with_selinux}
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DWITH_SELINUX"
-%endif
-
 # special: enable stack protector
 CFLAGS="$RPM_OPT_FLAGS -fpie -fstack-protector"; export CFLAGS
 LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
@@ -200,6 +188,10 @@
 
 
 %changelog
+* Tue Jun 28 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.1p1-1jh
+- 4.1p1
+- use hashed know hosts file as default
+
 * Tue Jan 18 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.9p1-1jh
 - 3.9p1
 - use AUTHPRIV syslog facility



From svn at tinysofa.org  Tue Jun 28 20:00:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 28 Jun 2005 16:00:08 -0400 (EDT)
Subject: [tinysofa-svn] r6463 - in
	tinysofa/releases/classic/2.0/openssh/current: sources specs
Message-ID: <20050628200008.5B7F93451A4@minbar.tinysofa.org>

Author: jh
Date: 2005-06-28 15:59:58 -0400 (Tue, 28 Jun 2005)
New Revision: 6463

Added:
   tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.9p1-no-log-signal.patch
Modified:
   tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec
Log:
- Don't use syslog in signal handler

Added: tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.9p1-no-log-signal.patch
===================================================================
--- tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.9p1-no-log-signal.patch	2005-06-28 19:51:42 UTC (rev 6462)
+++ tinysofa/releases/classic/2.0/openssh/current/sources/openssh-3.9p1-no-log-signal.patch	2005-06-28 19:59:58 UTC (rev 6463)
@@ -0,0 +1,14 @@
+Don't use syslog in signal handler as syslog is not signal handler safe. It
+can for example deadlock if another syslog call is interrupted.
+--- openssh-3.9p1/sshd.c.alrm-handler	2005-01-28 11:14:13.000000000 +0100
++++ openssh-3.9p1/sshd.c	2005-02-18 16:45:49.748787978 +0100
+@@ -317,8 +317,7 @@
+ 	if (use_privsep && pmonitor != NULL && pmonitor->m_pid > 0)
+ 		kill(pmonitor->m_pid, SIGALRM);
+ 
+-	/* Log error and exit. */
+-	fatal("Timeout before authentication for %s", get_remote_ipaddr());
++	cleanup_exit(SIGALRM);
+ }
+ 
+ /*

Modified: tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec
===================================================================
--- tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec	2005-06-28 19:51:42 UTC (rev 6462)
+++ tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec	2005-06-28 19:59:58 UTC (rev 6463)
@@ -9,6 +9,7 @@
 Source2: sshd.pam
 Source3: sshd.init
 Patch0: openssh-4.1p1-ssh_config.patch
+Patch1: openssh-3.9p1-no-log-signal.patch
 Requires: openssl >= 0.9.5a, zlib >= 1.1.4
 BuildRequires: perl, openssl-devel, tcp_wrappers-devel, groff
 BuildRequires: zlib-devel >= 1.1.4, pam-devel >= 0.77
@@ -79,6 +80,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .ssh_config~
+%patch1 -p1 -b .no-log-signal~
 
 
 %build



From svn at tinysofa.org  Tue Jun 28 21:15:33 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 28 Jun 2005 17:15:33 -0400 (EDT)
Subject: [tinysofa-svn] r6464 -
	tinysofa/releases/classic/2.0/openssh/current/specs
Message-ID: <20050628211533.F0E803451D5@minbar.tinysofa.org>

Author: jh
Date: 2005-06-28 17:15:27 -0400 (Tue, 28 Jun 2005)
New Revision: 6464

Modified:
   tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec
Log:
- add %%accountman_requires for server package

Modified: tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec
===================================================================
--- tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec	2005-06-28 19:59:58 UTC (rev 6463)
+++ tinysofa/releases/classic/2.0/openssh/current/specs/openssh.spec	2005-06-28 21:15:27 UTC (rev 6464)
@@ -60,6 +60,7 @@
 # this is to avoid upgrade problems from 1.1-U2 or older
 PreReq: tcp_wrappers
 %service_requires
+%accountman_requires
 
 %description server
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -122,11 +123,9 @@
     /usr/sbin/useradd -d /var/empty -M -s /sbin/nologin -g 103 -u 103 sshd
 fi
 
-
 %post server
 %service_post sshd
 
-
 %preun server
 %service_preun sshd
 
@@ -192,7 +191,8 @@
 %changelog
 * Tue Jun 28 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.1p1-1jh
 - 4.1p1
-- use hashed know hosts file as default
+- use hashed known_hosts file as default
+- add %%accountman_requires for server package
 
 * Tue Jan 18 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.9p1-1jh
 - 3.9p1



From svn at tinysofa.org  Tue Jun 28 21:17:03 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 28 Jun 2005 17:17:03 -0400 (EDT)
Subject: [tinysofa-svn] r6465 -
	tinysofa/releases/classic/2.0/dovecot/current/specs
Message-ID: <20050628211703.D33693451ED@minbar.tinysofa.org>

Author: jh
Date: 2005-06-28 17:16:58 -0400 (Tue, 28 Jun 2005)
New Revision: 6465

Modified:
   tinysofa/releases/classic/2.0/dovecot/current/specs/dovecot.spec
Log:
- add %%accountman_requires

Modified: tinysofa/releases/classic/2.0/dovecot/current/specs/dovecot.spec
===================================================================
--- tinysofa/releases/classic/2.0/dovecot/current/specs/dovecot.spec	2005-06-28 21:15:27 UTC (rev 6464)
+++ tinysofa/releases/classic/2.0/dovecot/current/specs/dovecot.spec	2005-06-28 21:16:58 UTC (rev 6465)
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 0.99.14
-Release: 1jh
+Release: 2jh
 License: GPL
 Group: extra
 Source: %{name}-%{version}.tar.gz
@@ -22,6 +22,7 @@
 BuildRequires: cyrus-sasl-devel
 Prereq: openssl
 %service_requires
+%accountman_requires
 
 %description
 Dovecot is an IMAP server for Linux/UNIX-like systems, written with security 
@@ -127,7 +128,10 @@
 
 
 %changelog
-* Thu Feb 17 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.99.14-jh
+* Wed Jun 29 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.99.14-2jh
+- add %%accountman_requires
+
+* Thu Feb 17 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.99.14-1jh
 - 0.99.14
 
 * Sun Feb 13 2005 Gerald Dachs <gda at tinysofa dot org> 0.99.13-2gd



From svn at tinysofa.org  Wed Jun 29 11:21:33 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 29 Jun 2005 07:21:33 -0400 (EDT)
Subject: [tinysofa-svn] r6466 - in tinysofa/releases/classic/2.0:
	filesystem/current/specs man-pages/current/sources
	man-pages/current/specs
Message-ID: <20050629112133.CF09434529E@minbar.tinysofa.org>

Author: jh
Date: 2005-06-29 07:20:56 -0400 (Wed, 29 Jun 2005)
New Revision: 6466

Added:
   tinysofa/releases/classic/2.0/man-pages/current/sources/manpages_2.02.orig.tar.gz
Removed:
   tinysofa/releases/classic/2.0/man-pages/current/sources/manpages_1.66.orig.tar.gz
   tinysofa/releases/classic/2.0/man-pages/current/sources/netman-cvs.tar.gz
Modified:
   tinysofa/releases/classic/2.0/filesystem/current/specs/filesystem.spec
   tinysofa/releases/classic/2.0/man-pages/current/sources/rpcgen.1
   tinysofa/releases/classic/2.0/man-pages/current/specs/man-pages.spec
Log:
man-pages:
- 2.02
- remove old networking manual pages (netman-cvs)
- spec cleanup
filesystem:
- add /usr/share/man/man9


Modified: tinysofa/releases/classic/2.0/filesystem/current/specs/filesystem.spec
===================================================================
--- tinysofa/releases/classic/2.0/filesystem/current/specs/filesystem.spec	2005-06-28 21:16:58 UTC (rev 6465)
+++ tinysofa/releases/classic/2.0/filesystem/current/specs/filesystem.spec	2005-06-29 11:20:56 UTC (rev 6466)
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system.
 Name: filesystem
 Version: 1.0
-Release: 6jh
+Release: 7jh
 License: Public Domain
 Group: main
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -89,6 +89,7 @@
 mkdir -p $RPM_BUILD_ROOT/usr/share/man/man6
 mkdir -p $RPM_BUILD_ROOT/usr/share/man/man7
 mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man9
 mkdir -p $RPM_BUILD_ROOT/usr/share/man/mann
 mkdir -p $RPM_BUILD_ROOT/usr/share/misc
 mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
@@ -164,6 +165,7 @@
 %dir /usr/share/man/man6
 %dir /usr/share/man/man7
 %dir /usr/share/man/man8
+%dir /usr/share/man/man9
 %dir /usr/share/man/mann
 %dir /usr/share/misc
 %dir /usr/share/pixmaps
@@ -189,6 +191,9 @@
 %endif
 
 %changelog
+* Wed Jun 29 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.0-7jh
+- add /usr/share/man/man9
+
 * Wed Nov 17 2004 Jaakko Heinonen <jh at tinysofa dot org>
 - add /var/empty
 

Deleted: tinysofa/releases/classic/2.0/man-pages/current/sources/manpages_1.66.orig.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/man-pages/current/sources/manpages_2.02.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/classic/2.0/man-pages/current/sources/manpages_2.02.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/classic/2.0/man-pages/current/sources/netman-cvs.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/classic/2.0/man-pages/current/sources/rpcgen.1
===================================================================
--- tinysofa/releases/classic/2.0/man-pages/current/sources/rpcgen.1	2005-06-28 21:16:58 UTC (rev 6465)
+++ tinysofa/releases/classic/2.0/man-pages/current/sources/rpcgen.1	2005-06-29 11:20:56 UTC (rev 6466)
@@ -431,4 +431,4 @@
 $ rpcgen \-n tcp \-o prot_svc.c prot.x
 .ft 1
 .SH "SEE ALSO"
-\f4cc\fP(1).
+\f4gcc\fP(1).

Modified: tinysofa/releases/classic/2.0/man-pages/current/specs/man-pages.spec
===================================================================
--- tinysofa/releases/classic/2.0/man-pages/current/specs/man-pages.spec	2005-06-28 21:16:58 UTC (rev 6465)
+++ tinysofa/releases/classic/2.0/man-pages/current/specs/man-pages.spec	2005-06-29 11:20:56 UTC (rev 6466)
@@ -1,14 +1,12 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
-Version: 1.66
-Release: 8jh
+Version: 2.02
+Release: 1jh
 License: distributable
 Group: documentation
-#Source0: ftp://ftp.win.tue.nl/pub/linux-local/manpages/man-pages-%{version}.tar.bz2
-Source0: http://ftp.debian.org/debian/pool/main/m/manpages/manpages_1.66.orig.tar.gz
+Source0: http://ftp.debian.org/debian/pool/main/m/manpages/manpages_%{version}.orig.tar.gz
 Source1: rpcgen.1
-Source2: netman-cvs.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Requires: man
 
@@ -22,12 +20,14 @@
 packages, etc. (e.g., nroff, ascii); and Section 8, system
 administration (intro only).
 
+
 %prep
 %setup -q
 
 # I left the .b off of this to keep from having old versions in file lists
 cp -a %{SOURCE1} man1
 
+
 %build
 rm -fv man1/README
 rm -fv man1/{chgrp,chmod,chown,cp,dd,df,dircolors,du,install}.1
@@ -52,38 +52,34 @@
 rm -fv man8/lilo.8
 find . -name "*sudo*" -exec rm {} \;
 
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/usr/share/man
-for n in 0p 1 1p 2 3 3p 4 5 6 7 8; do
-	mkdir $RPM_BUILD_ROOT/usr/share/man/man$n
+%install
+for n in 0p 1 1p 2 3 3p 4 5 6 7 8 9; do
+	%{__mkdir_p} %{buildroot}%{_mandir}/man$n
 done
 
-# Do the source 2 manpages first so they will be overwritten with the newer
-# if both exist.
-mkdir tmp
-pushd tmp
-  tar -zxf %{SOURCE2}
-  for n in 2 3 4; do
-        cp *.$n $RPM_BUILD_ROOT/usr/share/man/man$n/
-  done
-popd
-
 # Then do the official
 for n in man?/* man?p/*; do
-	test -e "$n" && cp -a "$n" $RPM_BUILD_ROOT/usr/share/man/$n
+	test -e "$n" && cp -a "$n" %{buildroot}%{_mandir}/$n
 done
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(0644,root,root,755)
 %doc README man-pages-%{version}.Announce
-/usr/share/man/man*/*
+%{_mandir}/man*/*
 
+
 %changelog
+* Wed Jun 29 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.02-1jh
+- 2.02
+- remove old networking manual pages (netman-cvs)
+- spec cleanup
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.66-7ts
 - current (1.66-7jh) integrated as 1.66-7ts for release 1.1
 



From svn at tinysofa.org  Wed Jun 29 11:41:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 29 Jun 2005 07:41:29 -0400 (EDT)
Subject: [tinysofa-svn] r6467 -
	tinysofa/releases/classic/2.0/cups/current/specs
Message-ID: <20050629114129.D5A743452AA@minbar.tinysofa.org>

Author: jh
Date: 2005-06-29 07:41:24 -0400 (Wed, 29 Jun 2005)
New Revision: 6467

Modified:
   tinysofa/releases/classic/2.0/cups/current/specs/cups.spec
Log:
- correct changelog typo


Modified: tinysofa/releases/classic/2.0/cups/current/specs/cups.spec
===================================================================
--- tinysofa/releases/classic/2.0/cups/current/specs/cups.spec	2005-06-29 11:20:56 UTC (rev 6466)
+++ tinysofa/releases/classic/2.0/cups/current/specs/cups.spec	2005-06-29 11:41:24 UTC (rev 6467)
@@ -216,7 +216,7 @@
 
 
 %changelog
-* Tue May 31 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.24-4jh
+* Tue May 31 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.23-4jh
 - add cups-1.1.19-no_rpath.patch
 
 * Wed Feb  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.23-2jh



From svn at tinysofa.org  Wed Jun 29 12:09:39 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 29 Jun 2005 08:09:39 -0400 (EDT)
Subject: [tinysofa-svn] r6468 - in
	tinysofa/releases/classic/2.0/samba/current: sources specs
Message-ID: <20050629120939.241BF345299@minbar.tinysofa.org>

Author: jh
Date: 2005-06-29 08:09:29 -0400 (Wed, 29 Jun 2005)
New Revision: 6468

Added:
   tinysofa/releases/classic/2.0/samba/current/sources/samba-3.0.11-mount.cifs.patch
Modified:
   tinysofa/releases/classic/2.0/samba/current/specs/samba.spec
Log:
- update mount.cifs (samba-3.0.11-mount.cifs.patch)

Added: tinysofa/releases/classic/2.0/samba/current/sources/samba-3.0.11-mount.cifs.patch
===================================================================
--- tinysofa/releases/classic/2.0/samba/current/sources/samba-3.0.11-mount.cifs.patch	2005-06-29 11:41:24 UTC (rev 6467)
+++ tinysofa/releases/classic/2.0/samba/current/sources/samba-3.0.11-mount.cifs.patch	2005-06-29 12:09:29 UTC (rev 6468)
@@ -0,0 +1,556 @@
+diff -urN samba-3.0.11.old/source/client/mount.cifs.c samba-3.0.11/source/client/mount.cifs.c
+--- samba-3.0.11.old/source/client/mount.cifs.c	2005-06-29 15:02:13.000000000 +0300
++++ samba-3.0.11/source/client/mount.cifs.c	2005-06-29 15:05:23.000000000 +0300
+@@ -1,6 +1,6 @@
+ /* 
+    Mount helper utility for Linux CIFS VFS (virtual filesystem) client
+-   Copyright (C) 2003 Steve French  (sfrench at us.ibm.com)
++   Copyright (C) 2003,2005 Steve French  (sfrench at us.ibm.com)
+ 
+    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
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <pwd.h>
++#include <ctype.h>
+ #include <sys/types.h>
+ #include <sys/mount.h>
+ #include <sys/stat.h>
+@@ -38,7 +39,7 @@
+ #include <fcntl.h>
+ 
+ #define MOUNT_CIFS_VERSION_MAJOR "1"
+-#define MOUNT_CIFS_VERSION_MINOR "5"
++#define MOUNT_CIFS_VERSION_MINOR "8"
+ 
+ #ifndef MOUNT_CIFS_VENDOR_SUFFIX
+ #define MOUNT_CIFS_VENDOR_SUFFIX ""
+@@ -59,7 +60,8 @@
+ static int got_gid = 0;
+ static int free_share_name = 0;
+ static char * user_name = NULL;
+-char * mountpassword = NULL;
++static char * mountpassword = NULL;
++char * domain_name = NULL;
+ 
+ 
+ /* BB finish BB
+@@ -71,6 +73,9 @@
+                 
+ BB end finish BB */
+ 
++static char * check_for_domain(char **);
++
++
+ static void mount_cifs_usage(void)
+ {
+ 	printf("\nUsage:  %s <remotetarget> <dir> -o <options>\n", thisprogram);
+@@ -78,11 +83,11 @@
+ 	printf(" to a local directory.\n\nOptions:\n");
+ 	printf("\tuser=<arg>\n\tpass=<arg>\n\tdom=<arg>\n");
+ 	printf("\nLess commonly used options:");
+-	printf("\n\tcredentials=<filename>,guest,perm,noperm,setuids,nosetuids,\n\trw,ro,sep=<char>,iocharset=<codepage>,suid,nosuid,exec,noexec");
+-	printf("\n\nOptions not needed for servers supporting CIFS Unix extensions (e.g. most Samba versions):");
++	printf("\n\tcredentials=<filename>,guest,perm,noperm,setuids,nosetuids,rw,ro,\n\tsep=<char>,iocharset=<codepage>,suid,nosuid,exec,noexec,serverino,\n\tdirectio,mapchars,nomapchars");
++	printf("\n\nOptions not needed for servers supporting CIFS Unix extensions\n\t(e.g. most Samba versions):");
+ 	printf("\n\tuid=<uid>,gid=<gid>,dir_mode=<mode>,file_mode=<mode>");
+ 	printf("\n\nRarely used options:");
+-	printf("\n\tport=<tcpport>,rsize=<size>,wsize=<size>,unc=<unc_name>,ip=<ip_address>,dev,nodev");
++	printf("\n\tport=<tcpport>,rsize=<size>,wsize=<size>,unc=<unc_name>,ip=<ip_address>,\n\tdev,nodev,nouser_xattr,netbiosname,hard,soft,intr,nointr,noacl");
+ 	printf("\n\nOptions are described in more detail in the manual page");
+ 	printf("\n\tman 8 mount.cifs\n");
+ 	printf("\nTo display the version number of the mount helper:");
+@@ -106,7 +111,7 @@
+ 	return username;
+ }
+ 
+-char * parse_cifs_url(char * unc_name)
++static char * parse_cifs_url(char * unc_name)
+ {
+ 	printf("\nMounting cifs URL not implemented yet. Attempt to mount %s\n",unc_name);
+ 	return NULL;
+@@ -180,13 +185,41 @@
+ 					} else
+ 						memset(mountpassword,0,64);
+ 					if(mountpassword) {
+-						/* BB add handling for commas in password here */
+ 						strncpy(mountpassword,temp_val,length);
+ 						got_password = 1;
+ 					}
+ 				}
+ 			}
+-		}
++                } else if (strncasecmp("domain",line_buf+i,6) == 0) {
++                        temp_val = strchr(line_buf+i,'=');
++                        if(temp_val) {
++                                /* go past equals sign */
++                                temp_val++;
++				if(verboseflag)
++					printf("\nDomain %s\n",temp_val);
++                                for(length = 0;length<65;length++) {
++                                        if(temp_val[length] == '\n')
++                                                break;
++                                }
++                                if(length > 64) {
++                                        printf("mount.cifs failed: domain in credentials file too long\n");
++                                        if(mountpassword) {
++                                                memset(mountpassword,0,64);
++                                        }
++                                        exit(1);
++                                } else {
++                                        if(domain_name == NULL) {
++                                                domain_name = calloc(65,1);
++                                        } else
++                                                memset(domain_name,0,64);
++                                        if(domain_name) {
++                                                strncpy(domain_name,temp_val,length);
++                                                got_domain = 1;
++                                        }
++                                }
++                        }
++                }
++
+ 	}
+ 	fclose(fs);
+ 	if(line_buf) {
+@@ -263,7 +296,9 @@
+ 		data = options;
+ 
+ 	if(verboseflag)
+-		printf("\n parsing options: %s", options);
++		printf("parsing options: %s\n", options);
++
++	/* BB fixme check for separator override BB */
+ 
+ /* while ((data = strsep(&options, ",")) != NULL) { */
+ 	while(data != NULL) {
+@@ -275,33 +310,36 @@
+ 		/* data  = next keyword */
+ 		/* value = next value ie stuff after equal sign */
+ 
+-		next_keyword = strchr(data,',');
++		next_keyword = strchr(data,','); /* BB handle sep= */
+ 	
+ 		/* temporarily null terminate end of keyword=value pair */
+ 		if(next_keyword)
+ 			*next_keyword = 0;
+ 
+-		/* if (!*data)
+-			continue; */
+-		
+ 		/* temporarily null terminate keyword to make keyword and value distinct */
+ 		if ((value = strchr(data, '=')) != NULL) {
+ 			*value = '\0';
+ 			value++;
+ 		}
+ 
+-		if (strncmp(data, "user", 4) == 0) {
++		if (strncmp(data, "users",5) == 0) {
++			if(!value || !*value) {
++				strncpy(data,",,,,,",5);
++			}
++		} else if (strncmp(data, "user_xattr",10) == 0) {
++		   /* do nothing - need to skip so not parsed as user name */
++		} else if (strncmp(data, "user", 4) == 0) {
++
+ 			if (!value || !*value) {
+ 				if(data[4] == '\0') {
+ 					if(verboseflag)
+ 						printf("\nskipping empty user mount parameter\n");
+ 					/* remove the parm since it would otherwise be confusing
+ 					to the kernel code which would think it was a real username */
+-						data[0] = '\001';
+-						data[1] = '\001';
+-						data[2] = '\001';
+-						data[3] = '\001';
+-					/* BB remove it from mount line so as not to confuse kernel code */
++						data[0] = ',';
++						data[1] = ',';
++						data[2] = ',';
++						data[3] = ',';
+ 				} else {
+ 					printf("username specified with no parameter\n");
+ 					return 1;	/* needs_arg; */
+@@ -311,7 +349,7 @@
+ 					got_user=1;
+ 					percent_char = strchr(value,'%');
+ 					if(percent_char) {
+-						*percent_char = '\001';
++						*percent_char = ',';
+ 						if(mountpassword == NULL)
+ 							mountpassword = calloc(65,1);
+ 						if(mountpassword) {
+@@ -322,11 +360,18 @@
+ 							strncpy(mountpassword, percent_char,64);
+ 						/*  remove password from username */
+ 							while(*percent_char != 0) {
+-								*percent_char = '\001';
++								*percent_char = ',';
+ 								percent_char++;
+ 							}
+ 						}
+ 					}
++					/* this is only case in which the user
++					name buf is not malloc - so we have to
++					check for domain name embedded within
++					the user name here since the later
++					call to check_for_domain will not be
++					invoked */
++					domain_name = check_for_domain(&value);
+ 				} else {
+ 					printf("username too long\n");
+ 					return 1;
+@@ -468,15 +513,17 @@
+ 		} else if (strncmp(data, "guest", 5) == 0) {
+ 			got_password=1;
+                         /* remove the parm since it would otherwise be logged by kern */
+- 			data[0] = '\001';
+-                        data[1] = '\001';
+-                        data[2] = '\001';
+- 			data[3] = '\001';
+-			data[4] = '\001';
++ 			data[0] = ',';
++                        data[1] = ',';
++                        data[2] = ',';
++ 			data[3] = ',';
++			data[4] = ',';
+ 		} else if (strncmp(data, "ro", 2) == 0) {
+ 			*filesys_flags |= MS_RDONLY;
+ 		} else if (strncmp(data, "rw", 2) == 0) {
+ 			*filesys_flags &= ~MS_RDONLY;
++                } else if (strncmp(data, "remount", 7) == 0) {
++                        *filesys_flags |= MS_REMOUNT;
+ 		} /* else if (strnicmp(data, "port", 4) == 0) {
+ 			if (value && *value) {
+ 				vol->port =
+@@ -509,15 +556,135 @@
+ 	
+ 		/* put previous overwritten comma back */
+ 		if(next_keyword)
+-			*next_keyword = '\001';
++			*next_keyword = ','; /* BB handle sep= */
+ 		else
+ 			data = NULL;
+ 	}
+ 	return 0;
+ }
+ 
++/* replace all (one or more) commas with double commas */
++static void check_for_comma(char ** ppasswrd)
++{
++	char *new_pass_buf;
++	char *pass;
++	int i,j;
++	int number_of_commas = 0;
++	int len = strlen(*ppasswrd);
++
++	if(ppasswrd == NULL)
++		return;
++	else 
++		(pass = *ppasswrd);
++
++	for(i=0;i<len;i++)  {
++		if(pass[i] == ',')
++			number_of_commas++;
++	}
++
++	if(number_of_commas == 0)
++		return;
++	if(number_of_commas > 64) {
++		/* would otherwise overflow the mount options buffer */
++		printf("\nInvalid password. Password contains too many commas.\n");
++		return;
++	}
++
++	new_pass_buf = malloc(len+number_of_commas+1);
++	if(new_pass_buf == NULL)
++		return;
++
++	for(i=0,j=0;i<len;i++,j++) {
++		new_pass_buf[j] = pass[i];
++		if(pass[i] == ',') {
++			j++;
++			new_pass_buf[j] = pass[i];
++		}
++	}
++	new_pass_buf[len+number_of_commas] = 0;
++
++	free(*ppasswrd);
++	*ppasswrd = new_pass_buf;
++	
++	return;
++}
++
++/* Usernames can not have backslash in them and we use
++   [BB check if usernames can have forward slash in them BB] 
++   backslash as domain\user separator character
++*/
++static char * check_for_domain(char **ppuser)
++{
++	char * original_string;
++	char * usernm;
++	char * domainnm;
++	int    original_len;
++	int    len;
++	int    i;
++
++	if(ppuser == NULL)
++		return NULL;
++
++	original_string = *ppuser;
++
++	if (original_string == NULL)
++		return NULL;
++	
++	original_len = strlen(original_string);
++
++	usernm = strchr(*ppuser,'/');
++	if (usernm == NULL) {
++		usernm = strchr(*ppuser,'\\');
++		if (usernm == NULL)
++			return NULL;
++	}
++
++	if(got_domain) {
++		printf("Domain name specified twice. Username probably malformed\n");
++		return NULL;
++	}
++
++	usernm[0] = 0;
++	domainnm = *ppuser;
++	if (domainnm[0] != 0) {
++		got_domain = 1;
++	} else {
++		printf("null domain\n");
++	}
++	len = strlen(domainnm);
++	/* reset domainm to new buffer, and copy
++	domain name into it */
++	domainnm = malloc(len+1);
++	if(domainnm == NULL)
++		return NULL;
++
++	strcpy(domainnm,*ppuser);
++
++/*	move_string(*ppuser, usernm+1) */
++	len = strlen(usernm+1);
++
++	if(len >= original_len) {
++		/* should not happen */
++		return domainnm;
++	}
++
++	for(i=0;i<original_len;i++) {
++		if(i<len)
++			original_string[i] = usernm[i+1];
++		else /* stuff with commas to remove last parm */
++			original_string[i] = ',';
++	}
++
++	/* BB add check for more than one slash? 
++	  strchr(*ppuser,'/');
++	  strchr(*ppuser,'\\') 
++	*/
++	
++	return domainnm;
++}
++
+ /* Note that caller frees the returned buffer if necessary */
+-char * parse_server(char ** punc_name)
++static char * parse_server(char ** punc_name)
+ {
+ 	char * unc_name = *punc_name;
+ 	int length = strnlen(unc_name,1024);
+@@ -525,6 +692,7 @@
+ 	char * ipaddress_string = NULL;
+ 	struct hostent * host_entry;
+ 	struct in_addr server_ipaddr;
++	int rc;
+ 
+ 	if(length > 1023) {
+ 		printf("mount error: UNC name too long");
+@@ -568,8 +736,7 @@
+ 				share += 1;
+ 				if(got_ip == 0) {
+ 					host_entry = gethostbyname(unc_name);
+-				} else
+-					host_entry = NULL;
++				}
+ 				*(share - 1) = '/'; /* put the slash back */
+ 				if(got_ip) {
+ 					if(verboseflag)
+@@ -578,6 +745,7 @@
+ 				}
+ 				if(host_entry == NULL) {
+ 					printf("mount error: could not find target server. TCP name %s not found ", unc_name);
++					printf(" rc = %d\n",rc);
+ 					return NULL;
+ 				} else {
+ 					/* BB should we pass an alternate version of the share name as Unicode */
+@@ -637,7 +805,6 @@
+ 	int flags = MS_MANDLOCK; /* no need to set legacy MS_MGC_VAL */
+ 	char * orgoptions = NULL;
+ 	char * share_name = NULL;
+-	char * domain_name = NULL;
+ 	char * ipaddr = NULL;
+ 	char * uuid = NULL;
+ 	char * mountpoint;
+@@ -652,6 +819,7 @@
+ 	int gid = 0;
+ 	int optlen = 0;
+ 	int orgoptlen = 0;
++	int retry = 0; /* set when we have to retry mount with uppercase */
+ 	struct stat statbuf;
+ 	struct utsname sysinfo;
+ 	struct mntent mountent;
+@@ -747,7 +915,8 @@
+ 			user_name = optarg;
+ 			break;
+ 		case 'd':
+-			domain_name = optarg;
++			domain_name = optarg; /* BB fix this - currently ignored */
++			got_domain = 1;
+ 			break;
+ 		case 'p':
+ 			if(mountpassword == NULL)
+@@ -787,14 +956,12 @@
+ 
+         if (orgoptions && parse_options(orgoptions, &flags))
+                 return -1;
+-	
+ 	ipaddr = parse_server(&share_name);
+ 	if((ipaddr == NULL) && (got_ip == 0)) {
+ 		printf("No ip address specified and hostname not found\n");
+ 		return -1;
+ 	}
+ 	
+-
+ 	/* BB save off path and pop after mount returns? */
+ 	resolved_path = malloc(PATH_MAX+1);
+ 	if(resolved_path) {
+@@ -832,8 +999,10 @@
+ 		}
+ 	}
+ 
+-	if(got_user == 0)
++	if(got_user == 0) {
+ 		user_name = getusername();
++		got_user = 1;
++	}
+        
+ 	if(got_password == 0) {
+ 		mountpassword = getpass("Password: "); /* BB obsolete */
+@@ -841,6 +1010,7 @@
+ 	}
+ 	/* FIXME launch daemon (handles dfs name resolution and credential change) 
+ 	   remember to clear parms and overwrite password field before launching */
++mount_retry:
+ 	if(orgoptions) {
+ 		optlen = strlen(orgoptions);
+ 		orgoptlen = optlen;
+@@ -854,7 +1024,7 @@
+ 		optlen += strlen(ipaddr) + 4;
+ 	if(mountpassword)
+ 		optlen += strlen(mountpassword) + 6;
+-	options = malloc(optlen + 15);
++	options = malloc(optlen + 10 + 64 /* space for commas in password */ + 8 /* space for domain=  , domain name itself was counted as part of the length username string above */);
+ 
+ 	if(options == NULL) {
+ 		printf("Could not allocate memory for mount options\n");
+@@ -862,7 +1032,7 @@
+ 	}
+ 		
+ 
+-	strcpy ( options, "sep=\001" );
++	options[0] = 0;
+ 	strncat(options,"unc=",4);
+ 	strcat(options,share_name);
+ 	/* scan backwards and reverse direction of slash */
+@@ -870,28 +1040,47 @@
+ 	if(temp > options + 6)
+ 		*temp = '\\';
+ 	if(ipaddr) {
+-		strncat(options,"\001ip=",4);
++		strncat(options,",ip=",4);
+ 		strcat(options,ipaddr);
+-	} 
++	}
++
+ 	if(user_name) {
+-		strncat(options,"\001user=",6);
++		/* check for syntax like user=domain\user */
++		if(got_domain == 0)
++			domain_name = check_for_domain(&user_name);
++		strncat(options,",user=",6);
+ 		strcat(options,user_name);
+-	} 
++	}
++	if(retry == 0) {
++		if(domain_name) { 
++			/* extra length accounted for in option string above */
++			strncat(options,",domain=",8);
++			strcat(options,domain_name);
++		}
++	}
+ 	if(mountpassword) {
+-		strncat(options,"\001pass=",6);
++		/* Commas have to be doubled, or else they will
++		look like the parameter separator */
++/*		if(sep is not set)*/
++		if(retry == 0)
++			check_for_comma(&mountpassword);
++		strncat(options,",pass=",6);
+ 		strcat(options,mountpassword);
+ 	}
+-	strncat(options,"\001ver=",5);
++
++	strncat(options,",ver=",5);
+ 	strcat(options,MOUNT_CIFS_VERSION_MAJOR);
+ 
+ 	if(orgoptions) {
+-		strcat(options,"\001");
++		strcat(options,",");
+ 		strcat(options,orgoptions);
+ 	}
+ 	if(verboseflag)
+ 		printf("\nmount.cifs kernel mount options %s \n",options);
+ 	if(mount(share_name, mountpoint, "cifs", flags, options)) {
+ 	/* remember to kill daemon on error */
++		char * tmp;
++
+ 		switch (errno) {
+ 		case 0:
+ 			printf("mount failed but no error number set\n");
+@@ -899,7 +1088,21 @@
+ 		case ENODEV:
+ 			printf("mount error: cifs filesystem not supported by the system\n");
+ 			break;
++		case ENXIO:
++			if(retry == 0) {
++				retry = 1;
++				tmp = share_name;
++				while (*tmp && !(((unsigned char)tmp[0]) & 0x80)) {
++					*tmp = toupper((unsigned char)*tmp);
++		        		tmp++;
++				}
++				if(!*tmp) {
++					printf("retrying with upper case share name\n");
++					goto mount_retry;
++				}
++			}
+ 		default:
++			
+ 			printf("mount error %d = %s\n",errno,strerror(errno));
+ 		}
+ 		printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
+@@ -952,7 +1155,8 @@
+ 		}
+ 	}
+ 	if(mountpassword) {
+-		memset(mountpassword,0,64);
++		int len = strlen(mountpassword);
++		memset(mountpassword,0,len);
+ 		free(mountpassword);
+ 	}
+ 

Modified: tinysofa/releases/classic/2.0/samba/current/specs/samba.spec
===================================================================
--- tinysofa/releases/classic/2.0/samba/current/specs/samba.spec	2005-06-29 11:41:24 UTC (rev 6467)
+++ tinysofa/releases/classic/2.0/samba/current/specs/samba.spec	2005-06-29 12:09:29 UTC (rev 6468)
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.11
-Release: 1jh
+Release: 3jh
 Epoch: 0
 License: GNU GPL Version 2
 Group: extra
@@ -41,6 +41,7 @@
 Patch17: samba-3.0.11-establish_trust.patch
 Patch18: samba-3.0.11-user_rights_v1.patch
 Patch19: samba-3.0.11-winbind_find_dc_v2.patch
+Patch20: samba-3.0.11-mount.cifs.patch
 
 Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version} 
 Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 
@@ -135,6 +136,7 @@
 %patch17 -p0 -b .establish_trust
 %patch18 -p0 -b .user_rights_v1
 %patch19 -p1 -b .winbind_find_dc_v2
+%patch20 -p1 -b .mount.cifs
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -466,6 +468,9 @@
 
 
 %changelog
+* Wed Jun 29 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.0.11-3jh
+- update mount.cifs (samba-3.0.11-mount.cifs.patch)
+
 * Thu Mar  3 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.0.11-1jh
 - 3.0.11
 - move pam_smbpass.so and /var/log samba to -common



From svn at tinysofa.org  Wed Jun 29 18:05:46 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 29 Jun 2005 14:05:46 -0400 (EDT)
Subject: [tinysofa-svn] r6469 - in contrib/classic/2.0: . perl-time-hires
	perl-time-hires/current perl-time-hires/current/sources
	perl-time-hires/current/specs
Message-ID: <20050629180546.7FD893452FD@minbar.tinysofa.org>

Author: gda
Date: 2005-06-29 14:04:53 -0400 (Wed, 29 Jun 2005)
New Revision: 6469

Added:
   contrib/classic/2.0/perl-time-hires/
   contrib/classic/2.0/perl-time-hires/current/
   contrib/classic/2.0/perl-time-hires/current/sources/
   contrib/classic/2.0/perl-time-hires/current/sources/Time-HiRes-1.71.tar.gz
   contrib/classic/2.0/perl-time-hires/current/specs/
   contrib/classic/2.0/perl-time-hires/current/specs/perl-time-hires.spec
   contrib/classic/2.0/perl-time-hires/pristine/
   contrib/classic/2.0/perl-time-hires/releases/
Log:
new in contrib

Added: contrib/classic/2.0/perl-time-hires/current/sources/Time-HiRes-1.71.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/perl-time-hires/current/sources/Time-HiRes-1.71.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/perl-time-hires/current/specs/perl-time-hires.spec
===================================================================
--- contrib/classic/2.0/perl-time-hires/current/specs/perl-time-hires.spec	2005-06-29 12:09:29 UTC (rev 6468)
+++ contrib/classic/2.0/perl-time-hires/current/specs/perl-time-hires.spec	2005-06-29 18:04:53 UTC (rev 6469)
@@ -0,0 +1,50 @@
+%define perlname Time-HiRes
+
+Summary:The Perl module Time-HiRes.
+Name: perl-time-hires
+Version: 1.71
+Release: 1gd
+License: Artistic, GPL
+Group: contrib
+Source: %{perlname}-%{version}.tar.gz
+URL: http://www.cpan.org/
+Requires: perl = %{perl_version}
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+
+%description
+The Perl module Time-HiRes.
+
+%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 README
+
+%changelog
+* Wed Jun 29 2005 Gerald Dachs <gda at tinysofa dot org> 1.71-1gd
+- new in tinysofa contrib



From svn at tinysofa.org  Wed Jun 29 21:11:46 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 29 Jun 2005 17:11:46 -0400 (EDT)
Subject: [tinysofa-svn] r6470 - in contrib/classic/2.0: . libsdl
	libsdl/current libsdl/current/sources libsdl/current/specs
Message-ID: <20050629211146.8145A3452EC@minbar.tinysofa.org>

Author: gda
Date: 2005-06-29 17:10:42 -0400 (Wed, 29 Jun 2005)
New Revision: 6470

Added:
   contrib/classic/2.0/libsdl/
   contrib/classic/2.0/libsdl/current/
   contrib/classic/2.0/libsdl/current/sources/
   contrib/classic/2.0/libsdl/current/sources/SDL-1.2.8.tar.gz
   contrib/classic/2.0/libsdl/current/specs/
   contrib/classic/2.0/libsdl/current/specs/libsdl.spec
   contrib/classic/2.0/libsdl/pristine/
   contrib/classic/2.0/libsdl/releases/
Log:
new in contrib

Added: contrib/classic/2.0/libsdl/current/sources/SDL-1.2.8.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/libsdl/current/sources/SDL-1.2.8.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/libsdl/current/specs/libsdl.spec
===================================================================
--- contrib/classic/2.0/libsdl/current/specs/libsdl.spec	2005-06-29 18:04:53 UTC (rev 6469)
+++ contrib/classic/2.0/libsdl/current/specs/libsdl.spec	2005-06-29 21:10:42 UTC (rev 6470)
@@ -0,0 +1,93 @@
+%define realname SDL
+
+Summary: Simple DirectMedia Layer
+Name: libsdl
+Version: 1.2.8
+Release: 1gd
+Source0: %{realname}-%{version}.tar.gz
+URL: http://www.libsdl.org/
+Copyright: LGPL
+Group: contrib
+BuildRoot: /var/tmp/%{name}-buildroot
+BuildRequires: gcc-c++ xorg-x11-devel
+Requires: xorg-x11-libs
+Provides: libSDL-1.1.so.0
+
+%description
+This is the Simple DirectMedia Layer, a generic API that provides low
+level access to audio, keyboard, mouse, and display framebuffer across
+multiple platforms.
+
+%package devel
+Summary: Libraries, includes and more to develop SDL applications.
+Group: contrib
+Requires: %{name}
+
+%description devel
+This is the Simple DirectMedia Layer, a generic API that provides low
+level access to audio, keyboard, mouse, and display framebuffer across
+multiple platforms.
+
+This is the libraries, include files and other resources you can use
+to develop SDL applications.
+
+
+%prep
+
+%setup -q -n %{realname}-%{version}
+
+%build
+%configure --disable-video-svga --disable-video-ggi --disable-video-aalib --disable-debug --enable-dlopen --enable-esd-shared --enable-arts-shared
+%make
+
+%install
+%makeinstall
+ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT/%{_libdir}/libSDL-1.1.so.0
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%doc README-SDL.txt COPYING CREDITS BUGS
+%{_libdir}/lib*.so.*
+
+%files devel
+%defattr(-,root,root)
+%doc README README-SDL.txt COPYING CREDITS BUGS WhatsNew docs.html
+%doc docs/index.html docs/html
+%{_bindir}/*-config
+%{_libdir}/lib*.a
+%{_libdir}/lib*.la
+%{_libdir}/lib*.so
+%{_includedir}/SDL/
+%{_mandir}/man3/*
+%{_datadir}/aclocal/*
+
+%changelog
+* Wed Jun 29 2005 Gerald Dachs <gda at tinysofa dot org> 1.2.8-1gd
+- new in tinysofa contrib
+
+* Wed Jan 19 2000 Sam Lantinga <slouken at libsdl.org>
+- Re-integrated spec file into SDL distribution
+- 'name' and 'version' come from configure 
+- Some of the documentation is devel specific
+- Removed SMP support from %build - it doesn't work with libtool anyway
+
+* Tue Jan 18 2000 Hakan Tandogan <hakan at iconsult.com>
+- Hacked Mandrake sdl spec to build 1.1
+
+* Sun Dec 19 1999 John Buswell <johnb at mandrakesoft.com>
+- Build Release
+
+* Sat Dec 18 1999 John Buswell <johnb at mandrakesoft.com>
+- Add symlink for libSDL-1.0.so.0 required by sdlbomber
+- Added docs
+
+* Thu Dec 09 1999 Lenny Cartier <lenny at mandrakesoft.com>
+- v 1.0.0
+
+* Mon Nov  1 1999 Chmouel Boudjnah <chmouel at mandrakesoft.com>
+- First spec file for Mandrake distribution.
+
+# end of file



From svn at tinysofa.org  Thu Jun 30 21:44:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 30 Jun 2005 17:44:36 -0400 (EDT)
Subject: [tinysofa-svn] r6472 - in contrib/classic/2.0/clamav/current:
	sources specs
Message-ID: <20050630214436.B20E53452DA@minbar.tinysofa.org>

Author: gda
Date: 2005-06-30 17:42:58 -0400 (Thu, 30 Jun 2005)
New Revision: 6472

Added:
   contrib/classic/2.0/clamav/current/sources/clamav-0.86.1.tar.gz
Removed:
   contrib/classic/2.0/clamav/current/sources/clamav-0.86.tar.gz
Modified:
   contrib/classic/2.0/clamav/current/specs/clamav.spec
Log:
0.86.1

Added: contrib/classic/2.0/clamav/current/sources/clamav-0.86.1.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/clamav/current/sources/clamav-0.86.1.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: contrib/classic/2.0/clamav/current/sources/clamav-0.86.tar.gz
===================================================================
(Binary files differ)

Modified: contrib/classic/2.0/clamav/current/specs/clamav.spec
===================================================================
--- contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-06-30 14:04:41 UTC (rev 6471)
+++ contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-06-30 21:42:58 UTC (rev 6472)
@@ -1,6 +1,6 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
-Version: 0.86
+Version: 0.86.1
 Release: 1gd
 License: GPL
 Group: contrib
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Thu Jun 30 2005 Gerald Dachs <gda at tinysofa dot org> 0.86.1-1gd
+- 0.86.1
+
 * Tue Jun 21 2005 Gerald Dachs <gda at tinysofa dot org> 0.86-1gd
 - 0.86
 



From svn at tinysofa.org  Thu Jun 30 22:01:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 30 Jun 2005 18:01:59 -0400 (EDT)
Subject: [tinysofa-svn] r6473 - contrib/classic/2.0
Message-ID: <20050630220159.9FD1F345219@minbar.tinysofa.org>

Author: gda
Date: 2005-06-30 18:01:55 -0400 (Thu, 30 Jun 2005)
New Revision: 6473

Removed:
   contrib/classic/2.0/perl-time-hires/
Log:
not need



From svn at tinysofa.org  Thu Jun 30 22:07:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 30 Jun 2005 18:07:40 -0400 (EDT)
Subject: [tinysofa-svn] r6474 - in contrib/classic/2.0/amavisd-new/current:
	sources specs
Message-ID: <20050630220740.B8C3E3452B3@minbar.tinysofa.org>

Author: gda
Date: 2005-06-30 18:07:13 -0400 (Thu, 30 Jun 2005)
New Revision: 6474

Added:
   contrib/classic/2.0/amavisd-new/current/sources/amavisd-new-2.3.2.tar.gz
Removed:
   contrib/classic/2.0/amavisd-new/current/sources/amavisd-new-2.3.1.tar.gz
Modified:
   contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec
Log:
2.3.2

Deleted: contrib/classic/2.0/amavisd-new/current/sources/amavisd-new-2.3.1.tar.gz
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/amavisd-new/current/sources/amavisd-new-2.3.2.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/amavisd-new/current/sources/amavisd-new-2.3.2.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec
===================================================================
--- contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec	2005-06-30 22:01:55 UTC (rev 6473)
+++ contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec	2005-06-30 22:07:13 UTC (rev 6474)
@@ -1,6 +1,6 @@
 Name:      amavisd-new
-Version:   2.3.1
-Release:   2gd
+Version:   2.3.2
+Release:   1gd
 Summary:   AMaViSd-new - A Mail Virus Scanner
 URL:       http://www.ijs.si/software/amavisd/
 License:   GPL
@@ -17,7 +17,7 @@
 Requires: file
 Requires: perl
 Requires: perl-archive-tar
-Requires: perl-archive-zip >= 1.0
+Requires: perl-archive-zip >= 1.14
 Requires: perl-compress-zlib
 Requires: perl-convert-tnef >= 0.06
 Requires: perl-convert-uulib >= 1.05
@@ -123,6 +123,9 @@
 %perl_vendorlib/JpegTester.pm
 
 %changelog
+* Thu Jun 30 2005 Gerald Dachs <gda at tinysofa dot org> 2.3.2-1gd
+- 2.3.2
+
 * Fri May 13 2005 Gerald Dachs <gda at tinysofa dot org> 2.3.1-2gd
 - fixed path to clamd socket