From svn at tinysofa.org Sun Jan 2 23:26:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 2 Jan 2005 18:26:33 -0500 (EST) Subject: [tinysofa-svn] r5280 - in contrib/1.1/distcc/current: sources specs Message-ID: <20050102232633.625D4344122@minbar.tinysofa.org> Author: gda Date: 2005-01-02 18:25:57 -0500 (Sun, 02 Jan 2005) New Revision: 5280 Added: contrib/1.1/distcc/current/sources/distcc-2.18.3.tar.bz2 contrib/1.1/distcc/current/sources/distcc.hosts Removed: contrib/1.1/distcc/current/sources/distcc-2.17.tar.bz2 Modified: contrib/1.1/distcc/current/specs/distcc.spec Log: new upstream and gui Deleted: contrib/1.1/distcc/current/sources/distcc-2.17.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.1/distcc/current/sources/distcc-2.18.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/distcc/current/sources/distcc-2.18.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.1/distcc/current/sources/distcc.hosts =================================================================== --- contrib/1.1/distcc/current/sources/distcc.hosts 2004-12-31 10:58:51 UTC (rev 5279) +++ contrib/1.1/distcc/current/sources/distcc.hosts 2005-01-02 23:25:57 UTC (rev 5280) @@ -0,0 +1 @@ +localhost Modified: contrib/1.1/distcc/current/specs/distcc.spec =================================================================== --- contrib/1.1/distcc/current/specs/distcc.spec 2004-12-31 10:58:51 UTC (rev 5279) +++ contrib/1.1/distcc/current/specs/distcc.spec 2005-01-02 23:25:57 UTC (rev 5280) @@ -1,6 +1,8 @@ +%define icewm_menu 1 + Summary: A free distributed C/C++ compiler system Name: distcc -Version: 2.17 +Version: 2.18.3 Release: 1gd Group: contrib License: GPL @@ -9,8 +11,10 @@ Source2: distccd.sysconf Source3: distccd.logrot Source4: distccd.xinetd +Source5: distcc.hosts BuildRoot: %{_tmppath}/%{name}-%{release}-root PreReq: shadow-utils +BuildRequires: gtk-devel %description distcc is a program to distribute compilation of C or C++ code across @@ -18,12 +22,21 @@ results as a local compile, is simple to install and use, and is often two or more times faster than a local compile. +%package gtk +Summary: distcc gtk monitor +Group: contrib +Requires: %{name} = %{version} +Requires: gtk + +%description gtk +distcc gtk monitor + %prep %setup -q %build -%configure -make +%configure --enable-rfc2553 --with-gtk +%make %install %makeinstall @@ -49,11 +62,29 @@ install -d ${RPM_BUILD_ROOT}%{_localstatedir}/log/distccd +rm ${RPM_BUILD_ROOT}/usr/share/distcc/distccmon-gnome.desktop + +install -d ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ +cp ${RPM_BUILD_ROOT}/usr/share/distcc/distccmon-gnome-icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps + +install -d ${RPM_BUILD_ROOT}%{_localstatedir}/lib/distcc + +install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/distcc +install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/distcc/hosts + +%if %{icewm_menu} +mkdir -p %{buildroot}%{_datadir}/icewm/programs +cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name} +prog "distcc monitor" distccmon-gnome-icon.png distccmon-gnome +__EOF__ +%endif + + %clean %clean_buildroot %pre -/usr/sbin/useradd -c "distcc" -u 113 -s /sbin/nologin -r -d /no/dir distcc 2>/dev/null || : +/usr/sbin/useradd -c "distcc" -u 113 -s /sbin/nologin -r -d %{_localstatedir}/lib/distcc distcc 2>/dev/null || : %post %service_post distccd @@ -70,17 +101,33 @@ %files %defattr(-,root,root) %{_mandir}/man?/* -%{_bindir}/* +%{_bindir}/distcc +%{_bindir}/distccd +%{_bindir}/distccmon-text %{_libdir}/distcc %{_initrddir}/distccd -%{_sysconfdir}/sysconfig/distccd +%config %{_sysconfdir}/sysconfig/distccd %{_sysconfdir}/logrotate.d/distccd %{_sysconfdir}/xinetd.d/distccd +%dir %{_sysconfdir}/distcc +%config %{_sysconfdir}/distcc/hosts %{_docdir}/distcc/* +%{_localstatedir}/lib/distcc %attr(700,distcc,root) %{_localstatedir}/log/distccd +%files gtk +%defattr(-,root,root) +%{_bindir}/distccmon-gnome +%{_datadir}/distcc/distccmon-gnome-icon.png +%{_datadir}/pixmaps/distccmon-gnome-icon.png +%if %{icewm_menu} +%{_datadir}/icewm/programs/%{name} +%endif %changelog +* Sun Dec 2 2005 Gerald Dachs 2.18.3-1gd +- new upstream + * Mon Sep 13 2004 tsintegrate 2.17-1gd - current (2.17-1gd) integrated as 2.17-1gd From svn at tinysofa.org Mon Jan 3 08:39:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 3 Jan 2005 03:39:06 -0500 (EST) Subject: [tinysofa-svn] r5281 - contrib/1.1/amavisd-new/current/specs Message-ID: <20050103083906.242E3344122@minbar.tinysofa.org> Author: jh Date: 2005-01-03 03:38:59 -0500 (Mon, 03 Jan 2005) New Revision: 5281 Modified: contrib/1.1/amavisd-new/current/specs/amavisd-new.spec Log: - fix newaliases location Modified: contrib/1.1/amavisd-new/current/specs/amavisd-new.spec =================================================================== --- contrib/1.1/amavisd-new/current/specs/amavisd-new.spec 2005-01-02 23:25:57 UTC (rev 5280) +++ contrib/1.1/amavisd-new/current/specs/amavisd-new.spec 2005-01-03 08:38:59 UTC (rev 5281) @@ -89,8 +89,8 @@ if [ -f /etc/postfix/aliases ]; then if [ -z "`grep "^virusalert:" /etc/postfix/aliases`" ]; then echo "virusalert: root" >> /etc/postfix/aliases - if [ -x /usr/bin/newaliases ] ; then - /usr/bin/newaliases > /dev/null 2>&1 + if [ -x /usr/sbin/newaliases ] ; then + /usr/sbin/newaliases > /dev/null 2>&1 else echo "Can't exec newaliases. Please run it manually" fi From svn at tinysofa.org Mon Jan 3 09:05:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 3 Jan 2005 04:05:59 -0500 (EST) Subject: [tinysofa-svn] r5282 - contrib/1.1/amavisd-new/current/sources Message-ID: <20050103090559.EF69F344172@minbar.tinysofa.org> Author: jh Date: 2005-01-03 04:05:48 -0500 (Mon, 03 Jan 2005) New Revision: 5282 Modified: contrib/1.1/amavisd-new/current/sources/amavisd.conf Log: - rationalize some defaults Modified: contrib/1.1/amavisd-new/current/sources/amavisd.conf =================================================================== --- contrib/1.1/amavisd-new/current/sources/amavisd.conf 2005-01-03 08:38:59 UTC (rev 5281) +++ contrib/1.1/amavisd-new/current/sources/amavisd.conf 2005-01-03 09:05:48 UTC (rev 5282) @@ -57,7 +57,7 @@ # $MYHOME serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. # $MYHOME is not used directly by the program. No trailing slash! -#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis') +#$MYHOME = '/var/lib/amavis'; # (default is '/var/spool/amavis') # $mydomain serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. @@ -536,7 +536,7 @@ # or a directory (no trailing slash) # (the default value is undef, meaning no quarantine) # -$QUARANTINEDIR = '/var/virusmails'; +$QUARANTINEDIR = '$MYHOME/virusmails'; #$virus_quarantine_method = 'local:virus-%i-%n'; # default #$spam_quarantine_method = 'local:spam-%b-%i-%n'; # default From svn at tinysofa.org Mon Jan 3 10:48:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 3 Jan 2005 05:48:21 -0500 (EST) Subject: [tinysofa-svn] r5283 - in tinysofa/releases/1.1: dhcp/current/sources ntp/current/sources Message-ID: <20050103104821.EFE03344107@minbar.tinysofa.org> Author: jh Date: 2005-01-03 05:48:08 -0500 (Mon, 03 Jan 2005) New Revision: 5283 Modified: tinysofa/releases/1.1/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch tinysofa/releases/1.1/ntp/current/sources/ntp.conf Log: - remove invalid authenticate keyword Modified: tinysofa/releases/1.1/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch =================================================================== --- tinysofa/releases/1.1/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch 2005-01-03 09:05:48 UTC (rev 5282) +++ tinysofa/releases/1.1/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch 2005-01-03 10:48:08 UTC (rev 5283) @@ -110,7 +110,7 @@ +restrict 127.0.0.1 +driftfile /var/lib/ntp/drift +broadcastdelay 0.008 -+authenticate yes ++#authenticate yes +keys /etc/ntp/keys +EOF + #save_previous /etc/ntp/step-tickers Modified: tinysofa/releases/1.1/ntp/current/sources/ntp.conf =================================================================== --- tinysofa/releases/1.1/ntp/current/sources/ntp.conf 2005-01-03 09:05:48 UTC (rev 5282) +++ tinysofa/releases/1.1/ntp/current/sources/ntp.conf 2005-01-03 10:48:08 UTC (rev 5283) @@ -58,13 +58,6 @@ broadcastdelay 0.008 # -# Authentication delay. If you use, or plan to use someday, the -# authentication facility you should make the programs in the auth_stuff -# directory and figure out what this number should be on your machine. -# -authenticate yes - -# # Keys file. If you want to diddle your server at run time, make a # keys file (mode 600 for sure) and define the key number to be # used for making requests. From svn at tinysofa.org Mon Jan 3 10:54:36 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 3 Jan 2005 05:54:36 -0500 (EST) Subject: [tinysofa-svn] r5284 - tinysofa/releases/1.1/ntp/current/sources Message-ID: <20050103105436.798D2344107@minbar.tinysofa.org> Author: jh Date: 2005-01-03 05:54:29 -0500 (Mon, 03 Jan 2005) New Revision: 5284 Modified: tinysofa/releases/1.1/ntp/current/sources/ntp.conf Log: - add more sane default config Modified: tinysofa/releases/1.1/ntp/current/sources/ntp.conf =================================================================== --- tinysofa/releases/1.1/ntp/current/sources/ntp.conf 2005-01-03 10:48:08 UTC (rev 5283) +++ tinysofa/releases/1.1/ntp/current/sources/ntp.conf 2005-01-03 10:54:29 UTC (rev 5284) @@ -1,6 +1,8 @@ -# Prohibit general access to this service. -restrict default ignore +# Permit time synchronization with our time source, but do not +# permit the source to query or modify the service on this system. +restrict default nomodify notrap noquery + # Permit all access over the loopback interface. This could # be tightened as well, but to do so would effect some of # the administrative functions. @@ -12,23 +14,19 @@ # time service. Do not permit those systems to modify the # configuration of this service. Also, do not use those # systems as peers for synchronization. -# restrict 192.168.1.0 mask 255.255.255.0 notrust nomodify notrap +# restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap # --- OUR TIMESERVERS ----- -# or remove the default restrict line -# Permit time synchronization with our time source, but do not -# permit the source to query or modify the service on this system. +server 0.pool.ntp.org +server 1.pool.ntp.org +server 2.pool.ntp.org -# restrict mytrustedtimeserverip mask 255.255.255.255 nomodify notrap noquery -# server mytrustedtimeserverip - - # --- NTP MULTICASTCLIENT --- #multicastclient # listen on default 224.0.1.1 -# restrict 224.0.1.1 mask 255.255.255.255 notrust nomodify notrap -# restrict 192.168.1.0 mask 255.255.255.0 notrust nomodify notrap +# restrict 224.0.1.1 mask 255.255.255.255 nomodify notrap +# restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap From svn at tinysofa.org Mon Jan 3 16:25:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 3 Jan 2005 11:25:03 -0500 (EST) Subject: [tinysofa-svn] r5285 - in tinysofa/releases/1.1/perl/current: sources specs Message-ID: <20050103162503.93BFE344107@minbar.tinysofa.org> Author: jh Date: 2005-01-03 11:24:32 -0500 (Mon, 03 Jan 2005) New Revision: 5285 Added: tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2004-0452.patch tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2004-0976.patch Removed: tinysofa/releases/1.1/perl/current/sources/postgresql-plperl.patch Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec Log: - add fixes for CAN-2004-0452 and CAN-2004-0976 Added: tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2004-0452.patch =================================================================== --- tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2004-0452.patch 2005-01-03 10:54:29 UTC (rev 5284) +++ tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2004-0452.patch 2005-01-03 16:24:32 UTC (rev 5285) @@ -0,0 +1,251 @@ +diff -ur perl-5.8.5.orig/ext/DB_File/DB_File.pm perl-5.8.5/ext/DB_File/DB_File.pm +--- perl-5.8.5.orig/ext/DB_File/DB_File.pm 2004-06-23 14:46:20.000000000 +0000 ++++ perl-5.8.5/ext/DB_File/DB_File.pm 2004-11-04 15:18:37.000000000 +0000 +@@ -1825,7 +1825,7 @@ + my $filename = "filt" ; + unlink $filename ; + +- my $db = tie %hash, 'DB_File', $filename, O_CREAT|O_RDWR, 0666, $DB_HASH ++ my $db = tie %hash, 'DB_File', $filename, O_CREAT|O_RDWR, 0644, $DB_HASH + or die "Cannot open $filename: $!\n" ; + + # Install DBM Filters +diff -ur perl-5.8.5.orig/ext/Devel/PPPort/PPPort.pm perl-5.8.5/ext/Devel/PPPort/PPPort.pm +--- perl-5.8.5.orig/ext/Devel/PPPort/PPPort.pm 2003-12-15 07:56:37.000000000 +0000 ++++ perl-5.8.5/ext/Devel/PPPort/PPPort.pm 2004-11-04 15:21:05.000000000 +0000 +@@ -349,13 +349,13 @@ + } + + if ($changes) { +- open(OUT,">/tmp/ppport.h.$$"); ++ open(OUT,"ppport.h.$$"); + print OUT $c; + close(OUT); +- open(DIFF, "diff -u $filename /tmp/ppport.h.$$|"); +- while () { s!/tmp/ppport\.h\.$$!$filename.patched!; print STDOUT; } ++ open(DIFF, "diff -u $filename ppport.h.$$|"); ++ while () { s!ppport\.h\.$$!$filename.patched!; print STDOUT; } + close(DIFF); +- unlink("/tmp/ppport.h.$$"); ++ unlink("ppport.h.$$"); + } else { + print "Looks OK\n"; + } +diff -ur perl-5.8.5.orig/ext/ODBM_File/ODBM_File.xs perl-5.8.5/ext/ODBM_File/ODBM_File.xs +--- perl-5.8.5.orig/ext/ODBM_File/ODBM_File.xs 2004-02-01 14:01:20.000000000 +0000 ++++ perl-5.8.5/ext/ODBM_File/ODBM_File.xs 2004-11-04 15:22:36.000000000 +0000 +@@ -32,7 +32,7 @@ + * Set DBM_BUG_DUPLICATE_FREE in the extension hint file. + */ + /* Close the previous dbm, and fail to open a new dbm */ +-#define dbmclose() ((void) dbminit("/non/exist/ent")) ++#define dbmclose() ((void) dbminit("/nonexistent")) + #endif + + #include +diff -ur perl-5.8.5.orig/lib/CGI/Cookie.pm perl-5.8.5/lib/CGI/Cookie.pm +--- perl-5.8.5.orig/lib/CGI/Cookie.pm 2004-03-09 15:13:48.000000000 +0000 ++++ perl-5.8.5/lib/CGI/Cookie.pm 2004-11-04 15:27:13.000000000 +0000 +@@ -407,7 +407,7 @@ + You may also retrieve cookies that were stored in some external + form using the parse() class method: + +- $COOKIES = `cat /usr/tmp/Cookie_stash`; ++ $COOKIES = `cat /var/run/www/Cookie_stash`; + %cookies = parse CGI::Cookie($COOKIES); + + If you are in a mod_perl environment, you can save some overhead by +diff -ur perl-5.8.5.orig/lib/CPAN.pm perl-5.8.5/lib/CPAN.pm +--- perl-5.8.5.orig/lib/CPAN.pm 2003-09-22 05:42:59.000000000 +0000 ++++ perl-5.8.5/lib/CPAN.pm 2004-11-04 15:29:04.000000000 +0000 +@@ -2273,7 +2273,7 @@ + # If more accuracy is wanted/needed, Chris Leach sent me this patch... + + # > *** /install/perl/live/lib/CPAN.pm- Wed Sep 24 13:08:48 1997 +- # > --- /tmp/cp Wed Sep 24 13:26:40 1997 ++ # > --- cp Wed Sep 24 13:26:40 1997 + # > *************** + # > *** 1562,1567 **** + # > --- 1562,1580 ---- +diff -ur perl-5.8.5.orig/lib/ExtUtils/MakeMaker.pm perl-5.8.5/lib/ExtUtils/MakeMaker.pm +--- perl-5.8.5.orig/lib/ExtUtils/MakeMaker.pm 2004-01-05 22:34:59.000000000 +0000 ++++ perl-5.8.5/lib/ExtUtils/MakeMaker.pm 2004-11-04 15:30:40.000000000 +0000 +@@ -1013,7 +1013,7 @@ + The Makefile to be produced may be altered by adding arguments of the + form C. E.g. + +- perl Makefile.PL PREFIX=/tmp/myperl5 ++ perl Makefile.PL PREFIX=~/myperl5 + + Other interesting targets in the generated Makefile are + +@@ -1355,13 +1355,13 @@ + + This is the root directory into which the code will be installed. It + I. For example, if your code +-would normally go into /usr/local/lib/perl you could set DESTDIR=/tmp/ +-and installation would go into /tmp/usr/local/lib/perl. ++would normally go into /usr/local/lib/perl you could set DESTDIR=/other/ ++and installation would go into /other/usr/local/lib/perl. + + This is primarily of use for people who repackage Perl modules. + + NOTE: Due to the nature of make, it is important that you put the trailing +-slash on your DESTDIR. "/tmp/" not "/tmp". ++slash on your DESTDIR. "/other/" not "/other". + + =item DIR + +diff -ur perl-5.8.5.orig/lib/ExtUtils/instmodsh perl-5.8.5/lib/ExtUtils/instmodsh +--- perl-5.8.5.orig/lib/ExtUtils/instmodsh 2004-01-05 22:34:59.000000000 +0000 ++++ perl-5.8.5/lib/ExtUtils/instmodsh 2004-11-04 15:32:15.000000000 +0000 +@@ -58,16 +58,12 @@ + $reply =~ /^t\s*/ and do + { + my $file = (split(' ', $reply))[1]; +- my $tmp = "/tmp/inst.$$"; +- if (my $fh = IO::File->new($tmp, "w")) +- { +- $fh->print(join("\n", $Inst->files($module))); +- $fh->close(); +- system("tar cvf $file -I $tmp"); +- unlink($tmp); +- last CASE; +- } +- else { print("Can't open $file: $!\n"); } ++ my ($fh, $tmp) = File::Temp::tempfile(UNLINK => 1); ++ $fh->print(join("\n", $Inst->files($module))); ++ $fh->close(); ++ # This used to use -I which is wrong for GNU tar. ++ system("tar cvf $file -T $tmp"); ++ unlink($tmp); + last CASE; + }; + $reply eq 'v' and do +diff -ur perl-5.8.5.orig/lib/Memoize/t/tie.t perl-5.8.5/lib/Memoize/t/tie.t +--- perl-5.8.5.orig/lib/Memoize/t/tie.t 2002-07-12 19:56:19.000000000 +0000 ++++ perl-5.8.5/lib/Memoize/t/tie.t 2004-11-04 15:33:17.000000000 +0000 +@@ -29,14 +29,7 @@ + $_[0]+1; + } + +-if (eval {require File::Spec::Functions}) { +- File::Spec::Functions->import('tmpdir', 'catfile'); +- $tmpdir = tmpdir(); +-} else { +- *catfile = sub { join '/', @_ }; +- $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; +-} +-$file = catfile($tmpdir, "md$$"); ++$file = "md$$"; + @files = ($file, "$file.db", "$file.dir", "$file.pag"); + 1 while unlink @files; + +diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_gdbm.t perl-5.8.5/lib/Memoize/t/tie_gdbm.t +--- perl-5.8.5.orig/lib/Memoize/t/tie_gdbm.t 2002-07-12 19:56:19.000000000 +0000 ++++ perl-5.8.5/lib/Memoize/t/tie_gdbm.t 2004-11-04 15:33:53.000000000 +0000 +@@ -26,13 +26,7 @@ + + print "1..4\n"; + +-if (eval {require File::Spec::Functions}) { +- File::Spec::Functions->import(); +-} else { +- *catfile = sub { join '/', @_ }; +-} +-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; +-$file = catfile($tmpdir, "md$$"); ++$file = "md$$"; + 1 while unlink $file, "$file.dir", "$file.pag"; + tryout('GDBM_File', $file, 1); # Test 1..4 + 1 while unlink $file, "$file.dir", "$file.pag"; +diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_ndbm.t perl-5.8.5/lib/Memoize/t/tie_ndbm.t +--- perl-5.8.5.orig/lib/Memoize/t/tie_ndbm.t 2002-07-12 19:56:19.000000000 +0000 ++++ perl-5.8.5/lib/Memoize/t/tie_ndbm.t 2004-11-04 15:34:21.000000000 +0000 +@@ -29,13 +29,7 @@ + print "1..4\n"; + + +-if (eval {require File::Spec::Functions}) { +- File::Spec::Functions->import(); +-} else { +- *catfile = sub { join '/', @_ }; +-} +-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; +-$file = catfile($tmpdir, "md$$"); ++$file = "md$$"; + 1 while unlink $file, "$file.dir", "$file.pag"; + tryout('Memoize::NDBM_File', $file, 1); # Test 1..4 + 1 while unlink $file, "$file.dir", "$file.pag"; +diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_sdbm.t perl-5.8.5/lib/Memoize/t/tie_sdbm.t +--- perl-5.8.5.orig/lib/Memoize/t/tie_sdbm.t 2002-07-12 19:56:19.000000000 +0000 ++++ perl-5.8.5/lib/Memoize/t/tie_sdbm.t 2004-11-04 15:35:15.000000000 +0000 +@@ -28,14 +28,7 @@ + + print "1..4\n"; + +-if (eval {require File::Spec::Functions}) { +- File::Spec::Functions->import('tmpdir', 'catfile'); +- $tmpdir = tmpdir(); +-} else { +- *catfile = sub { join '/', @_ }; +- $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; +-} +-$file = catfile($tmpdir, "md$$"); ++$file = "md$$"; + 1 while unlink $file, "$file.dir", "$file.pag"; + tryout('Memoize::SDBM_File', $file, 1); # Test 1..4 + 1 while unlink $file, "$file.dir", "$file.pag"; +diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_storable.t perl-5.8.5/lib/Memoize/t/tie_storable.t +--- perl-5.8.5.orig/lib/Memoize/t/tie_storable.t 2002-07-12 19:56:19.000000000 +0000 ++++ perl-5.8.5/lib/Memoize/t/tie_storable.t 2004-11-04 15:35:39.000000000 +0000 +@@ -34,13 +34,7 @@ + print "1..4\n"; + + +-if (eval {require File::Spec::Functions}) { +- File::Spec::Functions->import(); +-} else { +- *catfile = sub { join '/', @_ }; +-} +-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; +-$file = catfile($tmpdir, "storable$$"); ++$file = "storable$$"; + 1 while unlink $file; + tryout('Memoize::Storable', $file, 1); # Test 1..4 + 1 while unlink $file; +diff -ur perl-5.8.5.orig/lib/Shell.pm perl-5.8.5/lib/Shell.pm +--- perl-5.8.5.orig/lib/Shell.pm 2004-06-23 13:08:56.000000000 +0000 ++++ perl-5.8.5/lib/Shell.pm 2004-11-04 15:36:16.000000000 +0000 +@@ -127,7 +127,7 @@ + use Shell qw(cat ps cp); + $passwd = cat('new; +diff -ur perl-5.8.5.orig/lib/perl5db.pl perl-5.8.5/lib/perl5db.pl +--- perl-5.8.5.orig/lib/perl5db.pl 2004-05-11 11:11:37.000000000 +0000 ++++ perl-5.8.5/lib/perl5db.pl 2004-11-04 15:38:29.000000000 +0000 +@@ -207,7 +207,7 @@ + =item * noTTY + + if set, goes in NonStop mode. On interrupt, if TTY is not set, +-uses the value of noTTY or "/tmp/perldbtty$$" to find TTY using ++uses the value of noTTY or "/var/run/perldbtty$$" to find TTY using + Term::Rendezvous. Current variant is to have the name of TTY in this + file. + +@@ -5810,8 +5810,8 @@ + eval "require Term::Rendezvous;" or die; + + # See if we have anything to pass to Term::Rendezvous. +- # Use /tmp/perldbtty$$ if not. +- my $rv = $ENV{PERLDB_NOTTY} || "/tmp/perldbtty$$"; ++ # Use /var/run/perldbtty$$ if not. ++ my $rv = $ENV{PERLDB_NOTTY} || "/var/run/perldbtty$$"; + + # Rendezvous and get the filehandles. + my $term_rv = new Term::Rendezvous $rv; Added: tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2004-0976.patch =================================================================== --- tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2004-0976.patch 2005-01-03 10:54:29 UTC (rev 5284) +++ tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2004-0976.patch 2005-01-03 16:24:32 UTC (rev 5285) @@ -0,0 +1,42 @@ +[Adapted from Chip Turner's 5.8.0 patch] +Fix for CAN-2004-0452. Change chmod's to make files writable/executable +by the current user only and not by the entire world. chmod's necessary +in the first place but at least this makes them less dangerous. If, for +some reason the rm process dies halfway through, at worst some files and +dirs were revoked from others, not made available. + +diff -Naur --exclude=debian perl-5.8.4.orig/lib/File/Path.pm perl-5.8.4/lib/File/Path.pm +--- perl-5.8.4.orig/lib/File/Path.pm 2003-08-14 16:00:52.000000000 +1000 ++++ perl-5.8.4/lib/File/Path.pm 2004-12-11 22:01:22.000000000 +1100 +@@ -192,11 +192,11 @@ + (undef, undef, my $rp) = lstat $root or next; + $rp &= 07777; # don't forget setuid, setgid, sticky bits + if ( -d _ ) { +- # notabene: 0777 is for making readable in the first place, ++ # notabene: 0700 is for making readable in the first place, + # it's also intended to change it to writable in case we have + # to recurse in which case we are better than rm -rf for + # subtrees with strange permissions +- chmod(0777, ($Is_VMS ? VMS::Filespec::fileify($root) : $root)) ++ chmod(0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root)) + or carp "Can't make directory $root read+writeable: $!" + unless $safe; + +@@ -230,7 +230,7 @@ + print "skipped $root\n" if $verbose; + next; + } +- chmod 0777, $root ++ chmod 0700, $root + or carp "Can't make directory $root writeable: $!" + if $force_writeable; + print "rmdir $root\n" if $verbose; +@@ -252,7 +252,7 @@ + print "skipped $root\n" if $verbose; + next; + } +- chmod 0666, $root ++ chmod 0600, $root + or carp "Can't make file $root writeable: $!" + if $force_writeable; + print "unlink $root\n" if $verbose; Deleted: tinysofa/releases/1.1/perl/current/sources/postgresql-plperl.patch =================================================================== --- tinysofa/releases/1.1/perl/current/sources/postgresql-plperl.patch 2005-01-03 10:54:29 UTC (rev 5284) +++ tinysofa/releases/1.1/perl/current/sources/postgresql-plperl.patch 2005-01-03 16:24:32 UTC (rev 5285) @@ -1,9 +0,0 @@ -Index: postgresql-7.3.4/src/pl/plperl/GNUmakefile -=================================================================== -RCS file: /projects/cvsroot/pgsql-server/src/pl/plperl/GNUmakefile,v -retrieving revision 1.10 -diff -r1.10 GNUmakefile -18c18 -< override CFLAGS := $(filter-out -Wall -Wmissing-declarations -Wmissing-prototypes, $(CFLAGS)) ---- -> override CFLAGS := $(filter-out -Wall -Wmissing-declarations -Wmissing-prototypes, $(CFLAGS), -Wl,-rpath,$(perl_archlibexp)/CORE) Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.1/perl/current/specs/perl.spec 2005-01-03 10:54:29 UTC (rev 5284) +++ tinysofa/releases/1.1/perl/current/specs/perl.spec 2005-01-03 16:24:32 UTC (rev 5285) @@ -4,7 +4,7 @@ Name: perl Version: 5.8.5 Epoch: 1 -Release: 3ts +Release: 4jh License: GPL Group: main Url: http://www.perl.com @@ -20,6 +20,8 @@ Patch4: perl-5.8.3-desthtml.patch # Configure doesn't listen well when we say no ndbm. Patch5: perl-5.8.5-nondbm.patch +Patch6: perl-5.8.5-CAN-2004-0452.patch +Patch7: perl-5.8.5-CAN-2004-0976.patch # arch-specific patches Patch100: perl-5.8.1-fpic.patch @@ -95,6 +97,8 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 %patch100 -p1 @@ -438,6 +442,9 @@ %changelog +* Mon Jan 3 2005 Jaakko Heinonen 5.8.5-4jh +- add fixes for CAN-2004-0452 and CAN-2004-0976 + * Sat Sep 04 2004 tsintegrate 5.8.5-3ts - current (5.8.5-3jh) integrated as 5.8.5-3ts for release 1.1-U1 From svn at tinysofa.org Tue Jan 4 12:57:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 07:57:09 -0500 (EST) Subject: [tinysofa-svn] r5287 - tinysofa/releases/1.1/cyrus-sasl/current/specs Message-ID: <20050104125709.302F6344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 07:57:02 -0500 (Tue, 04 Jan 2005) New Revision: 5287 Modified: tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec Log: - fix macro Modified: tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec =================================================================== --- tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2005-01-04 12:02:37 UTC (rev 5286) +++ tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2005-01-04 12:57:02 UTC (rev 5287) @@ -156,7 +156,7 @@ %pre -%groupadd sasldb %{sasldb_gid) +%groupadd sasldb %{sasldb_gid} %post /sbin/ldconfig From svn at tinysofa.org Tue Jan 4 13:06:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:06:09 -0500 (EST) Subject: [tinysofa-svn] r5288 - in tinysofa/releases/1.1/anaconda: current/specs releases releases/1.1.7 releases/1.1.7/3ts/specs Message-ID: <20050104130609.4B002344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:05:55 -0500 (Tue, 04 Jan 2005) New Revision: 5288 Added: tinysofa/releases/1.1/anaconda/releases/1.1.7/ tinysofa/releases/1.1/anaconda/releases/1.1.7/3ts/ Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec tinysofa/releases/1.1/anaconda/releases/1.1.7/3ts/specs/anaconda.spec Log: anaconda: * integrate current (1.1.7-3jh) as releases/1.1.7/3ts Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2005-01-04 12:57:02 UTC (rev 5287) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2005-01-04 13:05:55 UTC (rev 5288) @@ -2,7 +2,7 @@ ExclusiveArch: %{ix86} Name: anaconda Version: 1.1.7 -Release: 3jh +Release: 3ts Epoch: 1 License: GPL Summary: The tinysofa installation program. @@ -164,6 +164,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.1.7-3ts +- current (1.1.7-3jh) integrated as 1.1.7-3ts for release 1.1-U3 + * Wed Dec 15 2004 Jaakko Heinonen 1.1.7-3jh - use depmod.old Copied: tinysofa/releases/1.1/anaconda/releases/1.1.7/3ts (from rev 5268, tinysofa/releases/1.1/anaconda/current) Modified: tinysofa/releases/1.1/anaconda/releases/1.1.7/3ts/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/anaconda/releases/1.1.7/3ts/specs/anaconda.spec 2005-01-04 13:05:55 UTC (rev 5288) @@ -2,7 +2,7 @@ ExclusiveArch: %{ix86} Name: anaconda Version: 1.1.7 -Release: 3jh +Release: 3ts Epoch: 1 License: GPL Summary: The tinysofa installation program. @@ -164,6 +164,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.1.7-3ts +- current (1.1.7-3jh) integrated as 1.1.7-3ts for release 1.1-U3 + * Wed Dec 15 2004 Jaakko Heinonen 1.1.7-3jh - use depmod.old From svn at tinysofa.org Tue Jan 4 13:06:19 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:06:19 -0500 (EST) Subject: [tinysofa-svn] r5289 - tinysofa/releases/1.1/anaconda Message-ID: <20050104130619.BE2B7344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:06:13 -0500 (Tue, 04 Jan 2005) New Revision: 5289 Removed: tinysofa/releases/1.1/anaconda/pristine/ Log: anaconda: * removing pristine (1.1.6-1ts) From svn at tinysofa.org Tue Jan 4 13:06:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:06:31 -0500 (EST) Subject: [tinysofa-svn] r5290 - tinysofa/releases/1.1/anaconda Message-ID: <20050104130631.BBC62344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:06:23 -0500 (Tue, 04 Jan 2005) New Revision: 5290 Added: tinysofa/releases/1.1/anaconda/pristine/ Log: anaconda: * retarget pristine (1.1.6-1ts) to releases/1.1.7/3ts Copied: tinysofa/releases/1.1/anaconda/pristine (from rev 5288, tinysofa/releases/1.1/anaconda/releases/1.1.7/3ts) From svn at tinysofa.org Tue Jan 4 13:07:01 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:07:01 -0500 (EST) Subject: [tinysofa-svn] r5291 - in tinysofa/releases/1.1/apr-util: current/specs releases/0.9.4 releases/0.9.4/2ts/specs Message-ID: <20050104130701.613A7344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:06:47 -0500 (Tue, 04 Jan 2005) New Revision: 5291 Added: tinysofa/releases/1.1/apr-util/releases/0.9.4/2ts/ Modified: tinysofa/releases/1.1/apr-util/current/specs/apr-util.spec tinysofa/releases/1.1/apr-util/releases/0.9.4/2ts/specs/apr-util.spec Log: apr-util: * integrate current (0.9.4-2jh) as releases/0.9.4/2ts Modified: tinysofa/releases/1.1/apr-util/current/specs/apr-util.spec =================================================================== --- tinysofa/releases/1.1/apr-util/current/specs/apr-util.spec 2005-01-04 13:06:23 UTC (rev 5290) +++ tinysofa/releases/1.1/apr-util/current/specs/apr-util.spec 2005-01-04 13:06:47 UTC (rev 5291) @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 0.9.4 -Release: 2jh +Release: 2ts Epoch: 1 License: Apache Software License Group: main @@ -97,6 +97,9 @@ %{_includedir}/apr-%{apuver}/*.h %changelog +* Tue Jan 04 2005 tsintegrate 0.9.4-2ts +- current (0.9.4-2jh) integrated as 0.9.4-2ts for release 1.1-U3 + * Thu Sep 16 2004 Jaakko Heinonen 0.9.4-2jh - CAN-2004-0786 security fix Copied: tinysofa/releases/1.1/apr-util/releases/0.9.4/2ts (from rev 5268, tinysofa/releases/1.1/apr-util/current) Modified: tinysofa/releases/1.1/apr-util/releases/0.9.4/2ts/specs/apr-util.spec =================================================================== --- tinysofa/releases/1.1/apr-util/current/specs/apr-util.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/apr-util/releases/0.9.4/2ts/specs/apr-util.spec 2005-01-04 13:06:47 UTC (rev 5291) @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 0.9.4 -Release: 2jh +Release: 2ts Epoch: 1 License: Apache Software License Group: main @@ -97,6 +97,9 @@ %{_includedir}/apr-%{apuver}/*.h %changelog +* Tue Jan 04 2005 tsintegrate 0.9.4-2ts +- current (0.9.4-2jh) integrated as 0.9.4-2ts for release 1.1-U3 + * Thu Sep 16 2004 Jaakko Heinonen 0.9.4-2jh - CAN-2004-0786 security fix From svn at tinysofa.org Tue Jan 4 13:07:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:07:11 -0500 (EST) Subject: [tinysofa-svn] r5292 - tinysofa/releases/1.1/apr-util Message-ID: <20050104130711.A8207344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:07:05 -0500 (Tue, 04 Jan 2005) New Revision: 5292 Removed: tinysofa/releases/1.1/apr-util/pristine/ Log: apr-util: * removing pristine (0.9.4-1ts) From svn at tinysofa.org Tue Jan 4 13:07:23 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:07:23 -0500 (EST) Subject: [tinysofa-svn] r5293 - tinysofa/releases/1.1/apr-util Message-ID: <20050104130723.5D930344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:07:15 -0500 (Tue, 04 Jan 2005) New Revision: 5293 Added: tinysofa/releases/1.1/apr-util/pristine/ Log: apr-util: * retarget pristine (0.9.4-1ts) to releases/0.9.4/2ts Copied: tinysofa/releases/1.1/apr-util/pristine (from rev 5291, tinysofa/releases/1.1/apr-util/releases/0.9.4/2ts) From svn at tinysofa.org Tue Jan 4 13:07:58 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:07:58 -0500 (EST) Subject: [tinysofa-svn] r5294 - in tinysofa/releases/1.1/apt: current/specs releases/0.5.15cnc6 releases/0.5.15cnc6/6ts/sources releases/0.5.15cnc6/6ts/specs Message-ID: <20050104130758.4E578344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:07:41 -0500 (Tue, 04 Jan 2005) New Revision: 5294 Added: tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts/ tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts/sources/upgradevirt.conf Removed: tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts/sources/upgradevirt.conf Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts/specs/apt.spec Log: apt: * integrate current (0.5.15cnc6-6jh) as releases/0.5.15cnc6/6ts Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec =================================================================== --- tinysofa/releases/1.1/apt/current/specs/apt.spec 2005-01-04 13:07:15 UTC (rev 5293) +++ tinysofa/releases/1.1/apt/current/specs/apt.spec 2005-01-04 13:07:41 UTC (rev 5294) @@ -4,7 +4,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 6jh +Release: 6ts Epoch: 0 Group: main URL: https://moin.conectiva.com.br/AptRpm @@ -359,6 +359,9 @@ exit 0 %changelog +* Tue Jan 04 2005 tsintegrate 0.5.15cnc6-6ts +- current (0.5.15cnc6-6jh) integrated as 0.5.15cnc6-6ts for release 1.1-U3 + * Mon Dec 6 2004 Jaakko Heinonen 0.5.15cnc6-6jh - enable upgradevirt lua script Copied: tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts (from rev 5268, tinysofa/releases/1.1/apt/current) Deleted: tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts/sources/upgradevirt.conf =================================================================== --- tinysofa/releases/1.1/apt/current/sources/upgradevirt.conf 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts/sources/upgradevirt.conf 2005-01-04 13:07:41 UTC (rev 5294) @@ -1,19 +0,0 @@ -Scripts -{ - PM - { - Post { "upgradevirt.lua"; }; - }; - AptGet - { - Upgrade { "upgradevirt.lua"; }; - DistUpgrade {"upgradevirt.lua"; }; - Install::SelectPackage { "upgradevirt.lua"; }; - Install::PreResolve { "upgradevirt.lua"; }; - }; - Synaptic - { - DistUpgrade { "upgradevirt.lua"; }; - } -} -Kernel::Set-Defaul "false"; // for tinysofa classic server Copied: tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts/sources/upgradevirt.conf (from rev 5275, tinysofa/releases/1.1/apt/current/sources/upgradevirt.conf) Modified: tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts/specs/apt.spec =================================================================== --- tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts/specs/apt.spec 2005-01-04 13:07:41 UTC (rev 5294) @@ -4,7 +4,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 6jh +Release: 6ts Epoch: 0 Group: main URL: https://moin.conectiva.com.br/AptRpm @@ -359,6 +359,9 @@ exit 0 %changelog +* Tue Jan 04 2005 tsintegrate 0.5.15cnc6-6ts +- current (0.5.15cnc6-6jh) integrated as 0.5.15cnc6-6ts for release 1.1-U3 + * Mon Dec 6 2004 Jaakko Heinonen 0.5.15cnc6-6jh - enable upgradevirt lua script From svn at tinysofa.org Tue Jan 4 13:08:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:08:08 -0500 (EST) Subject: [tinysofa-svn] r5295 - tinysofa/releases/1.1/apt Message-ID: <20050104130808.B8846344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:08:02 -0500 (Tue, 04 Jan 2005) New Revision: 5295 Removed: tinysofa/releases/1.1/apt/pristine/ Log: apt: * removing pristine (0.5.15cnc6-5ts) From svn at tinysofa.org Tue Jan 4 13:08:20 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:08:20 -0500 (EST) Subject: [tinysofa-svn] r5296 - tinysofa/releases/1.1/apt Message-ID: <20050104130820.7C96C344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:08:12 -0500 (Tue, 04 Jan 2005) New Revision: 5296 Added: tinysofa/releases/1.1/apt/pristine/ Log: apt: * retarget pristine (0.5.15cnc6-5ts) to releases/0.5.15cnc6/6ts Copied: tinysofa/releases/1.1/apt/pristine (from rev 5294, tinysofa/releases/1.1/apt/releases/0.5.15cnc6/6ts) From svn at tinysofa.org Tue Jan 4 13:08:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:08:50 -0500 (EST) Subject: [tinysofa-svn] r5298 - tinysofa/releases/1.1/automake Message-ID: <20050104130850.9E574344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:08:44 -0500 (Tue, 04 Jan 2005) New Revision: 5298 Removed: tinysofa/releases/1.1/automake/pristine/ Log: automake: * removing pristine (1.8.5-2ts) From svn at tinysofa.org Tue Jan 4 13:09:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:09:02 -0500 (EST) Subject: [tinysofa-svn] r5299 - tinysofa/releases/1.1/automake Message-ID: <20050104130902.9CC8F344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:08:54 -0500 (Tue, 04 Jan 2005) New Revision: 5299 Added: tinysofa/releases/1.1/automake/pristine/ Log: automake: * retarget pristine (1.8.5-2ts) to releases/1.9.3/1ts Copied: tinysofa/releases/1.1/automake/pristine (from rev 5297, tinysofa/releases/1.1/automake/releases/1.9.3/1ts) From svn at tinysofa.org Tue Jan 4 13:08:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:08:39 -0500 (EST) Subject: [tinysofa-svn] r5297 - in tinysofa/releases/1.1/automake: current/specs releases releases/1.9.3 releases/1.9.3/1ts/specs Message-ID: <20050104130839.02616344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:08:26 -0500 (Tue, 04 Jan 2005) New Revision: 5297 Added: tinysofa/releases/1.1/automake/releases/1.9.3/ tinysofa/releases/1.1/automake/releases/1.9.3/1ts/ Modified: tinysofa/releases/1.1/automake/current/specs/automake.spec tinysofa/releases/1.1/automake/releases/1.9.3/1ts/specs/automake.spec Log: automake: * integrate current (1.9.3-1jh) as releases/1.9.3/1ts Modified: tinysofa/releases/1.1/automake/current/specs/automake.spec =================================================================== --- tinysofa/releases/1.1/automake/current/specs/automake.spec 2005-01-04 13:08:12 UTC (rev 5296) +++ tinysofa/releases/1.1/automake/current/specs/automake.spec 2005-01-04 13:08:26 UTC (rev 5297) @@ -2,7 +2,7 @@ Summary: A GNU tool for automatically creating Makefiles. Name: automake Version: %{api_version}.3 -Release: 1jh +Release: 1ts License: GPL Group: development Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2 @@ -65,6 +65,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.9.3-1ts +- current (1.9.3-1jh) integrated as 1.9.3-1ts for release 1.1-U3 + * Tue Nov 16 2004 Jaakko Heinonen 1.9.3-1jh - tinysofa Copied: tinysofa/releases/1.1/automake/releases/1.9.3/1ts (from rev 5268, tinysofa/releases/1.1/automake/current) Modified: tinysofa/releases/1.1/automake/releases/1.9.3/1ts/specs/automake.spec =================================================================== --- tinysofa/releases/1.1/automake/current/specs/automake.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/automake/releases/1.9.3/1ts/specs/automake.spec 2005-01-04 13:08:26 UTC (rev 5297) @@ -2,7 +2,7 @@ Summary: A GNU tool for automatically creating Makefiles. Name: automake Version: %{api_version}.3 -Release: 1jh +Release: 1ts License: GPL Group: development Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2 @@ -65,6 +65,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.9.3-1ts +- current (1.9.3-1jh) integrated as 1.9.3-1ts for release 1.1-U3 + * Tue Nov 16 2004 Jaakko Heinonen 1.9.3-1jh - tinysofa From svn at tinysofa.org Tue Jan 4 13:09:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:09:24 -0500 (EST) Subject: [tinysofa-svn] r5300 - in tinysofa/releases/1.1/bind: current/specs releases releases/9.2.4 releases/9.2.4/1ts/specs Message-ID: <20050104130924.CF4F3344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:09:10 -0500 (Tue, 04 Jan 2005) New Revision: 5300 Added: tinysofa/releases/1.1/bind/releases/9.2.4/ tinysofa/releases/1.1/bind/releases/9.2.4/1ts/ Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec tinysofa/releases/1.1/bind/releases/9.2.4/1ts/specs/bind.spec Log: bind: * integrate current (9.2.4-1jh) as releases/9.2.4/1ts Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.1/bind/current/specs/bind.spec 2005-01-04 13:08:54 UTC (rev 5299) +++ tinysofa/releases/1.1/bind/current/specs/bind.spec 2005-01-04 13:09:10 UTC (rev 5300) @@ -2,7 +2,7 @@ Name: bind Version: 9.2.4 -Release: 1jh +Release: 1ts Epoch: 0 Summary: A chrooted DNS (Domain Name System) server Summary(pt_BR): BIND - Servidor de nomes DNS chrooted @@ -482,6 +482,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 9.2.4-1ts +- current (9.2.4-1jh) integrated as 9.2.4-1ts for release 1.1-U3 + * Thu Sep 30 2004 Jaakko Heinonen 9.2.4-1jh - 9.2.4 Copied: tinysofa/releases/1.1/bind/releases/9.2.4/1ts (from rev 5268, tinysofa/releases/1.1/bind/current) Modified: tinysofa/releases/1.1/bind/releases/9.2.4/1ts/specs/bind.spec =================================================================== --- tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/bind/releases/9.2.4/1ts/specs/bind.spec 2005-01-04 13:09:10 UTC (rev 5300) @@ -2,7 +2,7 @@ Name: bind Version: 9.2.4 -Release: 1jh +Release: 1ts Epoch: 0 Summary: A chrooted DNS (Domain Name System) server Summary(pt_BR): BIND - Servidor de nomes DNS chrooted @@ -482,6 +482,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 9.2.4-1ts +- current (9.2.4-1jh) integrated as 9.2.4-1ts for release 1.1-U3 + * Thu Sep 30 2004 Jaakko Heinonen 9.2.4-1jh - 9.2.4 From svn at tinysofa.org Tue Jan 4 13:09:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:09:34 -0500 (EST) Subject: [tinysofa-svn] r5301 - tinysofa/releases/1.1/bind Message-ID: <20050104130934.507F7344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:09:29 -0500 (Tue, 04 Jan 2005) New Revision: 5301 Removed: tinysofa/releases/1.1/bind/pristine/ Log: bind: * removing pristine (9.2.3-13ts) From svn at tinysofa.org Tue Jan 4 13:09:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:09:44 -0500 (EST) Subject: [tinysofa-svn] r5302 - tinysofa/releases/1.1/bind Message-ID: <20050104130944.98E5B344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:09:38 -0500 (Tue, 04 Jan 2005) New Revision: 5302 Added: tinysofa/releases/1.1/bind/pristine/ Log: bind: * retarget pristine (9.2.3-13ts) to releases/9.2.4/1ts Copied: tinysofa/releases/1.1/bind/pristine (from rev 5300, tinysofa/releases/1.1/bind/releases/9.2.4/1ts) From svn at tinysofa.org Tue Jan 4 13:10:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:10:02 -0500 (EST) Subject: [tinysofa-svn] r5303 - in tinysofa/releases/1.1/binutils: current/specs releases releases/2.15.92.0.2 releases/2.15.92.0.2/1ts/specs Message-ID: <20050104131002.1288F344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:09:51 -0500 (Tue, 04 Jan 2005) New Revision: 5303 Added: tinysofa/releases/1.1/binutils/releases/2.15.92.0.2/ tinysofa/releases/1.1/binutils/releases/2.15.92.0.2/1ts/ Modified: tinysofa/releases/1.1/binutils/current/specs/binutils.spec tinysofa/releases/1.1/binutils/releases/2.15.92.0.2/1ts/specs/binutils.spec Log: binutils: * integrate current (2.15.92.0.2-1jh) as releases/2.15.92.0.2/1ts Modified: tinysofa/releases/1.1/binutils/current/specs/binutils.spec =================================================================== --- tinysofa/releases/1.1/binutils/current/specs/binutils.spec 2005-01-04 13:09:38 UTC (rev 5302) +++ tinysofa/releases/1.1/binutils/current/specs/binutils.spec 2005-01-04 13:09:51 UTC (rev 5303) @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.15.92.0.2 -Release: 1jh +Release: 1ts Copyright: GPL Group: development URL: http://sources.redhat.com/binutils @@ -141,6 +141,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.15.92.0.2-1ts +- current (2.15.92.0.2-1jh) integrated as 2.15.92.0.2-1ts for release 1.1-U3 + * Thu Aug 05 2004 tsintegrate 2.15.90.0.3-1ts - current (2.15.90.0.3-1jh) integrated as 2.15.90.0.3-1ts for release 1.1 Copied: tinysofa/releases/1.1/binutils/releases/2.15.92.0.2/1ts (from rev 5268, tinysofa/releases/1.1/binutils/current) Modified: tinysofa/releases/1.1/binutils/releases/2.15.92.0.2/1ts/specs/binutils.spec =================================================================== --- tinysofa/releases/1.1/binutils/current/specs/binutils.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/binutils/releases/2.15.92.0.2/1ts/specs/binutils.spec 2005-01-04 13:09:51 UTC (rev 5303) @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.15.92.0.2 -Release: 1jh +Release: 1ts Copyright: GPL Group: development URL: http://sources.redhat.com/binutils @@ -141,6 +141,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.15.92.0.2-1ts +- current (2.15.92.0.2-1jh) integrated as 2.15.92.0.2-1ts for release 1.1-U3 + * Thu Aug 05 2004 tsintegrate 2.15.90.0.3-1ts - current (2.15.90.0.3-1jh) integrated as 2.15.90.0.3-1ts for release 1.1 From svn at tinysofa.org Tue Jan 4 13:10:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:10:11 -0500 (EST) Subject: [tinysofa-svn] r5304 - tinysofa/releases/1.1/binutils Message-ID: <20050104131011.C105F344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:10:06 -0500 (Tue, 04 Jan 2005) New Revision: 5304 Removed: tinysofa/releases/1.1/binutils/pristine/ Log: binutils: * removing pristine (2.15.90.0.3-1ts) From svn at tinysofa.org Tue Jan 4 13:10:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:10:21 -0500 (EST) Subject: [tinysofa-svn] r5305 - tinysofa/releases/1.1/binutils Message-ID: <20050104131021.AA079344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:10:15 -0500 (Tue, 04 Jan 2005) New Revision: 5305 Added: tinysofa/releases/1.1/binutils/pristine/ Log: binutils: * retarget pristine (2.15.90.0.3-1ts) to releases/2.15.92.0.2/1ts Copied: tinysofa/releases/1.1/binutils/pristine (from rev 5303, tinysofa/releases/1.1/binutils/releases/2.15.92.0.2/1ts) From svn at tinysofa.org Tue Jan 4 13:10:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:10:38 -0500 (EST) Subject: [tinysofa-svn] r5306 - in tinysofa/releases/1.1/bison: current/specs releases releases/1.875c releases/1.875c/1ts/specs Message-ID: <20050104131038.42BA6344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:10:27 -0500 (Tue, 04 Jan 2005) New Revision: 5306 Added: tinysofa/releases/1.1/bison/releases/1.875c/ tinysofa/releases/1.1/bison/releases/1.875c/1ts/ Modified: tinysofa/releases/1.1/bison/current/specs/bison.spec tinysofa/releases/1.1/bison/releases/1.875c/1ts/specs/bison.spec Log: bison: * integrate current (1.875c-1jh) as releases/1.875c/1ts Modified: tinysofa/releases/1.1/bison/current/specs/bison.spec =================================================================== --- tinysofa/releases/1.1/bison/current/specs/bison.spec 2005-01-04 13:10:15 UTC (rev 5305) +++ tinysofa/releases/1.1/bison/current/specs/bison.spec 2005-01-04 13:10:27 UTC (rev 5306) @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 1.875c -Release: 1jh +Release: 1ts License: GPL Group: development #Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -70,6 +70,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.875c-1ts +- current (1.875c-1jh) integrated as 1.875c-1ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt Copied: tinysofa/releases/1.1/bison/releases/1.875c/1ts (from rev 5268, tinysofa/releases/1.1/bison/current) Modified: tinysofa/releases/1.1/bison/releases/1.875c/1ts/specs/bison.spec =================================================================== --- tinysofa/releases/1.1/bison/current/specs/bison.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/bison/releases/1.875c/1ts/specs/bison.spec 2005-01-04 13:10:27 UTC (rev 5306) @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 1.875c -Release: 1jh +Release: 1ts License: GPL Group: development #Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -70,6 +70,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.875c-1ts +- current (1.875c-1jh) integrated as 1.875c-1ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt From svn at tinysofa.org Tue Jan 4 13:10:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:10:47 -0500 (EST) Subject: [tinysofa-svn] r5307 - tinysofa/releases/1.1/bison Message-ID: <20050104131047.4193E344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:10:42 -0500 (Tue, 04 Jan 2005) New Revision: 5307 Removed: tinysofa/releases/1.1/bison/pristine/ Log: bison: * removing pristine (1.875-13ts) From svn at tinysofa.org Tue Jan 4 13:10:57 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:10:57 -0500 (EST) Subject: [tinysofa-svn] r5308 - tinysofa/releases/1.1/bison Message-ID: <20050104131057.6C702344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:10:51 -0500 (Tue, 04 Jan 2005) New Revision: 5308 Added: tinysofa/releases/1.1/bison/pristine/ Log: bison: * retarget pristine (1.875-13ts) to releases/1.875c/1ts Copied: tinysofa/releases/1.1/bison/pristine (from rev 5306, tinysofa/releases/1.1/bison/releases/1.875c/1ts) From svn at tinysofa.org Tue Jan 4 13:11:23 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:11:23 -0500 (EST) Subject: [tinysofa-svn] r5309 - in tinysofa/releases/1.1/busybox: current/specs releases/1.00 releases/1.00/1ts/specs Message-ID: <20050104131123.686B0344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:11:12 -0500 (Tue, 04 Jan 2005) New Revision: 5309 Added: tinysofa/releases/1.1/busybox/releases/1.00/1ts/ Modified: tinysofa/releases/1.1/busybox/current/specs/busybox.spec tinysofa/releases/1.1/busybox/releases/1.00/1ts/specs/busybox.spec Log: busybox: * integrate current (1.00-1jh) as releases/1.00/1ts Modified: tinysofa/releases/1.1/busybox/current/specs/busybox.spec =================================================================== --- tinysofa/releases/1.1/busybox/current/specs/busybox.spec 2005-01-04 13:10:51 UTC (rev 5308) +++ tinysofa/releases/1.1/busybox/current/specs/busybox.spec 2005-01-04 13:11:12 UTC (rev 5309) @@ -1,7 +1,7 @@ Summary: Statically linked binary providing simplified versions of system commands Name: busybox Version: 1.00 -Release: 1jh +Release: 1ts License: GPL Group: extra Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2 @@ -65,6 +65,9 @@ /sbin/busybox.anaconda %changelog +* Tue Jan 04 2005 tsintegrate 1.00-1ts +- current (1.00-1jh) integrated as 1.00-1ts for release 1.1-U3 + * Sun Oct 31 2004 Jaakko Heinonen 1.0-1jh - 1.0 Copied: tinysofa/releases/1.1/busybox/releases/1.00/1ts (from rev 5268, tinysofa/releases/1.1/busybox/current) Modified: tinysofa/releases/1.1/busybox/releases/1.00/1ts/specs/busybox.spec =================================================================== --- tinysofa/releases/1.1/busybox/current/specs/busybox.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/busybox/releases/1.00/1ts/specs/busybox.spec 2005-01-04 13:11:12 UTC (rev 5309) @@ -1,7 +1,7 @@ Summary: Statically linked binary providing simplified versions of system commands Name: busybox Version: 1.00 -Release: 1jh +Release: 1ts License: GPL Group: extra Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2 @@ -65,6 +65,9 @@ /sbin/busybox.anaconda %changelog +* Tue Jan 04 2005 tsintegrate 1.00-1ts +- current (1.00-1jh) integrated as 1.00-1ts for release 1.1-U3 + * Sun Oct 31 2004 Jaakko Heinonen 1.0-1jh - 1.0 From svn at tinysofa.org Tue Jan 4 13:11:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:11:32 -0500 (EST) Subject: [tinysofa-svn] r5310 - tinysofa/releases/1.1/busybox Message-ID: <20050104131132.33F95344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:11:27 -0500 (Tue, 04 Jan 2005) New Revision: 5310 Removed: tinysofa/releases/1.1/busybox/pristine/ Log: busybox: * removing pristine (1.00.pre10-2ts) From svn at tinysofa.org Tue Jan 4 13:11:42 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:11:42 -0500 (EST) Subject: [tinysofa-svn] r5311 - tinysofa/releases/1.1/busybox Message-ID: <20050104131142.5E11F344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:11:36 -0500 (Tue, 04 Jan 2005) New Revision: 5311 Added: tinysofa/releases/1.1/busybox/pristine/ Log: busybox: * retarget pristine (1.00.pre10-2ts) to releases/1.00/1ts Copied: tinysofa/releases/1.1/busybox/pristine (from rev 5309, tinysofa/releases/1.1/busybox/releases/1.00/1ts) From svn at tinysofa.org Tue Jan 4 13:12:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:12:06 -0500 (EST) Subject: [tinysofa-svn] r5312 - in tinysofa/releases/1.1/byacc: current/specs releases/1.9 releases/1.9/25ts/specs Message-ID: <20050104131206.BEA55344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:11:56 -0500 (Tue, 04 Jan 2005) New Revision: 5312 Added: tinysofa/releases/1.1/byacc/releases/1.9/25ts/ Modified: tinysofa/releases/1.1/byacc/current/specs/byacc.spec tinysofa/releases/1.1/byacc/releases/1.9/25ts/specs/byacc.spec Log: byacc: * integrate current (1.9-25jh) as releases/1.9/25ts Modified: tinysofa/releases/1.1/byacc/current/specs/byacc.spec =================================================================== --- tinysofa/releases/1.1/byacc/current/specs/byacc.spec 2005-01-04 13:11:36 UTC (rev 5311) +++ tinysofa/releases/1.1/byacc/current/specs/byacc.spec 2005-01-04 13:11:56 UTC (rev 5312) @@ -1,7 +1,7 @@ Summary: A public domain Yacc parser generator. Name: byacc Version: 1.9 -Release: 25jh +Release: 25ts Copyright: public domain Group: development # The source is taken from FreeBSD's CVS as of Thu Sep 28 2000 @@ -54,6 +54,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.9-25ts +- current (1.9-25jh) integrated as 1.9-25ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt Copied: tinysofa/releases/1.1/byacc/releases/1.9/25ts (from rev 5268, tinysofa/releases/1.1/byacc/current) Modified: tinysofa/releases/1.1/byacc/releases/1.9/25ts/specs/byacc.spec =================================================================== --- tinysofa/releases/1.1/byacc/current/specs/byacc.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/byacc/releases/1.9/25ts/specs/byacc.spec 2005-01-04 13:11:56 UTC (rev 5312) @@ -1,7 +1,7 @@ Summary: A public domain Yacc parser generator. Name: byacc Version: 1.9 -Release: 25jh +Release: 25ts Copyright: public domain Group: development # The source is taken from FreeBSD's CVS as of Thu Sep 28 2000 @@ -54,6 +54,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.9-25ts +- current (1.9-25jh) integrated as 1.9-25ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt From svn at tinysofa.org Tue Jan 4 13:12:15 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:12:15 -0500 (EST) Subject: [tinysofa-svn] r5313 - tinysofa/releases/1.1/byacc Message-ID: <20050104131215.2102A344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:12:10 -0500 (Tue, 04 Jan 2005) New Revision: 5313 Removed: tinysofa/releases/1.1/byacc/pristine/ Log: byacc: * removing pristine (1.9-24ts) From svn at tinysofa.org Tue Jan 4 13:12:25 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:12:25 -0500 (EST) Subject: [tinysofa-svn] r5314 - tinysofa/releases/1.1/byacc Message-ID: <20050104131225.4680F344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:12:19 -0500 (Tue, 04 Jan 2005) New Revision: 5314 Added: tinysofa/releases/1.1/byacc/pristine/ Log: byacc: * retarget pristine (1.9-24ts) to releases/1.9/25ts Copied: tinysofa/releases/1.1/byacc/pristine (from rev 5312, tinysofa/releases/1.1/byacc/releases/1.9/25ts) From svn at tinysofa.org Tue Jan 4 13:12:41 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:12:41 -0500 (EST) Subject: [tinysofa-svn] r5315 - in tinysofa/releases/1.1/cdrtools: current/specs releases releases/2.01 releases/2.01/1ts/specs Message-ID: <20050104131241.B9204344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:12:31 -0500 (Tue, 04 Jan 2005) New Revision: 5315 Added: tinysofa/releases/1.1/cdrtools/releases/2.01/ tinysofa/releases/1.1/cdrtools/releases/2.01/1ts/ Modified: tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec tinysofa/releases/1.1/cdrtools/releases/2.01/1ts/specs/cdrtools.spec Log: cdrtools: * integrate current (2.01-1jh) as releases/2.01/1ts Modified: tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec =================================================================== --- tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec 2005-01-04 13:12:19 UTC (rev 5314) +++ tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec 2005-01-04 13:12:31 UTC (rev 5315) @@ -1,7 +1,7 @@ Summary: A collection of CD/DVD utilities. Name: cdrtools Version: 2.01 -Release: 1jh +Release: 1ts Epoch: 0 %define tarversion 2.01 License: GPL @@ -219,6 +219,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.01-1ts +- current (2.01-1jh) integrated as 2.01-1ts for release 1.1-U3 + * Tue Jul 20 2004 Harald Hoyer - 8:2.01.0.a34-1 - version 2.01.0.a34 - added dma patch Copied: tinysofa/releases/1.1/cdrtools/releases/2.01/1ts (from rev 5268, tinysofa/releases/1.1/cdrtools/current) Modified: tinysofa/releases/1.1/cdrtools/releases/2.01/1ts/specs/cdrtools.spec =================================================================== --- tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/cdrtools/releases/2.01/1ts/specs/cdrtools.spec 2005-01-04 13:12:31 UTC (rev 5315) @@ -1,7 +1,7 @@ Summary: A collection of CD/DVD utilities. Name: cdrtools Version: 2.01 -Release: 1jh +Release: 1ts Epoch: 0 %define tarversion 2.01 License: GPL @@ -219,6 +219,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.01-1ts +- current (2.01-1jh) integrated as 2.01-1ts for release 1.1-U3 + * Tue Jul 20 2004 Harald Hoyer - 8:2.01.0.a34-1 - version 2.01.0.a34 - added dma patch From svn at tinysofa.org Tue Jan 4 13:12:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:12:50 -0500 (EST) Subject: [tinysofa-svn] r5316 - tinysofa/releases/1.1/cdrtools Message-ID: <20050104131250.1D115344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:12:45 -0500 (Tue, 04 Jan 2005) New Revision: 5316 Removed: tinysofa/releases/1.1/cdrtools/pristine/ Log: cdrtools: * removing pristine (2.00.3-9ts) From svn at tinysofa.org Tue Jan 4 13:12:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:12:59 -0500 (EST) Subject: [tinysofa-svn] r5317 - tinysofa/releases/1.1/cdrtools Message-ID: <20050104131259.84EC0344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:12:53 -0500 (Tue, 04 Jan 2005) New Revision: 5317 Added: tinysofa/releases/1.1/cdrtools/pristine/ Log: cdrtools: * retarget pristine (2.00.3-9ts) to releases/2.01/1ts Copied: tinysofa/releases/1.1/cdrtools/pristine (from rev 5315, tinysofa/releases/1.1/cdrtools/releases/2.01/1ts) From svn at tinysofa.org Tue Jan 4 13:13:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:13:24 -0500 (EST) Subject: [tinysofa-svn] r5318 - in tinysofa/releases/1.1/chkconfig: current/specs releases/1.3.8 releases/1.3.8/7ts/specs Message-ID: <20050104131324.3259A344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:13:13 -0500 (Tue, 04 Jan 2005) New Revision: 5318 Added: tinysofa/releases/1.1/chkconfig/releases/1.3.8/7ts/ Modified: tinysofa/releases/1.1/chkconfig/current/specs/chkconfig.spec tinysofa/releases/1.1/chkconfig/releases/1.3.8/7ts/specs/chkconfig.spec Log: chkconfig: * integrate current (1.3.8-7jh) as releases/1.3.8/7ts Modified: tinysofa/releases/1.1/chkconfig/current/specs/chkconfig.spec =================================================================== --- tinysofa/releases/1.1/chkconfig/current/specs/chkconfig.spec 2005-01-04 13:12:53 UTC (rev 5317) +++ tinysofa/releases/1.1/chkconfig/current/specs/chkconfig.spec 2005-01-04 13:13:13 UTC (rev 5318) @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rcN.d hierarchy. Name: chkconfig Version: 1.3.8 -Release: 7jh +Release: 7ts License: GPL Group: main Source: ftp://ftp.redhat.com/pub/redhat/code/chkconfig/%{name}-%{version}.tar.gz @@ -45,6 +45,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.3.8-7ts +- current (1.3.8-7jh) integrated as 1.3.8-7ts for release 1.1-U3 + * Thu Oct 21 2004 Jaakko Heinonen 1.3.8-7jh - remove reference to restart_maybe from manual page Copied: tinysofa/releases/1.1/chkconfig/releases/1.3.8/7ts (from rev 5268, tinysofa/releases/1.1/chkconfig/current) Modified: tinysofa/releases/1.1/chkconfig/releases/1.3.8/7ts/specs/chkconfig.spec =================================================================== --- tinysofa/releases/1.1/chkconfig/current/specs/chkconfig.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/chkconfig/releases/1.3.8/7ts/specs/chkconfig.spec 2005-01-04 13:13:13 UTC (rev 5318) @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rcN.d hierarchy. Name: chkconfig Version: 1.3.8 -Release: 7jh +Release: 7ts License: GPL Group: main Source: ftp://ftp.redhat.com/pub/redhat/code/chkconfig/%{name}-%{version}.tar.gz @@ -45,6 +45,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.3.8-7ts +- current (1.3.8-7jh) integrated as 1.3.8-7ts for release 1.1-U3 + * Thu Oct 21 2004 Jaakko Heinonen 1.3.8-7jh - remove reference to restart_maybe from manual page From svn at tinysofa.org Tue Jan 4 13:13:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:13:33 -0500 (EST) Subject: [tinysofa-svn] r5319 - tinysofa/releases/1.1/chkconfig Message-ID: <20050104131333.2344F3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:13:28 -0500 (Tue, 04 Jan 2005) New Revision: 5319 Removed: tinysofa/releases/1.1/chkconfig/pristine/ Log: chkconfig: * removing pristine (1.3.8-6ts) From svn at tinysofa.org Tue Jan 4 13:13:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:13:43 -0500 (EST) Subject: [tinysofa-svn] r5320 - tinysofa/releases/1.1/chkconfig Message-ID: <20050104131343.4E2593440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:13:37 -0500 (Tue, 04 Jan 2005) New Revision: 5320 Added: tinysofa/releases/1.1/chkconfig/pristine/ Log: chkconfig: * retarget pristine (1.3.8-6ts) to releases/1.3.8/7ts Copied: tinysofa/releases/1.1/chkconfig/pristine (from rev 5318, tinysofa/releases/1.1/chkconfig/releases/1.3.8/7ts) From svn at tinysofa.org Tue Jan 4 13:14:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:14:08 -0500 (EST) Subject: [tinysofa-svn] r5321 - in tinysofa/releases/1.1/cpio: current/specs releases/2.5 releases/2.5/12ts/specs Message-ID: <20050104131408.6DB7D3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:13:58 -0500 (Tue, 04 Jan 2005) New Revision: 5321 Added: tinysofa/releases/1.1/cpio/releases/2.5/12ts/ Modified: tinysofa/releases/1.1/cpio/current/specs/cpio.spec tinysofa/releases/1.1/cpio/releases/2.5/12ts/specs/cpio.spec Log: cpio: * integrate current (2.5-12jh) as releases/2.5/12ts Modified: tinysofa/releases/1.1/cpio/current/specs/cpio.spec =================================================================== --- tinysofa/releases/1.1/cpio/current/specs/cpio.spec 2005-01-04 13:13:37 UTC (rev 5320) +++ tinysofa/releases/1.1/cpio/current/specs/cpio.spec 2005-01-04 13:13:58 UTC (rev 5321) @@ -4,7 +4,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.5 -Release: 12jh +Release: 12ts License: GPL Group: main URL: ftp://ftp.gnu.org/pub/gnu/cpio/ @@ -82,6 +82,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.5-12ts +- current (2.5-12jh) integrated as 2.5-12ts for release 1.1-U3 + * Tue Nov 09 2004 Peter Vrabec - fixed "cpio -oH ustar (or tar) saves bad mtime date after Jan 10 2004" (#114580) Copied: tinysofa/releases/1.1/cpio/releases/2.5/12ts (from rev 5268, tinysofa/releases/1.1/cpio/current) Modified: tinysofa/releases/1.1/cpio/releases/2.5/12ts/specs/cpio.spec =================================================================== --- tinysofa/releases/1.1/cpio/current/specs/cpio.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/cpio/releases/2.5/12ts/specs/cpio.spec 2005-01-04 13:13:58 UTC (rev 5321) @@ -4,7 +4,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.5 -Release: 12jh +Release: 12ts License: GPL Group: main URL: ftp://ftp.gnu.org/pub/gnu/cpio/ @@ -82,6 +82,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.5-12ts +- current (2.5-12jh) integrated as 2.5-12ts for release 1.1-U3 + * Tue Nov 09 2004 Peter Vrabec - fixed "cpio -oH ustar (or tar) saves bad mtime date after Jan 10 2004" (#114580) From svn at tinysofa.org Tue Jan 4 13:14:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:14:17 -0500 (EST) Subject: [tinysofa-svn] r5322 - tinysofa/releases/1.1/cpio Message-ID: <20050104131417.2287F3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:14:12 -0500 (Tue, 04 Jan 2005) New Revision: 5322 Removed: tinysofa/releases/1.1/cpio/pristine/ Log: cpio: * removing pristine (2.5-11ts) From svn at tinysofa.org Tue Jan 4 13:14:27 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:14:27 -0500 (EST) Subject: [tinysofa-svn] r5323 - tinysofa/releases/1.1/cpio Message-ID: <20050104131427.468453440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:14:21 -0500 (Tue, 04 Jan 2005) New Revision: 5323 Added: tinysofa/releases/1.1/cpio/pristine/ Log: cpio: * retarget pristine (2.5-11ts) to releases/2.5/12ts Copied: tinysofa/releases/1.1/cpio/pristine (from rev 5321, tinysofa/releases/1.1/cpio/releases/2.5/12ts) From svn at tinysofa.org Tue Jan 4 13:14:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:14:50 -0500 (EST) Subject: [tinysofa-svn] r5324 - in tinysofa/releases/1.1/cups: current/specs releases releases/1.1.22 releases/1.1.22/2ts/sources releases/1.1.22/2ts/specs Message-ID: <20050104131450.69F2B3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:14:34 -0500 (Tue, 04 Jan 2005) New Revision: 5324 Added: tinysofa/releases/1.1/cups/releases/1.1.22/ tinysofa/releases/1.1/cups/releases/1.1.22/2ts/ tinysofa/releases/1.1/cups/releases/1.1.22/2ts/sources/cups-idefense.patch tinysofa/releases/1.1/cups/releases/1.1.22/2ts/specs/cups.spec Removed: tinysofa/releases/1.1/cups/releases/1.1.22/2ts/specs/cups.spec Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec Log: cups: * integrate current (1.1.22-2jh) as releases/1.1.22/2ts Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2005-01-04 13:14:21 UTC (rev 5323) +++ tinysofa/releases/1.1/cups/current/specs/cups.spec 2005-01-04 13:14:34 UTC (rev 5324) @@ -1,7 +1,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.22 -Release: 2jh +Release: 2ts License: GPL Group: main Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2 @@ -219,6 +219,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.1.22-2ts +- current (1.1.22-2jh) integrated as 1.1.22-2ts for release 1.1-U3 + * Wed Dec 29 2004 Jaakko Heinonen 1.1.22-2jh - iDefense security fix for CAN-2004-1125 Copied: tinysofa/releases/1.1/cups/releases/1.1.22/2ts (from rev 5268, tinysofa/releases/1.1/cups/current) Copied: tinysofa/releases/1.1/cups/releases/1.1.22/2ts/sources/cups-idefense.patch (from rev 5277, tinysofa/releases/1.1/cups/current/sources/cups-idefense.patch) Deleted: tinysofa/releases/1.1/cups/releases/1.1.22/2ts/specs/cups.spec =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/cups/releases/1.1.22/2ts/specs/cups.spec 2005-01-04 13:14:34 UTC (rev 5324) @@ -1,288 +0,0 @@ -Summary: Common Unix Printing System -Name: cups -Version: 1.1.22 -Release: 1jh -License: GPL -Group: main -Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2 -Source1: cups.init -Source2: cupsprinter.png -Source5: cups-lpd -Source8: postscript.ppd.gz -Source9: cups.logrotate -Source10: ncp.backend -Patch0: cups-1.1.21-initscript.patch -Patch1: cups-1.1.14-doclink.patch -Patch3: cups-1.1.17-backend.patch -Patch6: cups-1.1.17-pdftops.patch -Patch9: cups-1.1.19-ppdsdat.patch -Patch10: cups-pie.patch -Patch11: cups-str1023.patch -Patch12: cups-str1024.patch -Url: http://www.cups.org/ -BuildRoot: %{_tmppath}/%{name}-root -%service_requires -Requires: %{name}-libs = %{version} xinetd libjpeg libtiff libpng zlib openssl -Requires: ghostscript-cups -Requires: libstdc++ -Provides: lpd lpr lprng -BuildPrereq: pam-devel openssl-devel -BuildRequires: autoconf -BuildRequires: libpng libpng-devel -BuildRequires: libjpeg libpng-devel -BuildRequires: libtiff libtiff-devel -BuildRequires: zlib-devel pam libstdc++-devel gcc-c++ - -%package devel -Summary: Common Unix Printing System - development environment -Group: development -Requires: %{name}-libs = %{version} libjpeg libtiff libpng openssl -Requires: libjpeg-devel libtiff-devel libpng-devel openssl-devel - -%package libs -Summary: Common Unix Printing System - libraries -Group: main - -%description -The Common UNIX Printing System provides a portable printing layer for -UNIX? operating systems. It has been developed by Easy Software Products -to promote a standard printing solution for all UNIX vendors and users. -CUPS provides the System V and Berkeley command-line interfaces. - -%description devel -The Common UNIX Printing System provides a portable printing layer for -UNIX? operating systems. This is the development package for creating -additional printer drivers, and other CUPS services. - -%description libs -The Common UNIX Printing System provides a portable printing layer for -UNIX? operating systems. It has been developed by Easy Software Products -to promote a standard printing solution for all UNIX vendors and users. -CUPS provides the System V and Berkeley command-line interfaces. -The cups-libs package provides libraries used by applications to use CUPS -natively, without needing the lp/lpr commands. - - -%prep -%setup -q -%patch0 -p1 -b .noinit -%patch1 -p1 -b .doclink -%patch3 -p1 -b .backend -%patch6 -p1 -b .pdftops -%patch9 -p1 -b .ppdsdat -%patch10 -p1 -b .pie - -%patch11 -p1 -%patch12 -p1 - -perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in -autoconf - -cp %{SOURCE5} cups-lpd.real -perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real - - -%build -%configure --with-docdir=%{_docdir}/cups-%{version} --localstatedir=%{_var} -perl -pi -e "s,^DSO =.*,DSO=gcc -fpic," Makedefs - -# If we got this far, all prerequisite libraries must be here. -make OPTIM="$RPM_OPT_FLAGS $CFLAGS -fpic" - - -%install -mkdir -p $RPM_BUILD_ROOT%{_initrddir} - -make BUILDROOT=$RPM_BUILD_ROOT install - -install -m 755 $RPM_SOURCE_DIR/cups.init $RPM_BUILD_ROOT%{_initrddir}/cups - -find $RPM_BUILD_ROOT/usr/share/cups/model -name "*.ppd" |xargs gzip -9f - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d $RPM_BUILD_ROOT/var/spool/cups/tmp $RPM_BUILD_ROOT/var/log/cups -install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -c -m 755 cups-lpd.real $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd -install -c -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups -install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/cups/backend/ncp -ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc -# Deal with users trying to access the admin tool at -# /usr/share/doc/cups-%{version}/index.html rather than the -# correct http://localhost:631/ -for i in admin classes jobs printers; do - mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$i - cat >$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$i/index.html < - - - - -CUPS $i - - -

You are trying to access the CUPS admin frontend through reading the files. -The correct way to access the CUPS admin frontend is pointing your browser at -http://localhost:631/.

-

You should be automatically redirected to the correct URL in 2 seconds. -If your browser does not support redirection, please use -this link.

- - -EOF -done - -# Ship a generic postscript PPD file (#73061) -install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model - -# Remove unshipped files. -rm -rf %{buildroot}%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? -find %{buildroot}%{_docdir}/cups-%{version} -name '*.pdf' |xargs rm -f -rm -rf %{buildroot}%{_mandir}/es/ - - -%post -%service_post cups - -if [ $1 -eq 1 ]; then - # First install. Build ppds.dat. - /sbin/service cups reload >/dev/null 2>&1 || : -fi -exit 0 - -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - -%preun -%service_preun cups - -%postun -%service_postun cups - -%triggerin -- samba-client -ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || : -exit 0 - -%triggerun -- samba-client -[ $2 = 0 ] || exit 0 -rm -f %{_libdir}/cups/backend/smb - - -%clean -%clean_buildroot - - -%files -%defattr(-,root,root) -%dir %attr(0755,lp,sys) %{_sysconfdir}/cups -%dir %attr(0711,lp,sys) %{_sysconfdir}/cups/certs -%config(noreplace) %attr(0600,lp,sys) %{_sysconfdir}/cups/classes.conf -%config(noreplace) %attr(0600,lp,sys) %{_sysconfdir}/cups/cupsd.conf -%config(noreplace) %attr(0600,lp,sys) %{_sysconfdir}/cups/printers.conf -%config(noreplace) %{_sysconfdir}/cups/client.conf -%{_sysconfdir}/cups/interfaces -%config(noreplace) %{_sysconfdir}/cups/mime.types -%config(noreplace) %{_sysconfdir}/cups/mime.convs -%dir %attr(0755,lp,sys) %{_sysconfdir}/cups/ppd -%config(noreplace) %{_sysconfdir}/pam.d/cups -%doc %{_docdir}/cups-%{version} -%config %{_initrddir}/cups -%{_bindir}/cancel* -%{_bindir}/enable* -%{_bindir}/disable* -%{_bindir}/lp* -%{_bindir}/cups* -%{_libdir}/cups -%{_mandir}/man?/* -%exclude %{_mandir}/fr -%{_sbindir}/* -%{_datadir}/cups -%{_datadir}/locale -%dir %attr(1700,lp,sys) /var/spool/cups/tmp -%dir %attr(0700,lp,sys) /var/spool/cups -%dir %attr(0755,lp,sys) /var/log/cups -%config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd -%config(noreplace) %{_sysconfdir}/logrotate.d/cups -%{_datadir}/pixmaps/cupsprinter.png - -%files libs -%defattr(-,root,root) -%attr(755,root,root) %{_libdir}/*.so.* - -%files devel -%defattr(-,root,root) -%{_bindir}/cups-config -%attr(755,root,root) %{_libdir}/*.so -%attr(644,root,root) %{_libdir}/*.a -%{_includedir}/cups - - -%changelog -* Sun Dec 19 2004 Jaakko Heinonen 1.1.22-1jh -- 1.1.22 with lppasswd and hpgltops vulnerability fix - -* Sat Dec 11 2004 Jaakko Heinonen 1.1.21-4jh -- mark mime.convs and mime.types as %%config(noreplace) - -* Wed Oct 27 2004 Jaakko Heinonen 1.1.21-3jh -- add 1.1.22rc2 patch, which fixes CAN-2004-0888 and CAN-2004-0923 -- add pie patch - -* Tue Oct 12 2004 Jaakko Heinonen 1.1.21-2jh -- correct permissions for /usr/share/locale/* - -* Thu Sep 16 2004 Jaakko Heinonen 1.1.21-1jh -- 1.1.21 which fixes CAN-2004-0558 - -* Thu Aug 05 2004 tsintegrate 1.1.20-6ts -- current (1.1.20-6jh) integrated as 1.1.20-6ts for release 1.1 - -* Wed May 19 2004 tsintegrate 1.1.20-5ts -- current (1.1.20-5jh) integrated as 1.1.20-5ts for release 1.0-U1 - -* Tue May 11 2004 Omar Kilani -- Add Requires: libstdc++ -- Add BuildRequires: autoconf -- Add BuildRequires: libpng libpng-devel -- Add BuildRequires: libjpeg libpng-devel -- Add BuildRequires: libtiff libtiff-devel -- Add BuildRequires: zlib-devel pam libstdc++-devel -- Add Requires: libpng, openssl to devel subpackage. -- Add Requires: libjpeg-devel libtiff-devel libpng-devel to devel. -- Add Requires: openssl-devel to devel. - -* Mon May 10 2004 Jaakko Heinonen 1.1.20-5jh -- fixed library permissions - -* Fri Dec 12 2003 Erlend Midttun 1.1.20-1tr -- New upstream. - -* Thu Jun 26 2003 Gerald Dachs 1.1.19-6tr -- moved foomatic-filters to an own package to prevent double inclusion - of files - -* Thu Jun 26 2003 Gerald Dachs 1.1.19-5tr -- added package foomatic-filters - based on work by Derek Battams derek at battams dot ca> - -* Wed Jun 18 2003 Erlend Midttun 1.1.19-4tr -- Big rebuild - -* Tue Jun 10 2003 Chr. Toldnes 1.1.18-3ct -- Removed french manual pages. - -* Wed May 28 2003 Gerald Dachs 1.1.18-2gd -- reinserted patch9 for generation of pdds data - -* Tue May 27 2003 Gerald Dachs 1.1.19-1gd -- new upstream version, fixes a denial-of-service attack vulnerability - -* Wed Apr 23 2003 Gerald Dachs 1.1.18-3gd -- doesn't start anymore on boot by default -- cleaned up requirements, libpng10 is not need anymore - -* Mon Apr 14 2003 Gerald Dachs 1.1.18-2gd -- changed requirements -- rebuild against new libpng10, libjpg, libtiff - -* Thu Apr 10 2003 Gerald Dachs 1.1.18-1gd -- initial release Copied: tinysofa/releases/1.1/cups/releases/1.1.22/2ts/specs/cups.spec (from rev 5277, tinysofa/releases/1.1/cups/current/specs/cups.spec) =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-12-29 11:52:38 UTC (rev 5277) +++ tinysofa/releases/1.1/cups/releases/1.1.22/2ts/specs/cups.spec 2005-01-04 13:14:34 UTC (rev 5324) @@ -0,0 +1,296 @@ +Summary: Common Unix Printing System +Name: cups +Version: 1.1.22 +Release: 2ts +License: GPL +Group: main +Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2 +Source1: cups.init +Source2: cupsprinter.png +Source5: cups-lpd +Source8: postscript.ppd.gz +Source9: cups.logrotate +Source10: ncp.backend +Patch0: cups-1.1.21-initscript.patch +Patch1: cups-1.1.14-doclink.patch +Patch3: cups-1.1.17-backend.patch +Patch6: cups-1.1.17-pdftops.patch +Patch9: cups-1.1.19-ppdsdat.patch +Patch10: cups-pie.patch +Patch11: cups-str1023.patch +Patch12: cups-str1024.patch +Patch13: cups-idefense.patch +Url: http://www.cups.org/ +BuildRoot: %{_tmppath}/%{name}-root +%service_requires +Requires: %{name}-libs = %{version} xinetd libjpeg libtiff libpng zlib openssl +Requires: ghostscript-cups +Requires: libstdc++ +Provides: lpd lpr lprng +BuildPrereq: pam-devel openssl-devel +BuildRequires: autoconf +BuildRequires: libpng libpng-devel +BuildRequires: libjpeg libpng-devel +BuildRequires: libtiff libtiff-devel +BuildRequires: zlib-devel pam libstdc++-devel gcc-c++ + +%package devel +Summary: Common Unix Printing System - development environment +Group: development +Requires: %{name}-libs = %{version} libjpeg libtiff libpng openssl +Requires: libjpeg-devel libtiff-devel libpng-devel openssl-devel + +%package libs +Summary: Common Unix Printing System - libraries +Group: main + +%description +The Common UNIX Printing System provides a portable printing layer for +UNIX? operating systems. It has been developed by Easy Software Products +to promote a standard printing solution for all UNIX vendors and users. +CUPS provides the System V and Berkeley command-line interfaces. + +%description devel +The Common UNIX Printing System provides a portable printing layer for +UNIX? operating systems. This is the development package for creating +additional printer drivers, and other CUPS services. + +%description libs +The Common UNIX Printing System provides a portable printing layer for +UNIX? operating systems. It has been developed by Easy Software Products +to promote a standard printing solution for all UNIX vendors and users. +CUPS provides the System V and Berkeley command-line interfaces. +The cups-libs package provides libraries used by applications to use CUPS +natively, without needing the lp/lpr commands. + + +%prep +%setup -q +%patch0 -p1 -b .noinit +%patch1 -p1 -b .doclink +%patch3 -p1 -b .backend +%patch6 -p1 -b .pdftops +%patch9 -p1 -b .ppdsdat +%patch10 -p1 -b .pie + +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 + +perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in +autoconf + +cp %{SOURCE5} cups-lpd.real +perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real + + +%build +%configure --with-docdir=%{_docdir}/cups-%{version} --localstatedir=%{_var} +perl -pi -e "s,^DSO =.*,DSO=gcc -fpic," Makedefs + +# If we got this far, all prerequisite libraries must be here. +make OPTIM="$RPM_OPT_FLAGS $CFLAGS -fpic" + + +%install +mkdir -p $RPM_BUILD_ROOT%{_initrddir} + +make BUILDROOT=$RPM_BUILD_ROOT install + +install -m 755 $RPM_SOURCE_DIR/cups.init $RPM_BUILD_ROOT%{_initrddir}/cups + +find $RPM_BUILD_ROOT/usr/share/cups/model -name "*.ppd" |xargs gzip -9f + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d $RPM_BUILD_ROOT/var/spool/cups/tmp $RPM_BUILD_ROOT/var/log/cups +install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -c -m 755 cups-lpd.real $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd +install -c -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups +install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/cups/backend/ncp +ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc +# Deal with users trying to access the admin tool at +# /usr/share/doc/cups-%{version}/index.html rather than the +# correct http://localhost:631/ +for i in admin classes jobs printers; do + mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$i + cat >$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$i/index.html < + + + + +CUPS $i + + +

You are trying to access the CUPS admin frontend through reading the files. +The correct way to access the CUPS admin frontend is pointing your browser at +http://localhost:631/.

+

You should be automatically redirected to the correct URL in 2 seconds. +If your browser does not support redirection, please use +this link.

+ + +EOF +done + +# Ship a generic postscript PPD file (#73061) +install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model + +# Remove unshipped files. +rm -rf %{buildroot}%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? +find %{buildroot}%{_docdir}/cups-%{version} -name '*.pdf' |xargs rm -f +rm -rf %{buildroot}%{_mandir}/es/ + + +%post +%service_post cups + +if [ $1 -eq 1 ]; then + # First install. Build ppds.dat. + /sbin/service cups reload >/dev/null 2>&1 || : +fi +exit 0 + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%preun +%service_preun cups + +%postun +%service_postun cups + +%triggerin -- samba-client +ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || : +exit 0 + +%triggerun -- samba-client +[ $2 = 0 ] || exit 0 +rm -f %{_libdir}/cups/backend/smb + + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root) +%dir %attr(0755,lp,sys) %{_sysconfdir}/cups +%dir %attr(0711,lp,sys) %{_sysconfdir}/cups/certs +%config(noreplace) %attr(0600,lp,sys) %{_sysconfdir}/cups/classes.conf +%config(noreplace) %attr(0600,lp,sys) %{_sysconfdir}/cups/cupsd.conf +%config(noreplace) %attr(0600,lp,sys) %{_sysconfdir}/cups/printers.conf +%config(noreplace) %{_sysconfdir}/cups/client.conf +%{_sysconfdir}/cups/interfaces +%config(noreplace) %{_sysconfdir}/cups/mime.types +%config(noreplace) %{_sysconfdir}/cups/mime.convs +%dir %attr(0755,lp,sys) %{_sysconfdir}/cups/ppd +%config(noreplace) %{_sysconfdir}/pam.d/cups +%doc %{_docdir}/cups-%{version} +%config %{_initrddir}/cups +%{_bindir}/cancel* +%{_bindir}/enable* +%{_bindir}/disable* +%{_bindir}/lp* +%{_bindir}/cups* +%{_libdir}/cups +%{_mandir}/man?/* +%exclude %{_mandir}/fr +%{_sbindir}/* +%{_datadir}/cups +%{_datadir}/locale +%dir %attr(1700,lp,sys) /var/spool/cups/tmp +%dir %attr(0700,lp,sys) /var/spool/cups +%dir %attr(0755,lp,sys) /var/log/cups +%config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd +%config(noreplace) %{_sysconfdir}/logrotate.d/cups +%{_datadir}/pixmaps/cupsprinter.png + +%files libs +%defattr(-,root,root) +%attr(755,root,root) %{_libdir}/*.so.* + +%files devel +%defattr(-,root,root) +%{_bindir}/cups-config +%attr(755,root,root) %{_libdir}/*.so +%attr(644,root,root) %{_libdir}/*.a +%{_includedir}/cups + + +%changelog +* Tue Jan 04 2005 tsintegrate 1.1.22-2ts +- current (1.1.22-2jh) integrated as 1.1.22-2ts for release 1.1-U3 + +* Wed Dec 29 2004 Jaakko Heinonen 1.1.22-2jh +- iDefense security fix for CAN-2004-1125 + +* Sun Dec 19 2004 Jaakko Heinonen 1.1.22-1jh +- 1.1.22 with lppasswd and hpgltops vulnerability fix + +* Sat Dec 11 2004 Jaakko Heinonen 1.1.21-4jh +- mark mime.convs and mime.types as %%config(noreplace) + +* Wed Oct 27 2004 Jaakko Heinonen 1.1.21-3jh +- add 1.1.22rc2 patch, which fixes CAN-2004-0888 and CAN-2004-0923 +- add pie patch + +* Tue Oct 12 2004 Jaakko Heinonen 1.1.21-2jh +- correct permissions for /usr/share/locale/* + +* Thu Sep 16 2004 Jaakko Heinonen 1.1.21-1jh +- 1.1.21 which fixes CAN-2004-0558 + +* Thu Aug 05 2004 tsintegrate 1.1.20-6ts +- current (1.1.20-6jh) integrated as 1.1.20-6ts for release 1.1 + +* Wed May 19 2004 tsintegrate 1.1.20-5ts +- current (1.1.20-5jh) integrated as 1.1.20-5ts for release 1.0-U1 + +* Tue May 11 2004 Omar Kilani +- Add Requires: libstdc++ +- Add BuildRequires: autoconf +- Add BuildRequires: libpng libpng-devel +- Add BuildRequires: libjpeg libpng-devel +- Add BuildRequires: libtiff libtiff-devel +- Add BuildRequires: zlib-devel pam libstdc++-devel +- Add Requires: libpng, openssl to devel subpackage. +- Add Requires: libjpeg-devel libtiff-devel libpng-devel to devel. +- Add Requires: openssl-devel to devel. + +* Mon May 10 2004 Jaakko Heinonen 1.1.20-5jh +- fixed library permissions + +* Fri Dec 12 2003 Erlend Midttun 1.1.20-1tr +- New upstream. + +* Thu Jun 26 2003 Gerald Dachs 1.1.19-6tr +- moved foomatic-filters to an own package to prevent double inclusion + of files + +* Thu Jun 26 2003 Gerald Dachs 1.1.19-5tr +- added package foomatic-filters + based on work by Derek Battams derek at battams dot ca> + +* Wed Jun 18 2003 Erlend Midttun 1.1.19-4tr +- Big rebuild + +* Tue Jun 10 2003 Chr. Toldnes 1.1.18-3ct +- Removed french manual pages. + +* Wed May 28 2003 Gerald Dachs 1.1.18-2gd +- reinserted patch9 for generation of pdds data + +* Tue May 27 2003 Gerald Dachs 1.1.19-1gd +- new upstream version, fixes a denial-of-service attack vulnerability + +* Wed Apr 23 2003 Gerald Dachs 1.1.18-3gd +- doesn't start anymore on boot by default +- cleaned up requirements, libpng10 is not need anymore + +* Mon Apr 14 2003 Gerald Dachs 1.1.18-2gd +- changed requirements +- rebuild against new libpng10, libjpg, libtiff + +* Thu Apr 10 2003 Gerald Dachs 1.1.18-1gd +- initial release From svn at tinysofa.org Tue Jan 4 13:14:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:14:59 -0500 (EST) Subject: [tinysofa-svn] r5325 - tinysofa/releases/1.1/cups Message-ID: <20050104131459.2B0563440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:14:54 -0500 (Tue, 04 Jan 2005) New Revision: 5325 Removed: tinysofa/releases/1.1/cups/pristine/ Log: cups: * removing pristine (1.1.20-6ts) From svn at tinysofa.org Tue Jan 4 13:15:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:15:09 -0500 (EST) Subject: [tinysofa-svn] r5326 - tinysofa/releases/1.1/cups Message-ID: <20050104131509.BDC3F3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:15:03 -0500 (Tue, 04 Jan 2005) New Revision: 5326 Added: tinysofa/releases/1.1/cups/pristine/ Log: cups: * retarget pristine (1.1.20-6ts) to releases/1.1.22/2ts Copied: tinysofa/releases/1.1/cups/pristine (from rev 5324, tinysofa/releases/1.1/cups/releases/1.1.22/2ts) From svn at tinysofa.org Tue Jan 4 13:15:25 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:15:25 -0500 (EST) Subject: [tinysofa-svn] r5327 - in tinysofa/releases/1.1/cyrus-imapd: current/specs releases releases/2.2.10 releases/2.2.10/3ts/specs Message-ID: <20050104131525.ADDB13440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:15:15 -0500 (Tue, 04 Jan 2005) New Revision: 5327 Added: tinysofa/releases/1.1/cyrus-imapd/releases/2.2.10/ tinysofa/releases/1.1/cyrus-imapd/releases/2.2.10/3ts/ Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec tinysofa/releases/1.1/cyrus-imapd/releases/2.2.10/3ts/specs/cyrus-imapd.spec Log: cyrus-imapd: * integrate current (2.2.10-3jh) as releases/2.2.10/3ts Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-04 13:15:03 UTC (rev 5326) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-04 13:15:15 UTC (rev 5327) @@ -1,7 +1,7 @@ Summary: A high-performance mail store with IMAP and POP3 support. Name: cyrus-imapd Version: 2.2.10 -Release: 3jh +Release: 3ts License: BSD Group: extra URL: http://asg.web.cmu.edu/cyrus/imapd/ @@ -263,6 +263,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.2.10-3ts +- current (2.2.10-3jh) integrated as 2.2.10-3ts for release 1.1-U3 + * Sat Dec 18 2004 Jaakko Heinonen 2.2.10-3jh - fix startup script with multilib - correct /var/spool/cyrus-imap/mailboxes permissions Copied: tinysofa/releases/1.1/cyrus-imapd/releases/2.2.10/3ts (from rev 5268, tinysofa/releases/1.1/cyrus-imapd/current) Modified: tinysofa/releases/1.1/cyrus-imapd/releases/2.2.10/3ts/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/cyrus-imapd/releases/2.2.10/3ts/specs/cyrus-imapd.spec 2005-01-04 13:15:15 UTC (rev 5327) @@ -1,7 +1,7 @@ Summary: A high-performance mail store with IMAP and POP3 support. Name: cyrus-imapd Version: 2.2.10 -Release: 3jh +Release: 3ts License: BSD Group: extra URL: http://asg.web.cmu.edu/cyrus/imapd/ @@ -263,6 +263,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.2.10-3ts +- current (2.2.10-3jh) integrated as 2.2.10-3ts for release 1.1-U3 + * Sat Dec 18 2004 Jaakko Heinonen 2.2.10-3jh - fix startup script with multilib - correct /var/spool/cyrus-imap/mailboxes permissions From svn at tinysofa.org Tue Jan 4 13:15:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:15:34 -0500 (EST) Subject: [tinysofa-svn] r5328 - tinysofa/releases/1.1/cyrus-imapd Message-ID: <20050104131534.30E453440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:15:29 -0500 (Tue, 04 Jan 2005) New Revision: 5328 Removed: tinysofa/releases/1.1/cyrus-imapd/pristine/ Log: cyrus-imapd: * removing pristine (2.2.3-6ts) From svn at tinysofa.org Tue Jan 4 13:15:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:15:44 -0500 (EST) Subject: [tinysofa-svn] r5329 - tinysofa/releases/1.1/cyrus-imapd Message-ID: <20050104131544.77D373440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:15:38 -0500 (Tue, 04 Jan 2005) New Revision: 5329 Added: tinysofa/releases/1.1/cyrus-imapd/pristine/ Log: cyrus-imapd: * retarget pristine (2.2.3-6ts) to releases/2.2.10/3ts Copied: tinysofa/releases/1.1/cyrus-imapd/pristine (from rev 5327, tinysofa/releases/1.1/cyrus-imapd/releases/2.2.10/3ts) From svn at tinysofa.org Tue Jan 4 13:16:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:16:03 -0500 (EST) Subject: [tinysofa-svn] r5330 - in tinysofa/releases/1.1/cyrus-sasl: current/specs releases releases/2.1.20 releases/2.1.20/1ts/specs Message-ID: <20050104131603.1DECD3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:15:50 -0500 (Tue, 04 Jan 2005) New Revision: 5330 Added: tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/ tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/1ts/ tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/1ts/specs/cyrus-sasl.spec Removed: tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/1ts/specs/cyrus-sasl.spec Modified: tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec Log: cyrus-sasl: * integrate current (2.1.20-1jh) as releases/2.1.20/1ts Modified: tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec =================================================================== --- tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2005-01-04 13:15:38 UTC (rev 5329) +++ tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2005-01-04 13:15:50 UTC (rev 5330) @@ -4,7 +4,7 @@ Summary: The Cyrus SASL library. Name: cyrus-sasl Version: 2.1.20 -Release: 1jh +Release: 1ts License: Distributable Group: main Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz @@ -223,6 +223,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.1.20-1ts +- current (2.1.20-1jh) integrated as 2.1.20-1ts for release 1.1-U3 + * Mon Dec 20 2004 Jaakko Heinonen 2.1.20-1jh - 2.1.20 - spec cleanups Copied: tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/1ts (from rev 5268, tinysofa/releases/1.1/cyrus-sasl/current) Deleted: tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/1ts/specs/cyrus-sasl.spec =================================================================== --- tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/1ts/specs/cyrus-sasl.spec 2005-01-04 13:15:50 UTC (rev 5330) @@ -1,348 +0,0 @@ -%define _plugindir2 %{_libdir}/sasl2 -%define sasldb_gid 113 - -Summary: The Cyrus SASL library. -Name: cyrus-sasl -Version: 2.1.20 -Release: 1jh -License: Distributable -Group: main -Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz -Source1: cyrus-saslauthd.init -Source2: cyrus-saslauthd-sysconfig -URL: http://asg.web.cmu.edu/sasl/sasl-library.html -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libtool, groff -BuildRequires: db4-devel, openssl-devel, pam-devel, autoconf, automake, gcc-c++ -BuildRequires: mysql-devel, mysql-libs, postgresql-devel -%service_requires -%accountman_requires -PreReq: /sbin/ldconfig -Requires: pam, db4, openssl - -%description -The %{name} package contains the Cyrus implementation of SASL. -SASL is the Simple Authentication and Security Layer, a method for -adding authentication support to connection-based protocols. - -%package devel -Requires: %{name} = %{version}-%{release} -Group: development -Summary: Files needed for developing applications with Cyrus SASL. - -%description devel -The %{name}-devel package contains files needed for developing and -compiling applications which use the Cyrus SASL library. - -%package utils -Group: extra -Summary: Files needed for runtime applications with Cyrus SASL. - -%description utils -The %{name}-libs package contains the runtime libraries for Cyrus SASL. - -%package plain -Requires: %{name} = %{version}-%{release} -Group: extra -Summary: PLAIN and LOGIN support for Cyrus SASL. - -%description plain -The %{name}-plain package contains the Cyrus SASL plugins which support -PLAIN and LOGIN authentication schemes. - -%package md5 -Requires: %{name} = %{version}-%{release} -Group: extra -Summary: CRAM-MD5 and DIGEST-MD5 support for Cyrus SASL. - -%description md5 -The %{name}-md5 package contains the Cyrus SASL plugins which support -CRAM-MD5 and DIGEST-MD5 authentication schemes. - -%package sql -Requires: %{name} = %{version}-%{release} -Requires: mysql-libs,postgresql-libs -Group: extra -Obsoletes: %{name}-mysql -Provides: %{name}-mysql -Summary: SQL support for Cyrus SASL. - -%description sql -The %{name}-sql package contains the Cyrus SASL plugins which support -MySQL and Postgresql authentication schemes. - -%package otp -Requires: %{name} = %{version}-%{release} -Group: extra -Summary: OTP support for Cyrus SASL. - -%description otp -The %{name}-otp package contains the Cyrus SASL plugins which support -OTP authentication schemes. - - -%prep -%setup -q -n cyrus-sasl-%{version} - -rm -fr autom4te.cache config/ltconfig config/libtool.m4 -libtoolize -f -c -aclocal -I config -I cmulocal -automake -a -c -f -autoheader -autoconf -f - - -%build -export CFLAGS="$RPM_OPT_FLAGS -fPIC" -export LDFLAGS="-L%{_libdir}/mysql" -%configure \ - --target %{_arch}-pc-%{_os}-gnu \ - --sysconfdir=%{_sysconfdir}/sasl \ - --enable-static \ - --with-pic \ - --enable-shared \ - --disable-java \ - --with-plugindir=%{_plugindir2} \ - --disable-krb4 \ - --disable-gssapi \ - --with-rc4 \ - --with-dblib=berkeley \ - --with-dbpath=%{_sysconfdir}/sasl/sasldb \ - --with-saslauthd=/var/run/saslauthd \ - --without-pwcheck \ - --enable-anon \ - --enable-cram \ - --enable-digest \ - --enable-plain \ - --enable-login \ - --enable-sql \ - --with-pam=%{_includedir}/security \ - --with-pgsql=%{_includedir}/postgresql \ - --with-mysql=%{_prefix} - -%make - - -%install -%makeinstall_std sasldir=%{_plugindir2} - -install -m755 -d $RPM_BUILD_ROOT%{_bindir} -./libtool --mode=install \ -install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl-sample-client -./libtool --mode=install \ -install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl-sample-server - -# Install the saslauthd man page in the expected location, even if it's -# pre-formatted. -install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/ -# The .8 seems broken -nroff -man saslauthd/saslauthd.mdoc > saslauthd/saslauthd.8 -install -m644 saslauthd/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/ - -# Create the sasldb2 directory. -install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl -touch $RPM_BUILD_ROOT/%{_sysconfdir}/sasl/sasldb - -# Create the saslauthd listening directory. -install -m755 -d %{buildroot}/var/run/saslauthd -install -m755 -d %{buildroot}%{_initrddir} -install -m755 %{SOURCE1} %{buildroot}%{_initrddir}/saslauthd -install -m755 -d %{buildroot}%{_sysconfdir}/sysconfig -install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/saslauthd - - -%clean -%clean_buildroot - - -%pre -%groupadd sasldb %{sasldb_gid) - -%post -/sbin/ldconfig -%service_post saslauthd - -%preun -%service_preun saslauthd - -%postun -%service_postun saslauthd -/sbin/ldconfig - - -%files -%defattr(-,root,root) -%doc AUTHORS COPYING NEWS README doc/*.html -%{_libdir}/libsasl*.so.* -%dir %{_plugindir2}/ -%dir %{_sysconfdir}/sasl/ -%config(noreplace) %attr(640,root,sasldb)%{_sysconfdir}/sasl/sasldb -%dir /var/run/saslauthd/ -%{_plugindir2}/*anonymous*.so* -%{_plugindir2}/*sasldb*.so* -%{_mandir}/man8/* -%exclude %{_mandir}/cat8 -%{_sbindir}/saslauthd -%attr(0755,root,root) %{_initrddir}/saslauthd -%attr(0644,root,root) %{_sysconfdir}/sysconfig/saslauthd - -%files utils -%defattr(-,root,root) -%{_sbindir}/saslpasswd2 -%{_sbindir}/sasldblistusers2 - -%files plain -%defattr(-,root,root) -%{_plugindir2}/*plain*.so* -%{_plugindir2}/*login*.so* - -%files md5 -%defattr(-,root,root) -%{_plugindir2}/*crammd5*.so* -%{_plugindir2}/*digestmd5*.so* - -%files sql -%defattr(-,root,root) -%{_plugindir2}/*sql*.so* - -%files otp -%defattr(-,root,root) -%{_plugindir2}/*otp*.so* - -%files devel -%defattr(-,root,root) -%doc doc/*.txt -%{_bindir}/sasl-sample-client -%{_bindir}/sasl-sample-server -%{_includedir}/* -%{_libdir}/libsasl*.*a -%{_libdir}/libsasl*.*so -%{_plugindir2}/*.a -%{_plugindir2}/*.la -%{_mandir}/man3/* - - -%changelog -* Mon Dec 20 2004 Jaakko Heinonen 2.1.20-1jh -- 2.1.20 -- spec cleanups -- create sasldb group - -* Sat Oct 9 2004 Jaakko Heinonen 2.1.19-1jh -- update to 2.1.19 - -* Fri Oct 8 2004 Jaakko Heinonen 2.1.18-3jh -- add fix for CAN-2004-0884 - -* Thu Aug 05 2004 tsintegrate 2.1.18-2ts -- current (2.1.18-2jh) integrated as 2.1.18-2ts for release 1.1 - -* Wed May 19 2004 tsintegrate 2.1.18-1ts -- current (2.1.18-2th) integrated as 2.1.18-1ts for release 1.0-U1 - -* Sun May 16 2004 Tor Hveem 2.1.18-2th -- mysql->sql, combined plugin for mysql and pgsql -- Added buildreq postgresql-devel -- New package sql, obsoletes mysql - -* Thu May 13 2004 Omar Kilani 2.1.18-1ok -- New Upstream. - -* Mon Dec 15 2003 Erlend Midttun 2.1.15-5tr -- Rebuilt. - -* Tue Aug 26 2003 Erlend Midttun 2.1.15-4tr -- Change deprecated -H option to -O in init script. -- Reformat man page to make it readable. - -* Fri Aug 22 2003 Chr. Toldnes 2.1.15-3tr -- Rebuild and retag -- Fixed License - -* Sun Aug 17 2003 Gerald Dachs 2.1.15-2gd -- sasl looks for plugins that have no trailing version numbers - behind the .so suffix, so I included this files to the plugin - rpms and removed them from the devel rpm. - -* Wed Jul 16 2003 Gerald Dachs 2.1.15-1tr -- New upstream. - -* Thu Jul 3 2003 Erlend Midttun 2.1.14-1tr -- New upstream. - -* Thu Jun 26 2003 Erlend Midttun 2.1.13-8tr -- Commented out the TIME_OF_DAY.. in sysconfig -- Moved sasldb to /etc/sasl/ - -* Mon Jun 23 2003 Erlend Midttun 2.1.13-7tr -- Added %defattr. - -* Fri Jun 20 2003 Erlend Midttun 2.1.13-6tr -- Added patch to make it work against MySQL v4. - -* Wed Jun 18 2003 Erlend Midttun 2.1.13-5tr -- Big rebuild - -* Tue Jun 3 2003 Erlend Midttun 2.1.13-4em -- Added Req on tsl-utils. - -* Tue Apr 29 2003 Erlend Midttun 2.1.13-3em -- Created utils package for the two files that needs all libraries. - -* Mon Apr 28 2003 Erlend Midttun 2.1.13-2em -- Rebuilt against new mysql. - -* Tue Apr 22 2003 Tor Hveem 2.1.13-1th -- 2.1.13 - -* Mon Mar 24 2003 Erlend Midttun 2.1.12-4em -- Rebuilt against glibc 2.3.2. - -* Tue Mar 11 2003 Goetz Bock 2.1.12-3bg -- *.la should be part of the devel subpackage - -* Tue Mar 11 2003 Goetz Bock 2.1.12-2bg -- rebuild against db4.1.25 -- cleaned up the SPEC file -- added OTP package - -* Tue Feb 04 2003 Tor Hveem 2.1.12-1th -- 2.1.12 - -* Sun Feb 02 2003 Tor Hveem 2.1.11-2th -- included saslauthd sysconfig file -- changed the initscript to function with sysconfig file - -* Sat Feb 01 2003 Tor Hveem 2.1.11-1th -- 2.1.11 -- added mysql-libs to build requirements -- fixed typo in Group - -* Wed Jan 22 2003 Tor Hveem 2.1.10-4th -- fixed $INITLOCK - -* Fri Dec 20 2002 Tor Hveem 2.1.10-3th -- Added pam authentication - -* Thu Dec 19 2002 Gerald Dachs 2.1.10-2gd -- changed requirements - -* Wed Dec 18 2002 Gerald Dachs 2.1.10-1gd -- new upstream version -- fixed saslauthd init script -- changed invokation of functions in saslauthd init script -- don't use %config for saslauthd init script anymore -- saslauthd init script now uses $INITLOCK - -* Thu Aug 22 2002 Gerald Dachs 2.1.6-3gd -- changed name to from cyrus-sasl2 to cyrus-sasl -- depends now on db4 - -* Fri Aug 2 2002 Gerald Dachs 2.1.6-2gd -- updated to 2.1.6 - -* Tue Jul 23 2002 Gerald Dachs 2.1.6-1gd -- updated to 2.1.6 - -* Mon Jun 10 2002 Gerald Dachs -- Repacked for Trustix; Based on RPM from Red Hat Copied: tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/1ts/specs/cyrus-sasl.spec (from rev 5287, tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec) =================================================================== --- tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2005-01-04 12:57:02 UTC (rev 5287) +++ tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/1ts/specs/cyrus-sasl.spec 2005-01-04 13:15:50 UTC (rev 5330) @@ -0,0 +1,351 @@ +%define _plugindir2 %{_libdir}/sasl2 +%define sasldb_gid 113 + +Summary: The Cyrus SASL library. +Name: cyrus-sasl +Version: 2.1.20 +Release: 1ts +License: Distributable +Group: main +Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz +Source1: cyrus-saslauthd.init +Source2: cyrus-saslauthd-sysconfig +URL: http://asg.web.cmu.edu/sasl/sasl-library.html +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: libtool, groff +BuildRequires: db4-devel, openssl-devel, pam-devel, autoconf, automake, gcc-c++ +BuildRequires: mysql-devel, mysql-libs, postgresql-devel +%service_requires +%accountman_requires +PreReq: /sbin/ldconfig +Requires: pam, db4, openssl + +%description +The %{name} package contains the Cyrus implementation of SASL. +SASL is the Simple Authentication and Security Layer, a method for +adding authentication support to connection-based protocols. + +%package devel +Requires: %{name} = %{version}-%{release} +Group: development +Summary: Files needed for developing applications with Cyrus SASL. + +%description devel +The %{name}-devel package contains files needed for developing and +compiling applications which use the Cyrus SASL library. + +%package utils +Group: extra +Summary: Files needed for runtime applications with Cyrus SASL. + +%description utils +The %{name}-libs package contains the runtime libraries for Cyrus SASL. + +%package plain +Requires: %{name} = %{version}-%{release} +Group: extra +Summary: PLAIN and LOGIN support for Cyrus SASL. + +%description plain +The %{name}-plain package contains the Cyrus SASL plugins which support +PLAIN and LOGIN authentication schemes. + +%package md5 +Requires: %{name} = %{version}-%{release} +Group: extra +Summary: CRAM-MD5 and DIGEST-MD5 support for Cyrus SASL. + +%description md5 +The %{name}-md5 package contains the Cyrus SASL plugins which support +CRAM-MD5 and DIGEST-MD5 authentication schemes. + +%package sql +Requires: %{name} = %{version}-%{release} +Requires: mysql-libs,postgresql-libs +Group: extra +Obsoletes: %{name}-mysql +Provides: %{name}-mysql +Summary: SQL support for Cyrus SASL. + +%description sql +The %{name}-sql package contains the Cyrus SASL plugins which support +MySQL and Postgresql authentication schemes. + +%package otp +Requires: %{name} = %{version}-%{release} +Group: extra +Summary: OTP support for Cyrus SASL. + +%description otp +The %{name}-otp package contains the Cyrus SASL plugins which support +OTP authentication schemes. + + +%prep +%setup -q -n cyrus-sasl-%{version} + +rm -fr autom4te.cache config/ltconfig config/libtool.m4 +libtoolize -f -c +aclocal -I config -I cmulocal +automake -a -c -f +autoheader +autoconf -f + + +%build +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +export LDFLAGS="-L%{_libdir}/mysql" +%configure \ + --target %{_arch}-pc-%{_os}-gnu \ + --sysconfdir=%{_sysconfdir}/sasl \ + --enable-static \ + --with-pic \ + --enable-shared \ + --disable-java \ + --with-plugindir=%{_plugindir2} \ + --disable-krb4 \ + --disable-gssapi \ + --with-rc4 \ + --with-dblib=berkeley \ + --with-dbpath=%{_sysconfdir}/sasl/sasldb \ + --with-saslauthd=/var/run/saslauthd \ + --without-pwcheck \ + --enable-anon \ + --enable-cram \ + --enable-digest \ + --enable-plain \ + --enable-login \ + --enable-sql \ + --with-pam=%{_includedir}/security \ + --with-pgsql=%{_includedir}/postgresql \ + --with-mysql=%{_prefix} + +%make + + +%install +%makeinstall_std sasldir=%{_plugindir2} + +install -m755 -d $RPM_BUILD_ROOT%{_bindir} +./libtool --mode=install \ +install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl-sample-client +./libtool --mode=install \ +install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl-sample-server + +# Install the saslauthd man page in the expected location, even if it's +# pre-formatted. +install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/ +# The .8 seems broken +nroff -man saslauthd/saslauthd.mdoc > saslauthd/saslauthd.8 +install -m644 saslauthd/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/ + +# Create the sasldb2 directory. +install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl +touch $RPM_BUILD_ROOT/%{_sysconfdir}/sasl/sasldb + +# Create the saslauthd listening directory. +install -m755 -d %{buildroot}/var/run/saslauthd +install -m755 -d %{buildroot}%{_initrddir} +install -m755 %{SOURCE1} %{buildroot}%{_initrddir}/saslauthd +install -m755 -d %{buildroot}%{_sysconfdir}/sysconfig +install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/saslauthd + + +%clean +%clean_buildroot + + +%pre +%groupadd sasldb %{sasldb_gid} + +%post +/sbin/ldconfig +%service_post saslauthd + +%preun +%service_preun saslauthd + +%postun +%service_postun saslauthd +/sbin/ldconfig + + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING NEWS README doc/*.html +%{_libdir}/libsasl*.so.* +%dir %{_plugindir2}/ +%dir %{_sysconfdir}/sasl/ +%config(noreplace) %attr(640,root,sasldb)%{_sysconfdir}/sasl/sasldb +%dir /var/run/saslauthd/ +%{_plugindir2}/*anonymous*.so* +%{_plugindir2}/*sasldb*.so* +%{_mandir}/man8/* +%exclude %{_mandir}/cat8 +%{_sbindir}/saslauthd +%attr(0755,root,root) %{_initrddir}/saslauthd +%attr(0644,root,root) %{_sysconfdir}/sysconfig/saslauthd + +%files utils +%defattr(-,root,root) +%{_sbindir}/saslpasswd2 +%{_sbindir}/sasldblistusers2 + +%files plain +%defattr(-,root,root) +%{_plugindir2}/*plain*.so* +%{_plugindir2}/*login*.so* + +%files md5 +%defattr(-,root,root) +%{_plugindir2}/*crammd5*.so* +%{_plugindir2}/*digestmd5*.so* + +%files sql +%defattr(-,root,root) +%{_plugindir2}/*sql*.so* + +%files otp +%defattr(-,root,root) +%{_plugindir2}/*otp*.so* + +%files devel +%defattr(-,root,root) +%doc doc/*.txt +%{_bindir}/sasl-sample-client +%{_bindir}/sasl-sample-server +%{_includedir}/* +%{_libdir}/libsasl*.*a +%{_libdir}/libsasl*.*so +%{_plugindir2}/*.a +%{_plugindir2}/*.la +%{_mandir}/man3/* + + +%changelog +* Tue Jan 04 2005 tsintegrate 2.1.20-1ts +- current (2.1.20-1jh) integrated as 2.1.20-1ts for release 1.1-U3 + +* Mon Dec 20 2004 Jaakko Heinonen 2.1.20-1jh +- 2.1.20 +- spec cleanups +- create sasldb group + +* Sat Oct 9 2004 Jaakko Heinonen 2.1.19-1jh +- update to 2.1.19 + +* Fri Oct 8 2004 Jaakko Heinonen 2.1.18-3jh +- add fix for CAN-2004-0884 + +* Thu Aug 05 2004 tsintegrate 2.1.18-2ts +- current (2.1.18-2jh) integrated as 2.1.18-2ts for release 1.1 + +* Wed May 19 2004 tsintegrate 2.1.18-1ts +- current (2.1.18-2th) integrated as 2.1.18-1ts for release 1.0-U1 + +* Sun May 16 2004 Tor Hveem 2.1.18-2th +- mysql->sql, combined plugin for mysql and pgsql +- Added buildreq postgresql-devel +- New package sql, obsoletes mysql + +* Thu May 13 2004 Omar Kilani 2.1.18-1ok +- New Upstream. + +* Mon Dec 15 2003 Erlend Midttun 2.1.15-5tr +- Rebuilt. + +* Tue Aug 26 2003 Erlend Midttun 2.1.15-4tr +- Change deprecated -H option to -O in init script. +- Reformat man page to make it readable. + +* Fri Aug 22 2003 Chr. Toldnes 2.1.15-3tr +- Rebuild and retag +- Fixed License + +* Sun Aug 17 2003 Gerald Dachs 2.1.15-2gd +- sasl looks for plugins that have no trailing version numbers + behind the .so suffix, so I included this files to the plugin + rpms and removed them from the devel rpm. + +* Wed Jul 16 2003 Gerald Dachs 2.1.15-1tr +- New upstream. + +* Thu Jul 3 2003 Erlend Midttun 2.1.14-1tr +- New upstream. + +* Thu Jun 26 2003 Erlend Midttun 2.1.13-8tr +- Commented out the TIME_OF_DAY.. in sysconfig +- Moved sasldb to /etc/sasl/ + +* Mon Jun 23 2003 Erlend Midttun 2.1.13-7tr +- Added %defattr. + +* Fri Jun 20 2003 Erlend Midttun 2.1.13-6tr +- Added patch to make it work against MySQL v4. + +* Wed Jun 18 2003 Erlend Midttun 2.1.13-5tr +- Big rebuild + +* Tue Jun 3 2003 Erlend Midttun 2.1.13-4em +- Added Req on tsl-utils. + +* Tue Apr 29 2003 Erlend Midttun 2.1.13-3em +- Created utils package for the two files that needs all libraries. + +* Mon Apr 28 2003 Erlend Midttun 2.1.13-2em +- Rebuilt against new mysql. + +* Tue Apr 22 2003 Tor Hveem 2.1.13-1th +- 2.1.13 + +* Mon Mar 24 2003 Erlend Midttun 2.1.12-4em +- Rebuilt against glibc 2.3.2. + +* Tue Mar 11 2003 Goetz Bock 2.1.12-3bg +- *.la should be part of the devel subpackage + +* Tue Mar 11 2003 Goetz Bock 2.1.12-2bg +- rebuild against db4.1.25 +- cleaned up the SPEC file +- added OTP package + +* Tue Feb 04 2003 Tor Hveem 2.1.12-1th +- 2.1.12 + +* Sun Feb 02 2003 Tor Hveem 2.1.11-2th +- included saslauthd sysconfig file +- changed the initscript to function with sysconfig file + +* Sat Feb 01 2003 Tor Hveem 2.1.11-1th +- 2.1.11 +- added mysql-libs to build requirements +- fixed typo in Group + +* Wed Jan 22 2003 Tor Hveem 2.1.10-4th +- fixed $INITLOCK + +* Fri Dec 20 2002 Tor Hveem 2.1.10-3th +- Added pam authentication + +* Thu Dec 19 2002 Gerald Dachs 2.1.10-2gd +- changed requirements + +* Wed Dec 18 2002 Gerald Dachs 2.1.10-1gd +- new upstream version +- fixed saslauthd init script +- changed invokation of functions in saslauthd init script +- don't use %config for saslauthd init script anymore +- saslauthd init script now uses $INITLOCK + +* Thu Aug 22 2002 Gerald Dachs 2.1.6-3gd +- changed name to from cyrus-sasl2 to cyrus-sasl +- depends now on db4 + +* Fri Aug 2 2002 Gerald Dachs 2.1.6-2gd +- updated to 2.1.6 + +* Tue Jul 23 2002 Gerald Dachs 2.1.6-1gd +- updated to 2.1.6 + +* Mon Jun 10 2002 Gerald Dachs +- Repacked for Trustix; Based on RPM from Red Hat From svn at tinysofa.org Tue Jan 4 13:16:12 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:16:12 -0500 (EST) Subject: [tinysofa-svn] r5331 - tinysofa/releases/1.1/cyrus-sasl Message-ID: <20050104131612.250243440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:16:07 -0500 (Tue, 04 Jan 2005) New Revision: 5331 Removed: tinysofa/releases/1.1/cyrus-sasl/pristine/ Log: cyrus-sasl: * removing pristine (2.1.18-2ts) From svn at tinysofa.org Tue Jan 4 13:16:22 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:16:22 -0500 (EST) Subject: [tinysofa-svn] r5332 - tinysofa/releases/1.1/cyrus-sasl Message-ID: <20050104131622.6819A3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:16:16 -0500 (Tue, 04 Jan 2005) New Revision: 5332 Added: tinysofa/releases/1.1/cyrus-sasl/pristine/ Log: cyrus-sasl: * retarget pristine (2.1.18-2ts) to releases/2.1.20/1ts Copied: tinysofa/releases/1.1/cyrus-sasl/pristine (from rev 5330, tinysofa/releases/1.1/cyrus-sasl/releases/2.1.20/1ts) From svn at tinysofa.org Tue Jan 4 13:16:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:16:50 -0500 (EST) Subject: [tinysofa-svn] r5333 - in tinysofa/releases/1.1/db4: current/specs releases/4.2.52 releases/4.2.52/5ts/specs Message-ID: <20050104131650.01CEF3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:16:37 -0500 (Tue, 04 Jan 2005) New Revision: 5333 Added: tinysofa/releases/1.1/db4/releases/4.2.52/5ts/ Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec tinysofa/releases/1.1/db4/releases/4.2.52/5ts/specs/db4.spec Log: db4: * integrate current (4.2.52-5jh) as releases/4.2.52/5ts Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec =================================================================== --- tinysofa/releases/1.1/db4/current/specs/db4.spec 2005-01-04 13:16:16 UTC (rev 5332) +++ tinysofa/releases/1.1/db4/current/specs/db4.spec 2005-01-04 13:16:37 UTC (rev 5333) @@ -13,7 +13,7 @@ Summary: The Berkeley DB database library (version 4) for C. Name: db4 Version: 4.2.52 -Release: 5jh +Release: 5ts Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz Source2: nptl-abi-note.S @@ -377,6 +377,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.2.52-5ts +- current (4.2.52-5jh) integrated as 4.2.52-5ts for release 1.1-U3 + * Mon Dec 13 2004 Jaakko Heinonen - run ldconfig for java package Copied: tinysofa/releases/1.1/db4/releases/4.2.52/5ts (from rev 5268, tinysofa/releases/1.1/db4/current) Modified: tinysofa/releases/1.1/db4/releases/4.2.52/5ts/specs/db4.spec =================================================================== --- tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/db4/releases/4.2.52/5ts/specs/db4.spec 2005-01-04 13:16:37 UTC (rev 5333) @@ -13,7 +13,7 @@ Summary: The Berkeley DB database library (version 4) for C. Name: db4 Version: 4.2.52 -Release: 5jh +Release: 5ts Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz Source2: nptl-abi-note.S @@ -377,6 +377,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.2.52-5ts +- current (4.2.52-5jh) integrated as 4.2.52-5ts for release 1.1-U3 + * Mon Dec 13 2004 Jaakko Heinonen - run ldconfig for java package From svn at tinysofa.org Tue Jan 4 13:17:01 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:17:01 -0500 (EST) Subject: [tinysofa-svn] r5334 - tinysofa/releases/1.1/db4 Message-ID: <20050104131701.B0CF03440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:16:55 -0500 (Tue, 04 Jan 2005) New Revision: 5334 Removed: tinysofa/releases/1.1/db4/pristine/ Log: db4: * removing pristine (4.2.52-4ts) From svn at tinysofa.org Tue Jan 4 13:17:13 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:17:13 -0500 (EST) Subject: [tinysofa-svn] r5335 - tinysofa/releases/1.1/db4 Message-ID: <20050104131713.630683440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:17:05 -0500 (Tue, 04 Jan 2005) New Revision: 5335 Added: tinysofa/releases/1.1/db4/pristine/ Log: db4: * retarget pristine (4.2.52-4ts) to releases/4.2.52/5ts Copied: tinysofa/releases/1.1/db4/pristine (from rev 5333, tinysofa/releases/1.1/db4/releases/4.2.52/5ts) From svn at tinysofa.org Tue Jan 4 13:17:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:17:46 -0500 (EST) Subject: [tinysofa-svn] r5336 - in tinysofa/releases/1.1/dhcp: current/specs releases/3.0.1 releases/3.0.1/2ts/sources releases/3.0.1/2ts/specs Message-ID: <20050104131746.8D4063440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:17:29 -0500 (Tue, 04 Jan 2005) New Revision: 5336 Added: tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts/ tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts/sources/dhcp-3.0.1rc13-ts-script.patch Removed: tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts/sources/dhcp-3.0.1rc13-ts-script.patch Modified: tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts/specs/dhcp.spec Log: dhcp: * integrate current (3.0.1-2jh) as releases/3.0.1/2ts Modified: tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec =================================================================== --- tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec 2005-01-04 13:17:05 UTC (rev 5335) +++ tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec 2005-01-04 13:17:29 UTC (rev 5336) @@ -2,7 +2,7 @@ Name: dhcp Epoch: 1 Version: 3.0.1 -Release: 2jh +Release: 2ts License: distributable Group: main URL: http://isc.org/products/DHCP/ @@ -232,6 +232,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.0.1-2ts +- current (3.0.1-2jh) integrated as 3.0.1-2ts for release 1.1-U3 + * Tue Oct 19 2004 Jaakko Heinonen 3.0.1-2jh - add epoch to requirements Copied: tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts (from rev 5268, tinysofa/releases/1.1/dhcp/current) Deleted: tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts/sources/dhcp-3.0.1rc13-ts-script.patch =================================================================== --- tinysofa/releases/1.1/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts/sources/dhcp-3.0.1rc13-ts-script.patch 2005-01-04 13:17:29 UTC (rev 5336) @@ -1,151 +0,0 @@ ---- dhcp-3.0.1rc13/client/scripts/linux.orig 2002-11-15 03:09:09.000000000 +0200 -+++ dhcp-3.0.1rc13/client/scripts/linux 2004-06-21 22:11:47.000000000 +0300 -@@ -19,12 +19,32 @@ - # address if it is not supplied. This might be much more easily done - # by the dhclient C code, and passed on. - --# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious --# of the $1 in its args. -- -+function save_previous() { -+ if [ -e $1 -a ! -e $1.predhclient ]; then -+ mv $1 $1.predhclient -+ fi -+} - make_resolv_conf() { -- if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then -- echo search $new_domain_name >/etc/resolv.conf -+ if [ "${PEERDNS}" == "no" ]; then -+ return -+ fi -+ -+ if [ x$reason == xRENEW ]; then -+ if [ "$new_domain_name" == "$old_domain_name" ] && [ "$new_domain_servers" == "$old_domain_servers" ]; then -+ return -+ fi -+ fi -+ -+ if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then -+ save_previous /etc/resolv.conf -+ echo '; generated by /sbin/dhclient-script' > /etc/resolv.conf -+ if [ -n "$SEARCH" ]; then -+ echo search $SEARCH >> /etc/resolv.conf -+ else -+ if [ -n "$new_domain_name" ]; then -+ echo search $new_domain_name >> /etc/resolv.conf -+ fi -+ fi - chmod 644 /etc/resolv.conf - for nameserver in $new_domain_name_servers; do - echo nameserver $nameserver >>/etc/resolv.conf -@@ -53,6 +73,30 @@ - fi - fi - -+# Import Red Hat Linux configuration -+cd /etc/sysconfig/network-scripts; -+. /etc/sysconfig/network-scripts/network-functions -+ -+if [ -f /etc/init.d/functions ]; then -+ . /etc/init.d/functions -+elif [ -f /etc/rc.d/init.d/functions ]; then -+ . /etc/rc.d/init.d/functions -+fi -+ -+[ -f ../network ] && . ../network -+[ -f ../networking/network ] && . ../networking/network -+ -+CONFIG=$interface -+ -+need_config ${CONFIG} -+ -+[ -f "${CONFIG}" ] || { -+ echo $"$0: configuration for $interface not found." >&2 -+ exit_with_hooks 1 -+} -+ -+source_config -+ - release=`uname -r` - release=`expr $release : '\(.*\)\..*'` - relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'` -@@ -106,13 +150,52 @@ - - if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \ - [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then -- current_hostname=`hostname` -- if [ x$current_hostname = x ] || \ -- [ x$current_hostname = x$old_host_name ]; then -- if [ x$current_hostname = x ] || \ -- [ x$new_host_name != x$old_host_name ]; then -+ -+ if [ "${PEERNIS}" = no ]; then -+ : -+ elif [ -n "$new_nis_domain" ]; then -+ domainname "$new_nis_domain" -+ save_previous /etc/yp.conf -+ echo '# generated by /sbin/dhclient-script' > /etc/yp.conf -+ if [ -n "$new_nis_servers" ]; then -+ for I in $new_nis_servers; do -+ echo "domain $new_nis_domain server $I" >> /etc/yp.conf -+ done -+ else -+ echo "domain $new_nis_domain broadcast" >> /etc/yp.conf -+ fi -+ elif [ -n "$new_nis_servers" ]; then -+ save_previous /etc/yp.conf -+ echo '# generated by /sbin/dhclient-script' > /etc/yp.conf -+ for I in $new_nis_servers; do -+ echo "ypserver $I" >> /etc/yp.conf -+ done -+ fi -+ -+ if [ "${PEERNTP}" = no ]; then -+ : -+ elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then -+ save_previous /etc/ntp.conf -+ cat < /etc/ntp.conf -+# generated by /sbin/dhclient-script -+restrict default ignore -+restrict 127.0.0.1 -+driftfile /var/lib/ntp/drift -+broadcastdelay 0.008 -+authenticate yes -+keys /etc/ntp/keys -+EOF -+ #save_previous /etc/ntp/step-tickers -+ #echo '# generated by /sbin/dhclient-script' > /etc/ntp/step-tickers -+ for I in $new_ntp_servers; do -+ echo "restrict $I nomodify notrap noquery" >> /etc/ntp.conf -+ echo "server $I" >> /etc/ntp.conf -+ #echo "$I" >> /etc/ntp/step-tickers -+ done -+ fi -+ -+ if [ -n "$new_host_name" ] && need_hostname; then - hostname $new_host_name -- fi - fi - - if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ -@@ -174,8 +257,7 @@ - ifconfig $interface inet $new_ip_address $new_subnet_arg \ - $new_broadcast_arg - set $new_routers -- ############## what is -w in ping? -- if ping -q -c 1 $1; then -+ if ping -q -c 1 -w 10 $1; then - if [ x$new_ip_address != x$alias_ip_address ] && \ - [ x$alias_ip_address != x ]; then - ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -@@ -188,7 +270,9 @@ - for router in $new_routers; do - route add default gw $router - done -- make_resolv_conf -+ if [ "${PEERDNS}" != "no" ]; then -+ make_resolv_conf -+ fi - exit_with_hooks 0 - fi - ifconfig $interface inet 0 down Copied: tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts/sources/dhcp-3.0.1rc13-ts-script.patch (from rev 5283, tinysofa/releases/1.1/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch) Modified: tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts/specs/dhcp.spec =================================================================== --- tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts/specs/dhcp.spec 2005-01-04 13:17:29 UTC (rev 5336) @@ -2,7 +2,7 @@ Name: dhcp Epoch: 1 Version: 3.0.1 -Release: 2jh +Release: 2ts License: distributable Group: main URL: http://isc.org/products/DHCP/ @@ -232,6 +232,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.0.1-2ts +- current (3.0.1-2jh) integrated as 3.0.1-2ts for release 1.1-U3 + * Tue Oct 19 2004 Jaakko Heinonen 3.0.1-2jh - add epoch to requirements From svn at tinysofa.org Tue Jan 4 13:17:57 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:17:57 -0500 (EST) Subject: [tinysofa-svn] r5337 - tinysofa/releases/1.1/dhcp Message-ID: <20050104131757.329DC3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:17:50 -0500 (Tue, 04 Jan 2005) New Revision: 5337 Removed: tinysofa/releases/1.1/dhcp/pristine/ Log: dhcp: * removing pristine (3.0.1-1ts) From svn at tinysofa.org Tue Jan 4 13:18:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:18:09 -0500 (EST) Subject: [tinysofa-svn] r5338 - tinysofa/releases/1.1/dhcp Message-ID: <20050104131809.5E7713440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:18:01 -0500 (Tue, 04 Jan 2005) New Revision: 5338 Added: tinysofa/releases/1.1/dhcp/pristine/ Log: dhcp: * retarget pristine (3.0.1-1ts) to releases/3.0.1/2ts Copied: tinysofa/releases/1.1/dhcp/pristine (from rev 5336, tinysofa/releases/1.1/dhcp/releases/3.0.1/2ts) From svn at tinysofa.org Tue Jan 4 13:18:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:18:28 -0500 (EST) Subject: [tinysofa-svn] r5339 - in tinysofa/releases/1.1/dietlibc: current/specs releases releases/0.27 releases/0.27/1ts/specs Message-ID: <20050104131828.5618F3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:18:14 -0500 (Tue, 04 Jan 2005) New Revision: 5339 Added: tinysofa/releases/1.1/dietlibc/releases/0.27/ tinysofa/releases/1.1/dietlibc/releases/0.27/1ts/ Modified: tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec tinysofa/releases/1.1/dietlibc/releases/0.27/1ts/specs/dietlibc.spec Log: dietlibc: * integrate current (0.27-1jh) as releases/0.27/1ts Modified: tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec =================================================================== --- tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec 2005-01-04 13:18:01 UTC (rev 5338) +++ tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec 2005-01-04 13:18:14 UTC (rev 5339) @@ -4,7 +4,7 @@ Summary: A small libc implementation Name: dietlibc Version: 0.27 -Release: 1jh +Release: 1ts Group: development License: GPL Url: http://www.fefe.de/dietlibc/ @@ -48,6 +48,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.27-1ts +- current (0.27-1jh) integrated as 0.27-1ts for release 1.1-U3 + * Mon Nov 1 2004 Jaakko Heinonen 0.27-1jh - 0.27 - include x86_64 Copied: tinysofa/releases/1.1/dietlibc/releases/0.27/1ts (from rev 5268, tinysofa/releases/1.1/dietlibc/current) Modified: tinysofa/releases/1.1/dietlibc/releases/0.27/1ts/specs/dietlibc.spec =================================================================== --- tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/dietlibc/releases/0.27/1ts/specs/dietlibc.spec 2005-01-04 13:18:14 UTC (rev 5339) @@ -4,7 +4,7 @@ Summary: A small libc implementation Name: dietlibc Version: 0.27 -Release: 1jh +Release: 1ts Group: development License: GPL Url: http://www.fefe.de/dietlibc/ @@ -48,6 +48,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.27-1ts +- current (0.27-1jh) integrated as 0.27-1ts for release 1.1-U3 + * Mon Nov 1 2004 Jaakko Heinonen 0.27-1jh - 0.27 - include x86_64 From svn at tinysofa.org Tue Jan 4 13:18:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:18:38 -0500 (EST) Subject: [tinysofa-svn] r5340 - tinysofa/releases/1.1/dietlibc Message-ID: <20050104131838.9C3FF344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:18:32 -0500 (Tue, 04 Jan 2005) New Revision: 5340 Removed: tinysofa/releases/1.1/dietlibc/pristine/ Log: dietlibc: * removing pristine (0.26-1ts) From svn at tinysofa.org Tue Jan 4 13:18:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:18:50 -0500 (EST) Subject: [tinysofa-svn] r5341 - tinysofa/releases/1.1/dietlibc Message-ID: <20050104131850.3CC00344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:18:42 -0500 (Tue, 04 Jan 2005) New Revision: 5341 Added: tinysofa/releases/1.1/dietlibc/pristine/ Log: dietlibc: * retarget pristine (0.26-1ts) to releases/0.27/1ts Copied: tinysofa/releases/1.1/dietlibc/pristine (from rev 5339, tinysofa/releases/1.1/dietlibc/releases/0.27/1ts) From svn at tinysofa.org Tue Jan 4 13:19:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:19:08 -0500 (EST) Subject: [tinysofa-svn] r5342 - in tinysofa/releases/1.1/dkms: current/specs releases releases/2.0.4 releases/2.0.4/1ts/specs Message-ID: <20050104131908.AFC533440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:18:55 -0500 (Tue, 04 Jan 2005) New Revision: 5342 Added: tinysofa/releases/1.1/dkms/releases/2.0.4/ tinysofa/releases/1.1/dkms/releases/2.0.4/1ts/ Modified: tinysofa/releases/1.1/dkms/current/specs/dkms.spec tinysofa/releases/1.1/dkms/releases/2.0.4/1ts/specs/dkms.spec Log: dkms: * integrate current (2.0.4-1jh) as releases/2.0.4/1ts Modified: tinysofa/releases/1.1/dkms/current/specs/dkms.spec =================================================================== --- tinysofa/releases/1.1/dkms/current/specs/dkms.spec 2005-01-04 13:18:42 UTC (rev 5341) +++ tinysofa/releases/1.1/dkms/current/specs/dkms.spec 2005-01-04 13:18:55 UTC (rev 5342) @@ -1,7 +1,7 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms Version: 2.0.4 -Release: 1jh +Release: 1ts License: GPL Group: extra BuildArch: noarch @@ -57,6 +57,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.0.4-1ts +- current (2.0.4-1jh) integrated as 2.0.4-1ts for release 1.1-U3 + * Thu Dec 16 2004 Jaakko Heinonen 2.0.4-1jh - 2.0.4 - spec cleanup Copied: tinysofa/releases/1.1/dkms/releases/2.0.4/1ts (from rev 5268, tinysofa/releases/1.1/dkms/current) Modified: tinysofa/releases/1.1/dkms/releases/2.0.4/1ts/specs/dkms.spec =================================================================== --- tinysofa/releases/1.1/dkms/current/specs/dkms.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/dkms/releases/2.0.4/1ts/specs/dkms.spec 2005-01-04 13:18:55 UTC (rev 5342) @@ -1,7 +1,7 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms Version: 2.0.4 -Release: 1jh +Release: 1ts License: GPL Group: extra BuildArch: noarch @@ -57,6 +57,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.0.4-1ts +- current (2.0.4-1jh) integrated as 2.0.4-1ts for release 1.1-U3 + * Thu Dec 16 2004 Jaakko Heinonen 2.0.4-1jh - 2.0.4 - spec cleanup From svn at tinysofa.org Tue Jan 4 13:19:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:19:18 -0500 (EST) Subject: [tinysofa-svn] r5343 - tinysofa/releases/1.1/dkms Message-ID: <20050104131918.926423440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:19:12 -0500 (Tue, 04 Jan 2005) New Revision: 5343 Removed: tinysofa/releases/1.1/dkms/pristine/ Log: dkms: * removing pristine (1.09-2ts) From svn at tinysofa.org Tue Jan 4 13:19:30 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:19:30 -0500 (EST) Subject: [tinysofa-svn] r5344 - tinysofa/releases/1.1/dkms Message-ID: <20050104131930.29A6D3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:19:22 -0500 (Tue, 04 Jan 2005) New Revision: 5344 Added: tinysofa/releases/1.1/dkms/pristine/ Log: dkms: * retarget pristine (1.09-2ts) to releases/2.0.4/1ts Copied: tinysofa/releases/1.1/dkms/pristine (from rev 5342, tinysofa/releases/1.1/dkms/releases/2.0.4/1ts) From svn at tinysofa.org Tue Jan 4 13:19:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:19:54 -0500 (EST) Subject: [tinysofa-svn] r5345 - in tinysofa/releases/1.1/dovecot: current/specs releases releases/0.99.12.1 releases/0.99.12.1/1ts/sources releases/0.99.12.1/1ts/specs Message-ID: <20050104131954.A54003440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:19:35 -0500 (Tue, 04 Jan 2005) New Revision: 5345 Added: tinysofa/releases/1.1/dovecot/releases/0.99.12.1/ tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts/ tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts/sources/dovecot-0.99.12.1.tar.gz tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts/specs/dovecot.spec Removed: tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts/specs/dovecot.spec Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec Log: dovecot: * integrate current (0.99.12.1-1jh) as releases/0.99.12.1/1ts Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec =================================================================== --- tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2005-01-04 13:19:22 UTC (rev 5344) +++ tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2005-01-04 13:19:35 UTC (rev 5345) @@ -1,7 +1,7 @@ Summary: Dovecot Secure imap server Name: dovecot Version: 0.99.12.1 -Release: 1jh +Release: 1ts License: GPL Group: extra Source: %{name}-%{version}.tar.gz @@ -127,6 +127,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.99.12.1-1ts +- current (0.99.12.1-1jh) integrated as 0.99.12.1-1ts for release 1.1-U3 + * Fri Dec 31 2004 Jaakko Heinonen 0.99.12.1-1jh - 0.99.12.1 Copied: tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts (from rev 5268, tinysofa/releases/1.1/dovecot/current) Copied: tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts/sources/dovecot-0.99.12.1.tar.gz (from rev 5279, tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.12.1.tar.gz) Deleted: tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts/specs/dovecot.spec =================================================================== --- tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts/specs/dovecot.spec 2005-01-04 13:19:35 UTC (rev 5345) @@ -1,230 +0,0 @@ -Summary: Dovecot Secure imap server -Name: dovecot -Version: 0.99.11 -Release: 1jh -License: GPL -Group: extra -Source: %{name}-%{version}.tar.gz -Source1: dovecot.init -Source2: dovecot.pam -Patch100: dovecot-conf.patch - -# Patches 500+ from upstream fixes -URL: http://dovecot.procontrol.fi/ -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: openssl-devel -BuildRequires: openldap-devel -BuildRequires: pam-devel -BuildRequires: pkgconfig -BuildRequires: zlib-devel -BuildRequires: zlib-devel -BuildRequires: gcc-c++ -BuildRequires: cyrus-sasl-devel -Prereq: openssl -%service_requires - -%description -Dovecot is an IMAP server for Linux/UNIX-like systems, written with security -primarily in mind. It also contains a small POP3 server. It supports mail -in either of maildir or mbox formats. - - -%prep -%setup -q -n %{name}-%{version} -%patch100 -p1 -b .config - - -%build -%configure \ - --with-ssl=openssl \ - --with-ssldir=%{_sysconfdir}/ssl \ - --with-ldap - -%make - - -%install -%makeinstall - -%{__mkdir_p} \ - %{buildroot}%{_sysconfdir} \ - %{buildroot}%{_initrddir} \ - %{buildroot}%{_sysconfdir}/pam.d \ - %{buildroot}%{_sysconfdir}/ssl/{certs,private} \ - %{buildroot}%{_localstatedir}/run/dovecot \ - %{buildroot}%{_localstatedir}/run/dovecot-login - -rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name} - -install -m 644 dovecot-example.conf %{buildroot}%{_sysconfdir}/dovecot.conf -install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/dovecot - -install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/dovecot - -# generate ghost .pem file -touch %{buildroot}%{_sysconfdir}/ssl/{certs,private}/dovecot.pem -chmod 600 %{buildroot}%{_sysconfdir}/ssl/{certs,private}/dovecot.pem - -# the dovecot make install installs docs. blah. -rm -rf %{buildroot}%{_docdir}/%{name} -rm -f %{buildroot}%{_sysconfdir}/dovecot-example.conf - - -%pre -%groupadd dovecot 97 -%useradd dovecot 97 dovecot -s /sbin/nologin -d /usr/libexec/dovecot - -%post -%service_post dovecot - -# create a ssl cert -if [ ! -f %{_sysconfdir}/ssl/certs/dovecot.pem ]; then - pushd %{_sysconfdir}/ssl &>/dev/null - umask 077 - cat << EOF | openssl req -new -x509 -days 365 -nodes -out certs/dovecot.pem -keyout private/dovecot.pem &>/dev/null --- -SomeState -SomeCity -SomeOrganization -SomeOrganizationalUnit -localhost.localdomain -root at localhost.localdomain -EOF - - chown root:root private/dovecot.pem certs/dovecot.pem - chmod 600 private/dovecot.pem certs/dovecot.pem - popd &>/dev/null -fi -exit 0 - -%preun -if [ $1 = 0 ]; then - %userdel dovecot - %groupdel dovecot -fi -%service_preun dovecot - -%postun -%service_postun dovecot - - -%clean -%clean_buildroot - -%files -%defattr(-,root,root) -%doc doc/*.txt doc/dovecot-openssl.cnf doc/mkcert.sh INSTALL AUTHORS ChangeLog COPYING TODO README NEWS COPYING.LGPL -%config(noreplace) %{_sysconfdir}/dovecot.conf -%config %{_initrddir}/dovecot -%config %{_sysconfdir}/pam.d/dovecot -%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssl/certs/dovecot.pem -%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssl/private/dovecot.pem -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/* -%{_sbindir}/dovecot -%dir /var/run/dovecot -%attr(0750,root,dovecot) %dir /var/run/dovecot-login - - -%changelog -* Thu Aug 05 2004 tsintegrate 0.99.10.7-1ts -- current (0.99.10.7-1jh) integrated as 0.99.10.7-1ts for release 1.1 - -* Wed Jul 14 2004 Jaakko Heinonen 0.99.10.7-1jh -- new upstream - -* Tue Jun 15 2004 Jaakko Heinonen 0.99.10.5-1jh -- port to tinysofa - -* Thu May 27 2004 David Woodhouse 0.99.10.5-1 -- Update to 0.99.10.5 to fix maildir segfaults (#123022) - -* Fri May 07 2004 Warren Togami 0.99.10.4-4 -- default auth config that is actually usable -- Timo Sirainen (author) suggested functionality fixes - maildir, imap-fetch-body-section, customflags-fix - -* Mon Feb 23 2004 Tim Waugh -- Use ':' instead of '.' as separator for chown. - -* Tue Feb 17 2004 Jeremy Katz - 0.99.10.4-3 -- restart properly if it dies (#115594) - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Mon Nov 24 2003 Jeremy Katz 0.99.10.4-1 -- update to 0.99.10.4 - -* Mon Oct 6 2003 Jeremy Katz 0.99.10-7 -- another patch from upstream to fix returning invalid data on partial - BODY[part] fetches -- patch to avoid confusion of draft/deleted in indexes - -* Tue Sep 23 2003 Jeremy Katz 0.99.10-6 -- add some patches from upstream (#104288) - -* Thu Sep 4 2003 Jeremy Katz 0.99.10-5 -- fix startup with 2.6 with patch from upstream (#103801) - -* Tue Sep 2 2003 Jeremy Katz 0.99.10-4 -- fix assert in search code (#103383) - -* Tue Jul 22 2003 Nalin Dahyabhai 0.99.10-3 -- rebuild - -* Thu Jul 17 2003 Bill Nottingham 0.99.10-2 -- don't run by default - -* Thu Jun 26 2003 Jeremy Katz 0.99.10-1 -- 0.99.10 - -* Mon Jun 23 2003 Jeremy Katz 0.99.10-0.2 -- 0.99.10-rc2 (includes ssl detection fix) -- a few tweaks from fedora - - noreplace the config file - - configure --with-ldap to get LDAP enabled - -* Mon Jun 23 2003 Jeremy Katz 0.99.10-0.1 -- 0.99.10-rc1 -- add fix for ssl detection -- add zlib-devel to BuildRequires -- change pam service name to dovecot -- include pam config - -* Thu May 8 2003 Jeremy Katz 0.99.9.1-1 -- update to 0.99.9.1 -- add patch from upstream to fix potential bug when fetching with - CR+LF linefeeds -- tweak some things in the initscript and config file noticed by the - fedora folks - -* Sun Mar 16 2003 Jeremy Katz 0.99.8.1-2 -- fix ssl dir -- own /var/run/dovecot/login with the correct perms -- fix chmod/chown in post - -* Fri Mar 14 2003 Jeremy Katz 0.99.8.1-1 -- update to 0.99.8.1 - -* Tue Mar 11 2003 Jeremy Katz 0.99.8-2 -- add a patch to fix quoting problem from CVS - -* Mon Mar 10 2003 Jeremy Katz 0.99.8-1 -- 0.99.8 -- add some buildrequires -- fixup to build with openssl 0.9.7 -- now includes a pop3 daemon (off by default) -- clean up description and %%preun -- add dovecot user (uid/gid of 97) -- add some buildrequires -- move the ssl cert to %{_datadir}/ssl/certs -- create a dummy ssl cert in %post -- own /var/run/dovecot -- make the config file a source so we get default mbox locks of fcntl - -* Sun Dec 1 2002 Seth Vidal -- 0.99.4 and fix startup so it starts imap-master not vsftpd :) - -* Tue Nov 26 2002 Seth Vidal -- first build Copied: tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts/specs/dovecot.spec (from rev 5279, tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec) =================================================================== --- tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-12-31 10:58:51 UTC (rev 5279) +++ tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts/specs/dovecot.spec 2005-01-04 13:19:35 UTC (rev 5345) @@ -0,0 +1,236 @@ +Summary: Dovecot Secure imap server +Name: dovecot +Version: 0.99.12.1 +Release: 1ts +License: GPL +Group: extra +Source: %{name}-%{version}.tar.gz +Source1: dovecot.init +Source2: dovecot.pam +Patch100: dovecot-conf.patch + +# Patches 500+ from upstream fixes +URL: http://dovecot.procontrol.fi/ +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: openssl-devel +BuildRequires: openldap-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: zlib-devel +BuildRequires: zlib-devel +BuildRequires: gcc-c++ +BuildRequires: cyrus-sasl-devel +Prereq: openssl +%service_requires + +%description +Dovecot is an IMAP server for Linux/UNIX-like systems, written with security +primarily in mind. It also contains a small POP3 server. It supports mail +in either of maildir or mbox formats. + + +%prep +%setup -q -n %{name}-0.99.12 +%patch100 -p1 -b .config + + +%build +%configure \ + --with-ssl=openssl \ + --with-ssldir=%{_sysconfdir}/ssl \ + --with-ldap + +%make + + +%install +%makeinstall + +%{__mkdir_p} \ + %{buildroot}%{_sysconfdir} \ + %{buildroot}%{_initrddir} \ + %{buildroot}%{_sysconfdir}/pam.d \ + %{buildroot}%{_sysconfdir}/ssl/{certs,private} \ + %{buildroot}%{_localstatedir}/run/dovecot \ + %{buildroot}%{_localstatedir}/run/dovecot-login + +rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name} + +install -m 644 dovecot-example.conf %{buildroot}%{_sysconfdir}/dovecot.conf +install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/dovecot + +install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/dovecot + +# generate ghost .pem file +touch %{buildroot}%{_sysconfdir}/ssl/{certs,private}/dovecot.pem +chmod 600 %{buildroot}%{_sysconfdir}/ssl/{certs,private}/dovecot.pem + +# the dovecot make install installs docs. blah. +rm -rf %{buildroot}%{_docdir}/%{name} +rm -f %{buildroot}%{_sysconfdir}/dovecot-example.conf + + +%pre +%groupadd dovecot 97 +%useradd dovecot 97 dovecot -s /sbin/nologin -d /usr/libexec/dovecot + +%post +%service_post dovecot + +# create a ssl cert +if [ ! -f %{_sysconfdir}/ssl/certs/dovecot.pem ]; then + pushd %{_sysconfdir}/ssl &>/dev/null + umask 077 + cat << EOF | openssl req -new -x509 -days 365 -nodes -out certs/dovecot.pem -keyout private/dovecot.pem &>/dev/null +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +localhost.localdomain +root at localhost.localdomain +EOF + + chown root:root private/dovecot.pem certs/dovecot.pem + chmod 600 private/dovecot.pem certs/dovecot.pem + popd &>/dev/null +fi +exit 0 + +%preun +if [ $1 = 0 ]; then + %userdel dovecot + %groupdel dovecot +fi +%service_preun dovecot + +%postun +%service_postun dovecot + + +%clean +%clean_buildroot + +%files +%defattr(-,root,root) +%doc doc/*.txt doc/dovecot-openssl.cnf doc/mkcert.sh INSTALL AUTHORS ChangeLog COPYING TODO README NEWS COPYING.LGPL +%config(noreplace) %{_sysconfdir}/dovecot.conf +%config %{_initrddir}/dovecot +%config %{_sysconfdir}/pam.d/dovecot +%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssl/certs/dovecot.pem +%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssl/private/dovecot.pem +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/* +%{_sbindir}/dovecot +%dir /var/run/dovecot +%attr(0750,root,dovecot) %dir /var/run/dovecot-login + + +%changelog +* Tue Jan 04 2005 tsintegrate 0.99.12.1-1ts +- current (0.99.12.1-1jh) integrated as 0.99.12.1-1ts for release 1.1-U3 + +* Fri Dec 31 2004 Jaakko Heinonen 0.99.12.1-1jh +- 0.99.12.1 + +* Thu Aug 05 2004 tsintegrate 0.99.10.7-1ts +- current (0.99.10.7-1jh) integrated as 0.99.10.7-1ts for release 1.1 + +* Wed Jul 14 2004 Jaakko Heinonen 0.99.10.7-1jh +- new upstream + +* Tue Jun 15 2004 Jaakko Heinonen 0.99.10.5-1jh +- port to tinysofa + +* Thu May 27 2004 David Woodhouse 0.99.10.5-1 +- Update to 0.99.10.5 to fix maildir segfaults (#123022) + +* Fri May 07 2004 Warren Togami 0.99.10.4-4 +- default auth config that is actually usable +- Timo Sirainen (author) suggested functionality fixes + maildir, imap-fetch-body-section, customflags-fix + +* Mon Feb 23 2004 Tim Waugh +- Use ':' instead of '.' as separator for chown. + +* Tue Feb 17 2004 Jeremy Katz - 0.99.10.4-3 +- restart properly if it dies (#115594) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Nov 24 2003 Jeremy Katz 0.99.10.4-1 +- update to 0.99.10.4 + +* Mon Oct 6 2003 Jeremy Katz 0.99.10-7 +- another patch from upstream to fix returning invalid data on partial + BODY[part] fetches +- patch to avoid confusion of draft/deleted in indexes + +* Tue Sep 23 2003 Jeremy Katz 0.99.10-6 +- add some patches from upstream (#104288) + +* Thu Sep 4 2003 Jeremy Katz 0.99.10-5 +- fix startup with 2.6 with patch from upstream (#103801) + +* Tue Sep 2 2003 Jeremy Katz 0.99.10-4 +- fix assert in search code (#103383) + +* Tue Jul 22 2003 Nalin Dahyabhai 0.99.10-3 +- rebuild + +* Thu Jul 17 2003 Bill Nottingham 0.99.10-2 +- don't run by default + +* Thu Jun 26 2003 Jeremy Katz 0.99.10-1 +- 0.99.10 + +* Mon Jun 23 2003 Jeremy Katz 0.99.10-0.2 +- 0.99.10-rc2 (includes ssl detection fix) +- a few tweaks from fedora + - noreplace the config file + - configure --with-ldap to get LDAP enabled + +* Mon Jun 23 2003 Jeremy Katz 0.99.10-0.1 +- 0.99.10-rc1 +- add fix for ssl detection +- add zlib-devel to BuildRequires +- change pam service name to dovecot +- include pam config + +* Thu May 8 2003 Jeremy Katz 0.99.9.1-1 +- update to 0.99.9.1 +- add patch from upstream to fix potential bug when fetching with + CR+LF linefeeds +- tweak some things in the initscript and config file noticed by the + fedora folks + +* Sun Mar 16 2003 Jeremy Katz 0.99.8.1-2 +- fix ssl dir +- own /var/run/dovecot/login with the correct perms +- fix chmod/chown in post + +* Fri Mar 14 2003 Jeremy Katz 0.99.8.1-1 +- update to 0.99.8.1 + +* Tue Mar 11 2003 Jeremy Katz 0.99.8-2 +- add a patch to fix quoting problem from CVS + +* Mon Mar 10 2003 Jeremy Katz 0.99.8-1 +- 0.99.8 +- add some buildrequires +- fixup to build with openssl 0.9.7 +- now includes a pop3 daemon (off by default) +- clean up description and %%preun +- add dovecot user (uid/gid of 97) +- add some buildrequires +- move the ssl cert to %{_datadir}/ssl/certs +- create a dummy ssl cert in %post +- own /var/run/dovecot +- make the config file a source so we get default mbox locks of fcntl + +* Sun Dec 1 2002 Seth Vidal +- 0.99.4 and fix startup so it starts imap-master not vsftpd :) + +* Tue Nov 26 2002 Seth Vidal +- first build From svn at tinysofa.org Tue Jan 4 13:20:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:20:04 -0500 (EST) Subject: [tinysofa-svn] r5346 - tinysofa/releases/1.1/dovecot Message-ID: <20050104132004.AE5793440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:19:58 -0500 (Tue, 04 Jan 2005) New Revision: 5346 Removed: tinysofa/releases/1.1/dovecot/pristine/ Log: dovecot: * removing pristine (0.99.10.7-1ts) From svn at tinysofa.org Tue Jan 4 13:20:16 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:20:16 -0500 (EST) Subject: [tinysofa-svn] r5347 - tinysofa/releases/1.1/dovecot Message-ID: <20050104132016.33EF33440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:20:08 -0500 (Tue, 04 Jan 2005) New Revision: 5347 Added: tinysofa/releases/1.1/dovecot/pristine/ Log: dovecot: * retarget pristine (0.99.10.7-1ts) to releases/0.99.12.1/1ts Copied: tinysofa/releases/1.1/dovecot/pristine (from rev 5345, tinysofa/releases/1.1/dovecot/releases/0.99.12.1/1ts) From svn at tinysofa.org Tue Jan 4 13:20:36 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:20:36 -0500 (EST) Subject: [tinysofa-svn] r5348 - in tinysofa/releases/1.1/fcron: current/specs releases releases/2.9.5.1 releases/2.9.5.1/2ts/specs Message-ID: <20050104132036.5C3D23440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:20:22 -0500 (Tue, 04 Jan 2005) New Revision: 5348 Added: tinysofa/releases/1.1/fcron/releases/2.9.5.1/ tinysofa/releases/1.1/fcron/releases/2.9.5.1/2ts/ Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec tinysofa/releases/1.1/fcron/releases/2.9.5.1/2ts/specs/fcron.spec Log: fcron: * integrate current (2.9.5.1-2jh) as releases/2.9.5.1/2ts Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec =================================================================== --- tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2005-01-04 13:20:08 UTC (rev 5347) +++ tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2005-01-04 13:20:22 UTC (rev 5348) @@ -1,7 +1,7 @@ Summary: The fcron daemon for executing specified programs at set times Name: fcron Version: 2.9.5.1 -Release: 2jh +Release: 2ts License: GPL Group: main Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz @@ -134,6 +134,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.9.5.1-2ts +- current (2.9.5.1-2jh) integrated as 2.9.5.1-2ts for release 1.1-U3 + * Mon Dec 20 2004 Jaakko Heinonen 2.9.5.1-2jh - change fcron.{deny,allow,conf} permissions Copied: tinysofa/releases/1.1/fcron/releases/2.9.5.1/2ts (from rev 5268, tinysofa/releases/1.1/fcron/current) Modified: tinysofa/releases/1.1/fcron/releases/2.9.5.1/2ts/specs/fcron.spec =================================================================== --- tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/fcron/releases/2.9.5.1/2ts/specs/fcron.spec 2005-01-04 13:20:22 UTC (rev 5348) @@ -1,7 +1,7 @@ Summary: The fcron daemon for executing specified programs at set times Name: fcron Version: 2.9.5.1 -Release: 2jh +Release: 2ts License: GPL Group: main Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz @@ -134,6 +134,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.9.5.1-2ts +- current (2.9.5.1-2jh) integrated as 2.9.5.1-2ts for release 1.1-U3 + * Mon Dec 20 2004 Jaakko Heinonen 2.9.5.1-2jh - change fcron.{deny,allow,conf} permissions From svn at tinysofa.org Tue Jan 4 13:20:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:20:46 -0500 (EST) Subject: [tinysofa-svn] r5349 - tinysofa/releases/1.1/fcron Message-ID: <20050104132046.A18153440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:20:40 -0500 (Tue, 04 Jan 2005) New Revision: 5349 Removed: tinysofa/releases/1.1/fcron/pristine/ Log: fcron: * removing pristine (2.9.4-13ts) From svn at tinysofa.org Tue Jan 4 13:20:58 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:20:58 -0500 (EST) Subject: [tinysofa-svn] r5350 - tinysofa/releases/1.1/fcron Message-ID: <20050104132058.3CA6B344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:20:50 -0500 (Tue, 04 Jan 2005) New Revision: 5350 Added: tinysofa/releases/1.1/fcron/pristine/ Log: fcron: * retarget pristine (2.9.4-13ts) to releases/2.9.5.1/2ts Copied: tinysofa/releases/1.1/fcron/pristine (from rev 5348, tinysofa/releases/1.1/fcron/releases/2.9.5.1/2ts) From svn at tinysofa.org Tue Jan 4 13:21:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:21:18 -0500 (EST) Subject: [tinysofa-svn] r5351 - in tinysofa/releases/1.1/file: current/specs releases releases/4.12 releases/4.12/1ts/specs Message-ID: <20050104132118.0C5853440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:21:04 -0500 (Tue, 04 Jan 2005) New Revision: 5351 Added: tinysofa/releases/1.1/file/releases/4.12/ tinysofa/releases/1.1/file/releases/4.12/1ts/ Modified: tinysofa/releases/1.1/file/current/specs/file.spec tinysofa/releases/1.1/file/releases/4.12/1ts/specs/file.spec Log: file: * integrate current (4.12-1jh) as releases/4.12/1ts Modified: tinysofa/releases/1.1/file/current/specs/file.spec =================================================================== --- tinysofa/releases/1.1/file/current/specs/file.spec 2005-01-04 13:20:50 UTC (rev 5350) +++ tinysofa/releases/1.1/file/current/specs/file.spec 2005-01-04 13:21:04 UTC (rev 5351) @@ -3,7 +3,7 @@ Summary: A utility for determining file types. Name: file Version: 4.12 -Release: 1jh +Release: 1ts License: distributable Group: main Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -82,6 +82,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.12-1ts +- current (4.12-1jh) integrated as 4.12-1ts for release 1.1-U3 + * Mon Dec 6 2004 Jaakko Heinonen 4.12-1jh - 4.12, which fixes an error in ELF header parsing code Copied: tinysofa/releases/1.1/file/releases/4.12/1ts (from rev 5268, tinysofa/releases/1.1/file/current) Modified: tinysofa/releases/1.1/file/releases/4.12/1ts/specs/file.spec =================================================================== --- tinysofa/releases/1.1/file/current/specs/file.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/file/releases/4.12/1ts/specs/file.spec 2005-01-04 13:21:04 UTC (rev 5351) @@ -3,7 +3,7 @@ Summary: A utility for determining file types. Name: file Version: 4.12 -Release: 1jh +Release: 1ts License: distributable Group: main Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -82,6 +82,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.12-1ts +- current (4.12-1jh) integrated as 4.12-1ts for release 1.1-U3 + * Mon Dec 6 2004 Jaakko Heinonen 4.12-1jh - 4.12, which fixes an error in ELF header parsing code From svn at tinysofa.org Tue Jan 4 13:21:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:21:28 -0500 (EST) Subject: [tinysofa-svn] r5352 - tinysofa/releases/1.1/file Message-ID: <20050104132128.962903440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:21:22 -0500 (Tue, 04 Jan 2005) New Revision: 5352 Removed: tinysofa/releases/1.1/file/pristine/ Log: file: * removing pristine (4.09-3ts) From svn at tinysofa.org Tue Jan 4 13:21:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:21:40 -0500 (EST) Subject: [tinysofa-svn] r5353 - tinysofa/releases/1.1/file Message-ID: <20050104132140.A06E53440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:21:32 -0500 (Tue, 04 Jan 2005) New Revision: 5353 Added: tinysofa/releases/1.1/file/pristine/ Log: file: * retarget pristine (4.09-3ts) to releases/4.12/1ts Copied: tinysofa/releases/1.1/file/pristine (from rev 5351, tinysofa/releases/1.1/file/releases/4.12/1ts) From svn at tinysofa.org Tue Jan 4 13:22:10 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:22:10 -0500 (EST) Subject: [tinysofa-svn] r5354 - in tinysofa/releases/1.1/flex: current/specs releases/2.5.4a releases/2.5.4a/22ts/specs Message-ID: <20050104132210.BAF883440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:21:57 -0500 (Tue, 04 Jan 2005) New Revision: 5354 Added: tinysofa/releases/1.1/flex/releases/2.5.4a/22ts/ Modified: tinysofa/releases/1.1/flex/current/specs/flex.spec tinysofa/releases/1.1/flex/releases/2.5.4a/22ts/specs/flex.spec Log: flex: * integrate current (2.5.4a-22jh) as releases/2.5.4a/22ts Modified: tinysofa/releases/1.1/flex/current/specs/flex.spec =================================================================== --- tinysofa/releases/1.1/flex/current/specs/flex.spec 2005-01-04 13:21:32 UTC (rev 5353) +++ tinysofa/releases/1.1/flex/current/specs/flex.spec 2005-01-04 13:21:57 UTC (rev 5354) @@ -1,7 +1,7 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.4a -Release: 22jh +Release: 22ts License: BSD Group: development BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -68,6 +68,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.5.4a-22ts +- current (2.5.4a-22jh) integrated as 2.5.4a-22ts for release 1.1-U3 + * Tue Aug 24 2004 Warren Togami 2.5.4a-33 - #116407 BR byacc Copied: tinysofa/releases/1.1/flex/releases/2.5.4a/22ts (from rev 5268, tinysofa/releases/1.1/flex/current) Modified: tinysofa/releases/1.1/flex/releases/2.5.4a/22ts/specs/flex.spec =================================================================== --- tinysofa/releases/1.1/flex/current/specs/flex.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/flex/releases/2.5.4a/22ts/specs/flex.spec 2005-01-04 13:21:57 UTC (rev 5354) @@ -1,7 +1,7 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.4a -Release: 22jh +Release: 22ts License: BSD Group: development BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -68,6 +68,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.5.4a-22ts +- current (2.5.4a-22jh) integrated as 2.5.4a-22ts for release 1.1-U3 + * Tue Aug 24 2004 Warren Togami 2.5.4a-33 - #116407 BR byacc From svn at tinysofa.org Tue Jan 4 13:22:20 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:22:20 -0500 (EST) Subject: [tinysofa-svn] r5355 - tinysofa/releases/1.1/flex Message-ID: <20050104132220.9C5A33440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:22:14 -0500 (Tue, 04 Jan 2005) New Revision: 5355 Removed: tinysofa/releases/1.1/flex/pristine/ Log: flex: * removing pristine (2.5.4a-21ts) From svn at tinysofa.org Tue Jan 4 13:22:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:22:32 -0500 (EST) Subject: [tinysofa-svn] r5356 - tinysofa/releases/1.1/flex Message-ID: <20050104132232.419303440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:22:24 -0500 (Tue, 04 Jan 2005) New Revision: 5356 Added: tinysofa/releases/1.1/flex/pristine/ Log: flex: * retarget pristine (2.5.4a-21ts) to releases/2.5.4a/22ts Copied: tinysofa/releases/1.1/flex/pristine (from rev 5354, tinysofa/releases/1.1/flex/releases/2.5.4a/22ts) From svn at tinysofa.org Tue Jan 4 13:22:51 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:22:51 -0500 (EST) Subject: [tinysofa-svn] r5357 - in tinysofa/releases/1.1/foomatic-filters: current/specs releases releases/3.0.2 releases/3.0.2/3ts/specs Message-ID: <20050104132251.398D73440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:22:37 -0500 (Tue, 04 Jan 2005) New Revision: 5357 Added: tinysofa/releases/1.1/foomatic-filters/releases/3.0.2/ tinysofa/releases/1.1/foomatic-filters/releases/3.0.2/3ts/ Modified: tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec tinysofa/releases/1.1/foomatic-filters/releases/3.0.2/3ts/specs/foomatic-filters.spec Log: foomatic-filters: * integrate current (3.0.2-3jh) as releases/3.0.2/3ts Modified: tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec =================================================================== --- tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec 2005-01-04 13:22:24 UTC (rev 5356) +++ tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec 2005-01-04 13:22:37 UTC (rev 5357) @@ -1,7 +1,7 @@ Summary: Foomatic is a database-driven system for integrating free software printer drivers with common spoolers under Unix. Name: foomatic-filters Version: 3.0.2 -Release: 3jh +Release: 3ts License: GPL Group: extra Source: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{version}.tar.gz @@ -61,6 +61,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.0.2-3ts +- current (3.0.2-3jh) integrated as 3.0.2-3ts for release 1.1-U3 + * Tue Oct 12 2004 Jaakko Heinonen 3.0.2-3jh - own %%{_sysconfdir}/foomatic Copied: tinysofa/releases/1.1/foomatic-filters/releases/3.0.2/3ts (from rev 5268, tinysofa/releases/1.1/foomatic-filters/current) Modified: tinysofa/releases/1.1/foomatic-filters/releases/3.0.2/3ts/specs/foomatic-filters.spec =================================================================== --- tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/foomatic-filters/releases/3.0.2/3ts/specs/foomatic-filters.spec 2005-01-04 13:22:37 UTC (rev 5357) @@ -1,7 +1,7 @@ Summary: Foomatic is a database-driven system for integrating free software printer drivers with common spoolers under Unix. Name: foomatic-filters Version: 3.0.2 -Release: 3jh +Release: 3ts License: GPL Group: extra Source: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{version}.tar.gz @@ -61,6 +61,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.0.2-3ts +- current (3.0.2-3jh) integrated as 3.0.2-3ts for release 1.1-U3 + * Tue Oct 12 2004 Jaakko Heinonen 3.0.2-3jh - own %%{_sysconfdir}/foomatic From svn at tinysofa.org Tue Jan 4 13:23:01 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:23:01 -0500 (EST) Subject: [tinysofa-svn] r5358 - tinysofa/releases/1.1/foomatic-filters Message-ID: <20050104132301.A14593440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:22:55 -0500 (Tue, 04 Jan 2005) New Revision: 5358 Removed: tinysofa/releases/1.1/foomatic-filters/pristine/ Log: foomatic-filters: * removing pristine (3.0.1-5ts) From svn at tinysofa.org Tue Jan 4 13:23:13 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:23:13 -0500 (EST) Subject: [tinysofa-svn] r5359 - tinysofa/releases/1.1/foomatic-filters Message-ID: <20050104132313.505143440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:23:05 -0500 (Tue, 04 Jan 2005) New Revision: 5359 Added: tinysofa/releases/1.1/foomatic-filters/pristine/ Log: foomatic-filters: * retarget pristine (3.0.1-5ts) to releases/3.0.2/3ts Copied: tinysofa/releases/1.1/foomatic-filters/pristine (from rev 5357, tinysofa/releases/1.1/foomatic-filters/releases/3.0.2/3ts) From svn at tinysofa.org Tue Jan 4 13:23:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:23:33 -0500 (EST) Subject: [tinysofa-svn] r5360 - in tinysofa/releases/1.1/freetype: current/specs releases releases/2.1.9 releases/2.1.9/1ts/specs Message-ID: <20050104132333.93BF13440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:23:20 -0500 (Tue, 04 Jan 2005) New Revision: 5360 Added: tinysofa/releases/1.1/freetype/releases/2.1.9/ tinysofa/releases/1.1/freetype/releases/2.1.9/1ts/ Modified: tinysofa/releases/1.1/freetype/current/specs/freetype.spec tinysofa/releases/1.1/freetype/releases/2.1.9/1ts/specs/freetype.spec Log: freetype: * integrate current (2.1.9-1jh) as releases/2.1.9/1ts Modified: tinysofa/releases/1.1/freetype/current/specs/freetype.spec =================================================================== --- tinysofa/releases/1.1/freetype/current/specs/freetype.spec 2005-01-04 13:23:05 UTC (rev 5359) +++ tinysofa/releases/1.1/freetype/current/specs/freetype.spec 2005-01-04 13:23:20 UTC (rev 5360) @@ -11,7 +11,7 @@ Summary: A free and portable TrueType font rendering engine. Name: freetype Version: 2.1.9 -Release: 1jh +Release: 1ts License: BSD/GPL dual license Group: extra URL: http://www.freetype.org @@ -258,6 +258,9 @@ %{_libdir}/pkgconfig/ %changelog +* Tue Jan 04 2005 tsintegrate 2.1.9-1ts +- current (2.1.9-1jh) integrated as 2.1.9-1ts for release 1.1-U3 + * Sun Sep 19 2004 Jaakko Heinonen 2.1.9-1jh - 2.1.9 Copied: tinysofa/releases/1.1/freetype/releases/2.1.9/1ts (from rev 5268, tinysofa/releases/1.1/freetype/current) Modified: tinysofa/releases/1.1/freetype/releases/2.1.9/1ts/specs/freetype.spec =================================================================== --- tinysofa/releases/1.1/freetype/current/specs/freetype.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/freetype/releases/2.1.9/1ts/specs/freetype.spec 2005-01-04 13:23:20 UTC (rev 5360) @@ -11,7 +11,7 @@ Summary: A free and portable TrueType font rendering engine. Name: freetype Version: 2.1.9 -Release: 1jh +Release: 1ts License: BSD/GPL dual license Group: extra URL: http://www.freetype.org @@ -258,6 +258,9 @@ %{_libdir}/pkgconfig/ %changelog +* Tue Jan 04 2005 tsintegrate 2.1.9-1ts +- current (2.1.9-1jh) integrated as 2.1.9-1ts for release 1.1-U3 + * Sun Sep 19 2004 Jaakko Heinonen 2.1.9-1jh - 2.1.9 From svn at tinysofa.org Tue Jan 4 13:23:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:23:43 -0500 (EST) Subject: [tinysofa-svn] r5361 - tinysofa/releases/1.1/freetype Message-ID: <20050104132343.98EB33440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:23:37 -0500 (Tue, 04 Jan 2005) New Revision: 5361 Removed: tinysofa/releases/1.1/freetype/pristine/ Log: freetype: * removing pristine (2.1.7-2ts) From svn at tinysofa.org Tue Jan 4 13:23:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:23:55 -0500 (EST) Subject: [tinysofa-svn] r5362 - tinysofa/releases/1.1/freetype Message-ID: <20050104132355.DF11A3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:23:47 -0500 (Tue, 04 Jan 2005) New Revision: 5362 Added: tinysofa/releases/1.1/freetype/pristine/ Log: freetype: * retarget pristine (2.1.7-2ts) to releases/2.1.9/1ts Copied: tinysofa/releases/1.1/freetype/pristine (from rev 5360, tinysofa/releases/1.1/freetype/releases/2.1.9/1ts) From svn at tinysofa.org Tue Jan 4 13:24:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:24:14 -0500 (EST) Subject: [tinysofa-svn] r5363 - in tinysofa/releases/1.1/gawk: current/specs releases releases/3.1.4 releases/3.1.4/1ts/specs Message-ID: <20050104132414.F19243440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:24:01 -0500 (Tue, 04 Jan 2005) New Revision: 5363 Added: tinysofa/releases/1.1/gawk/releases/3.1.4/ tinysofa/releases/1.1/gawk/releases/3.1.4/1ts/ Modified: tinysofa/releases/1.1/gawk/current/specs/gawk.spec tinysofa/releases/1.1/gawk/releases/3.1.4/1ts/specs/gawk.spec Log: gawk: * integrate current (3.1.4-1jh) as releases/3.1.4/1ts Modified: tinysofa/releases/1.1/gawk/current/specs/gawk.spec =================================================================== --- tinysofa/releases/1.1/gawk/current/specs/gawk.spec 2005-01-04 13:23:47 UTC (rev 5362) +++ tinysofa/releases/1.1/gawk/current/specs/gawk.spec 2005-01-04 13:24:01 UTC (rev 5363) @@ -1,7 +1,7 @@ Summary: The GNU version of the awk text processing utility. Name: gawk Version: 3.1.4 -Release: 1jh +Release: 1ts License: GPL Group: main Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2 @@ -85,6 +85,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.1.4-1ts +- current (3.1.4-1jh) integrated as 3.1.4-1ts for release 1.1-U3 + * Sun Sep 19 2004 Jaakko Heinonen 3.1.4-1jh - 3.1.4 - spec cleanup Copied: tinysofa/releases/1.1/gawk/releases/3.1.4/1ts (from rev 5268, tinysofa/releases/1.1/gawk/current) Modified: tinysofa/releases/1.1/gawk/releases/3.1.4/1ts/specs/gawk.spec =================================================================== --- tinysofa/releases/1.1/gawk/current/specs/gawk.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/gawk/releases/3.1.4/1ts/specs/gawk.spec 2005-01-04 13:24:01 UTC (rev 5363) @@ -1,7 +1,7 @@ Summary: The GNU version of the awk text processing utility. Name: gawk Version: 3.1.4 -Release: 1jh +Release: 1ts License: GPL Group: main Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2 @@ -85,6 +85,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.1.4-1ts +- current (3.1.4-1jh) integrated as 3.1.4-1ts for release 1.1-U3 + * Sun Sep 19 2004 Jaakko Heinonen 3.1.4-1jh - 3.1.4 - spec cleanup From svn at tinysofa.org Tue Jan 4 13:24:26 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:24:26 -0500 (EST) Subject: [tinysofa-svn] r5364 - tinysofa/releases/1.1/gawk Message-ID: <20050104132426.265E23440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:24:19 -0500 (Tue, 04 Jan 2005) New Revision: 5364 Removed: tinysofa/releases/1.1/gawk/pristine/ Log: gawk: * removing pristine (3.1.3-6ts) From svn at tinysofa.org Tue Jan 4 13:24:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:24:37 -0500 (EST) Subject: [tinysofa-svn] r5365 - tinysofa/releases/1.1/gawk Message-ID: <20050104132437.51A0A3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:24:29 -0500 (Tue, 04 Jan 2005) New Revision: 5365 Added: tinysofa/releases/1.1/gawk/pristine/ Log: gawk: * retarget pristine (3.1.3-6ts) to releases/3.1.4/1ts Copied: tinysofa/releases/1.1/gawk/pristine (from rev 5363, tinysofa/releases/1.1/gawk/releases/3.1.4/1ts) From svn at tinysofa.org Tue Jan 4 13:24:57 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:24:57 -0500 (EST) Subject: [tinysofa-svn] r5366 - in tinysofa/releases/1.1/gdb: current/specs releases releases/6.3 releases/6.3/1ts/specs Message-ID: <20050104132457.B6DEE3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:24:44 -0500 (Tue, 04 Jan 2005) New Revision: 5366 Added: tinysofa/releases/1.1/gdb/releases/6.3/ tinysofa/releases/1.1/gdb/releases/6.3/1ts/ Modified: tinysofa/releases/1.1/gdb/current/specs/gdb.spec tinysofa/releases/1.1/gdb/releases/6.3/1ts/specs/gdb.spec Log: gdb: * integrate current (6.3-1jh) as releases/6.3/1ts Modified: tinysofa/releases/1.1/gdb/current/specs/gdb.spec =================================================================== --- tinysofa/releases/1.1/gdb/current/specs/gdb.spec 2005-01-04 13:24:29 UTC (rev 5365) +++ tinysofa/releases/1.1/gdb/current/specs/gdb.spec 2005-01-04 13:24:44 UTC (rev 5366) @@ -1,7 +1,7 @@ Summary: A GNU source-level debugger for C, C++ and other languages. Name: gdb Version: 6.3 -Release: 1jh +Release: 1ts License: GPL Group: development Source0: ftp://ftp.gnu.org/gdb/gdb/gdb-%{version}/gdb-%{version}.tar.bz2 @@ -54,6 +54,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 6.3-1ts +- current (6.3-1jh) integrated as 6.3-1ts for release 1.1-U3 + * Tue Dec 21 2004 Jaakko Heinonen 6.3-1jh - 6.3 Copied: tinysofa/releases/1.1/gdb/releases/6.3/1ts (from rev 5268, tinysofa/releases/1.1/gdb/current) Modified: tinysofa/releases/1.1/gdb/releases/6.3/1ts/specs/gdb.spec =================================================================== --- tinysofa/releases/1.1/gdb/current/specs/gdb.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/gdb/releases/6.3/1ts/specs/gdb.spec 2005-01-04 13:24:44 UTC (rev 5366) @@ -1,7 +1,7 @@ Summary: A GNU source-level debugger for C, C++ and other languages. Name: gdb Version: 6.3 -Release: 1jh +Release: 1ts License: GPL Group: development Source0: ftp://ftp.gnu.org/gdb/gdb/gdb-%{version}/gdb-%{version}.tar.bz2 @@ -54,6 +54,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 6.3-1ts +- current (6.3-1jh) integrated as 6.3-1ts for release 1.1-U3 + * Tue Dec 21 2004 Jaakko Heinonen 6.3-1jh - 6.3 From svn at tinysofa.org Tue Jan 4 13:25:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:25:08 -0500 (EST) Subject: [tinysofa-svn] r5367 - tinysofa/releases/1.1/gdb Message-ID: <20050104132508.957D03440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:25:02 -0500 (Tue, 04 Jan 2005) New Revision: 5367 Removed: tinysofa/releases/1.1/gdb/pristine/ Log: gdb: * removing pristine (6.0-3ts) From svn at tinysofa.org Tue Jan 4 13:25:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:25:21 -0500 (EST) Subject: [tinysofa-svn] r5368 - tinysofa/releases/1.1/gdb Message-ID: <20050104132521.104A43440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:25:13 -0500 (Tue, 04 Jan 2005) New Revision: 5368 Added: tinysofa/releases/1.1/gdb/pristine/ Log: gdb: * retarget pristine (6.0-3ts) to releases/6.3/1ts Copied: tinysofa/releases/1.1/gdb/pristine (from rev 5366, tinysofa/releases/1.1/gdb/releases/6.3/1ts) From svn at tinysofa.org Tue Jan 4 13:25:52 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:25:52 -0500 (EST) Subject: [tinysofa-svn] r5369 - in tinysofa/releases/1.1/gettext: current/specs releases/0.14.1 releases/0.14.1/11ts/specs Message-ID: <20050104132552.653DC3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:25:38 -0500 (Tue, 04 Jan 2005) New Revision: 5369 Added: tinysofa/releases/1.1/gettext/releases/0.14.1/11ts/ Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec tinysofa/releases/1.1/gettext/releases/0.14.1/11ts/specs/gettext.spec Log: gettext: * integrate current (0.14.1-11jh) as releases/0.14.1/11ts Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec =================================================================== --- tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2005-01-04 13:25:13 UTC (rev 5368) +++ tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2005-01-04 13:25:38 UTC (rev 5369) @@ -1,7 +1,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext Version: 0.14.1 -Release: 11jh +Release: 11ts License: GPL/LGPL Group: development Source: ftp://ftp.gnu.org/gnu/gettext-%{version}.tar.gz @@ -131,6 +131,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.14.1-11ts +- current (0.14.1-11jh) integrated as 0.14.1-11ts for release 1.1-U3 + * Thu Dec 16 2004 Jaakko Heinonen 0.14.1-11jh - add gettext-0.14.1-phase0getc.patch - fix for automake 1.9 Copied: tinysofa/releases/1.1/gettext/releases/0.14.1/11ts (from rev 5268, tinysofa/releases/1.1/gettext/current) Modified: tinysofa/releases/1.1/gettext/releases/0.14.1/11ts/specs/gettext.spec =================================================================== --- tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/gettext/releases/0.14.1/11ts/specs/gettext.spec 2005-01-04 13:25:38 UTC (rev 5369) @@ -1,7 +1,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext Version: 0.14.1 -Release: 11jh +Release: 11ts License: GPL/LGPL Group: development Source: ftp://ftp.gnu.org/gnu/gettext-%{version}.tar.gz @@ -131,6 +131,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.14.1-11ts +- current (0.14.1-11jh) integrated as 0.14.1-11ts for release 1.1-U3 + * Thu Dec 16 2004 Jaakko Heinonen 0.14.1-11jh - add gettext-0.14.1-phase0getc.patch - fix for automake 1.9 From svn at tinysofa.org Tue Jan 4 13:26:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:26:02 -0500 (EST) Subject: [tinysofa-svn] r5370 - tinysofa/releases/1.1/gettext Message-ID: <20050104132602.8ADA53440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:25:56 -0500 (Tue, 04 Jan 2005) New Revision: 5370 Removed: tinysofa/releases/1.1/gettext/pristine/ Log: gettext: * removing pristine (0.14.1-9ts) From svn at tinysofa.org Tue Jan 4 13:26:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:26:14 -0500 (EST) Subject: [tinysofa-svn] r5371 - tinysofa/releases/1.1/gettext Message-ID: <20050104132614.60ABB3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:26:06 -0500 (Tue, 04 Jan 2005) New Revision: 5371 Added: tinysofa/releases/1.1/gettext/pristine/ Log: gettext: * retarget pristine (0.14.1-9ts) to releases/0.14.1/11ts Copied: tinysofa/releases/1.1/gettext/pristine (from rev 5369, tinysofa/releases/1.1/gettext/releases/0.14.1/11ts) From svn at tinysofa.org Tue Jan 4 13:26:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:26:44 -0500 (EST) Subject: [tinysofa-svn] r5372 - in tinysofa/releases/1.1/ghostscript: current/specs releases/7.07.1 releases/7.07.1/7ts/specs Message-ID: <20050104132644.3CF383440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:26:30 -0500 (Tue, 04 Jan 2005) New Revision: 5372 Added: tinysofa/releases/1.1/ghostscript/releases/7.07.1/7ts/ Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec tinysofa/releases/1.1/ghostscript/releases/7.07.1/7ts/specs/ghostscript.spec Log: ghostscript: * integrate current (7.07.1-7jh) as releases/7.07.1/7ts Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec =================================================================== --- tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2005-01-04 13:26:06 UTC (rev 5371) +++ tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2005-01-04 13:26:30 UTC (rev 5372) @@ -1,7 +1,7 @@ Summary: ESP Ghostscript Name: ghostscript Version: 7.07.1 -Release: 7jh +Release: 7ts License: GPL Group: extra Source: ftp://ftp.easysw.com/pub/ghostscript/espgs-%{version}-source.tar.bz2 @@ -85,6 +85,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 7.07.1-7ts +- current (7.07.1-7jh) integrated as 7.07.1-7ts for release 1.1-U3 + * Fri Oct 22 2004 Jaakko Heinonen 7.07.1-7jh - add tempfile patch - install cups files to correct location on multilib systems Copied: tinysofa/releases/1.1/ghostscript/releases/7.07.1/7ts (from rev 5268, tinysofa/releases/1.1/ghostscript/current) Modified: tinysofa/releases/1.1/ghostscript/releases/7.07.1/7ts/specs/ghostscript.spec =================================================================== --- tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/ghostscript/releases/7.07.1/7ts/specs/ghostscript.spec 2005-01-04 13:26:30 UTC (rev 5372) @@ -1,7 +1,7 @@ Summary: ESP Ghostscript Name: ghostscript Version: 7.07.1 -Release: 7jh +Release: 7ts License: GPL Group: extra Source: ftp://ftp.easysw.com/pub/ghostscript/espgs-%{version}-source.tar.bz2 @@ -85,6 +85,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 7.07.1-7ts +- current (7.07.1-7jh) integrated as 7.07.1-7ts for release 1.1-U3 + * Fri Oct 22 2004 Jaakko Heinonen 7.07.1-7jh - add tempfile patch - install cups files to correct location on multilib systems From svn at tinysofa.org Tue Jan 4 13:26:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:26:54 -0500 (EST) Subject: [tinysofa-svn] r5373 - tinysofa/releases/1.1/ghostscript Message-ID: <20050104132654.92D533440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:26:48 -0500 (Tue, 04 Jan 2005) New Revision: 5373 Removed: tinysofa/releases/1.1/ghostscript/pristine/ Log: ghostscript: * removing pristine (7.07.1-6ts) From svn at tinysofa.org Tue Jan 4 13:27:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:27:06 -0500 (EST) Subject: [tinysofa-svn] r5374 - tinysofa/releases/1.1/ghostscript Message-ID: <20050104132706.AE9273440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:26:58 -0500 (Tue, 04 Jan 2005) New Revision: 5374 Added: tinysofa/releases/1.1/ghostscript/pristine/ Log: ghostscript: * retarget pristine (7.07.1-6ts) to releases/7.07.1/7ts Copied: tinysofa/releases/1.1/ghostscript/pristine (from rev 5372, tinysofa/releases/1.1/ghostscript/releases/7.07.1/7ts) From svn at tinysofa.org Tue Jan 4 13:27:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:27:39 -0500 (EST) Subject: [tinysofa-svn] r5375 - in tinysofa/releases/1.1/glibc: current/specs releases/2.3.3 releases/2.3.3/3ts/specs Message-ID: <20050104132739.61BF63440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:27:25 -0500 (Tue, 04 Jan 2005) New Revision: 5375 Added: tinysofa/releases/1.1/glibc/releases/2.3.3/3ts/ Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec tinysofa/releases/1.1/glibc/releases/2.3.3/3ts/specs/glibc.spec Log: glibc: * integrate current (2.3.3-3jh) as releases/2.3.3/3ts Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec =================================================================== --- tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2005-01-04 13:26:58 UTC (rev 5374) +++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2005-01-04 13:27:25 UTC (rev 5375) @@ -9,7 +9,7 @@ Summary: The GNU libc libraries. Name: glibc Version: 2.3.3 -Release: 3jh +Release: 3ts License: LGPL Group: main Source0: %{name}-%{version}-%{glibcdate}.tar.bz2 @@ -1434,6 +1434,9 @@ %endif %changelog +* Tue Jan 04 2005 tsintegrate 2.3.3-3ts +- current (2.3.3-3jh) integrated as 2.3.3-3ts for release 1.1-U3 + * Fri Nov 12 2004 Jaakko Heinonen 2.3.3-2jh - get a bunch of the patches from FEDORA-2004-356 update - includes a fix for CAN-2004-0968 Copied: tinysofa/releases/1.1/glibc/releases/2.3.3/3ts (from rev 5268, tinysofa/releases/1.1/glibc/current) Modified: tinysofa/releases/1.1/glibc/releases/2.3.3/3ts/specs/glibc.spec =================================================================== --- tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/glibc/releases/2.3.3/3ts/specs/glibc.spec 2005-01-04 13:27:25 UTC (rev 5375) @@ -9,7 +9,7 @@ Summary: The GNU libc libraries. Name: glibc Version: 2.3.3 -Release: 3jh +Release: 3ts License: LGPL Group: main Source0: %{name}-%{version}-%{glibcdate}.tar.bz2 @@ -1434,6 +1434,9 @@ %endif %changelog +* Tue Jan 04 2005 tsintegrate 2.3.3-3ts +- current (2.3.3-3jh) integrated as 2.3.3-3ts for release 1.1-U3 + * Fri Nov 12 2004 Jaakko Heinonen 2.3.3-2jh - get a bunch of the patches from FEDORA-2004-356 update - includes a fix for CAN-2004-0968 From svn at tinysofa.org Tue Jan 4 13:27:49 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:27:49 -0500 (EST) Subject: [tinysofa-svn] r5376 - tinysofa/releases/1.1/glibc Message-ID: <20050104132749.E99B43440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:27:43 -0500 (Tue, 04 Jan 2005) New Revision: 5376 Removed: tinysofa/releases/1.1/glibc/pristine/ Log: glibc: * removing pristine (2.3.3-1ts) From svn at tinysofa.org Tue Jan 4 13:28:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:28:02 -0500 (EST) Subject: [tinysofa-svn] r5377 - tinysofa/releases/1.1/glibc Message-ID: <20050104132802.123AC3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:27:54 -0500 (Tue, 04 Jan 2005) New Revision: 5377 Added: tinysofa/releases/1.1/glibc/pristine/ Log: glibc: * retarget pristine (2.3.3-1ts) to releases/2.3.3/3ts Copied: tinysofa/releases/1.1/glibc/pristine (from rev 5375, tinysofa/releases/1.1/glibc/releases/2.3.3/3ts) From svn at tinysofa.org Tue Jan 4 13:28:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:28:21 -0500 (EST) Subject: [tinysofa-svn] r5378 - in tinysofa/releases/1.1/glib: current/specs releases releases/2.4.7 releases/2.4.7/1ts/specs Message-ID: <20050104132821.BDC6C3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:28:08 -0500 (Tue, 04 Jan 2005) New Revision: 5378 Added: tinysofa/releases/1.1/glib/releases/2.4.7/ tinysofa/releases/1.1/glib/releases/2.4.7/1ts/ Modified: tinysofa/releases/1.1/glib/current/specs/glib.spec tinysofa/releases/1.1/glib/releases/2.4.7/1ts/specs/glib.spec Log: glib: * integrate current (2.4.7-1jh) as releases/2.4.7/1ts Modified: tinysofa/releases/1.1/glib/current/specs/glib.spec =================================================================== --- tinysofa/releases/1.1/glib/current/specs/glib.spec 2005-01-04 13:27:54 UTC (rev 5377) +++ tinysofa/releases/1.1/glib/current/specs/glib.spec 2005-01-04 13:28:08 UTC (rev 5378) @@ -1,7 +1,7 @@ Summary: A library of handy utility functions. Name: glib Version: 2.4.7 -Release: 1jh +Release: 1ts License: LGPL Group: main Source: glib-%{version}.tar.bz2 @@ -100,6 +100,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.4.7-1ts +- current (2.4.7-1jh) integrated as 2.4.7-1ts for release 1.1-U3 + * Fri Aug 13 2004 Matthias Clasen - 2.4.6-1 - Update to 2.4.6 Copied: tinysofa/releases/1.1/glib/releases/2.4.7/1ts (from rev 5268, tinysofa/releases/1.1/glib/current) Modified: tinysofa/releases/1.1/glib/releases/2.4.7/1ts/specs/glib.spec =================================================================== --- tinysofa/releases/1.1/glib/current/specs/glib.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/glib/releases/2.4.7/1ts/specs/glib.spec 2005-01-04 13:28:08 UTC (rev 5378) @@ -1,7 +1,7 @@ Summary: A library of handy utility functions. Name: glib Version: 2.4.7 -Release: 1jh +Release: 1ts License: LGPL Group: main Source: glib-%{version}.tar.bz2 @@ -100,6 +100,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.4.7-1ts +- current (2.4.7-1jh) integrated as 2.4.7-1ts for release 1.1-U3 + * Fri Aug 13 2004 Matthias Clasen - 2.4.6-1 - Update to 2.4.6 From svn at tinysofa.org Tue Jan 4 13:28:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:28:32 -0500 (EST) Subject: [tinysofa-svn] r5379 - tinysofa/releases/1.1/glib Message-ID: <20050104132832.9BFA13440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:28:26 -0500 (Tue, 04 Jan 2005) New Revision: 5379 Removed: tinysofa/releases/1.1/glib/pristine/ Log: glib: * removing pristine (2.4.2-2ts) From svn at tinysofa.org Tue Jan 4 13:28:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:28:44 -0500 (EST) Subject: [tinysofa-svn] r5380 - tinysofa/releases/1.1/glib Message-ID: <20050104132844.55DBA3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:28:36 -0500 (Tue, 04 Jan 2005) New Revision: 5380 Added: tinysofa/releases/1.1/glib/pristine/ Log: glib: * retarget pristine (2.4.2-2ts) to releases/2.4.7/1ts Copied: tinysofa/releases/1.1/glib/pristine (from rev 5378, tinysofa/releases/1.1/glib/releases/2.4.7/1ts) From svn at tinysofa.org Tue Jan 4 13:29:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:29:00 -0500 (EST) Subject: [tinysofa-svn] r5381 - in tinysofa/releases/1.1/gnupg: current/specs releases releases/1.2.6 releases/1.2.6/1ts/specs Message-ID: <20050104132900.B53FB3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:28:50 -0500 (Tue, 04 Jan 2005) New Revision: 5381 Added: tinysofa/releases/1.1/gnupg/releases/1.2.6/ tinysofa/releases/1.1/gnupg/releases/1.2.6/1ts/ Modified: tinysofa/releases/1.1/gnupg/current/specs/gnupg.spec tinysofa/releases/1.1/gnupg/releases/1.2.6/1ts/specs/gnupg.spec Log: gnupg: * integrate current (1.2.6-1jh) as releases/1.2.6/1ts Modified: tinysofa/releases/1.1/gnupg/current/specs/gnupg.spec =================================================================== --- tinysofa/releases/1.1/gnupg/current/specs/gnupg.spec 2005-01-04 13:28:36 UTC (rev 5380) +++ tinysofa/releases/1.1/gnupg/current/specs/gnupg.spec 2005-01-04 13:28:50 UTC (rev 5381) @@ -1,7 +1,7 @@ Summary: A GNU utility for secure communication and data storage. Name: gnupg Version: 1.2.6 -Release: 1jh +Release: 1ts License: GPL Group: main Source: http://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.bz2 @@ -113,6 +113,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.2.6-1ts +- current (1.2.6-1jh) integrated as 1.2.6-1ts for release 1.1-U3 + * Thu Sep 30 2004 Jaakko Heinonen 1.2.6-1jh - 1.2.6 - spec cleanup Copied: tinysofa/releases/1.1/gnupg/releases/1.2.6/1ts (from rev 5268, tinysofa/releases/1.1/gnupg/current) Modified: tinysofa/releases/1.1/gnupg/releases/1.2.6/1ts/specs/gnupg.spec =================================================================== --- tinysofa/releases/1.1/gnupg/current/specs/gnupg.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/gnupg/releases/1.2.6/1ts/specs/gnupg.spec 2005-01-04 13:28:50 UTC (rev 5381) @@ -1,7 +1,7 @@ Summary: A GNU utility for secure communication and data storage. Name: gnupg Version: 1.2.6 -Release: 1jh +Release: 1ts License: GPL Group: main Source: http://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.bz2 @@ -113,6 +113,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.2.6-1ts +- current (1.2.6-1jh) integrated as 1.2.6-1ts for release 1.1-U3 + * Thu Sep 30 2004 Jaakko Heinonen 1.2.6-1jh - 1.2.6 - spec cleanup From svn at tinysofa.org Tue Jan 4 13:29:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:29:09 -0500 (EST) Subject: [tinysofa-svn] r5382 - tinysofa/releases/1.1/gnupg Message-ID: <20050104132909.84D153440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:29:04 -0500 (Tue, 04 Jan 2005) New Revision: 5382 Removed: tinysofa/releases/1.1/gnupg/pristine/ Log: gnupg: * removing pristine (1.2.4-6ts) From svn at tinysofa.org Tue Jan 4 13:29:19 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:29:19 -0500 (EST) Subject: [tinysofa-svn] r5383 - tinysofa/releases/1.1/gnupg Message-ID: <20050104132919.50E643440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:29:13 -0500 (Tue, 04 Jan 2005) New Revision: 5383 Added: tinysofa/releases/1.1/gnupg/pristine/ Log: gnupg: * retarget pristine (1.2.4-6ts) to releases/1.2.6/1ts Copied: tinysofa/releases/1.1/gnupg/pristine (from rev 5381, tinysofa/releases/1.1/gnupg/releases/1.2.6/1ts) From svn at tinysofa.org Tue Jan 4 13:29:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:29:43 -0500 (EST) Subject: [tinysofa-svn] r5384 - in tinysofa/releases/1.1/groff: current/specs releases/1.19.1 releases/1.19.1/3ts/specs Message-ID: <20050104132943.4C3223440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:29:33 -0500 (Tue, 04 Jan 2005) New Revision: 5384 Added: tinysofa/releases/1.1/groff/releases/1.19.1/3ts/ Modified: tinysofa/releases/1.1/groff/current/specs/groff.spec tinysofa/releases/1.1/groff/releases/1.19.1/3ts/specs/groff.spec Log: groff: * integrate current (1.19.1-3jh) as releases/1.19.1/3ts Modified: tinysofa/releases/1.1/groff/current/specs/groff.spec =================================================================== --- tinysofa/releases/1.1/groff/current/specs/groff.spec 2005-01-04 13:29:13 UTC (rev 5383) +++ tinysofa/releases/1.1/groff/current/specs/groff.spec 2005-01-04 13:29:33 UTC (rev 5384) @@ -1,7 +1,7 @@ Summary: A document formatting system. Name: groff Version: 1.19.1 -Release: 3jh +Release: 3ts License: GPL Group: main Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz @@ -119,6 +119,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.19.1-3ts +- current (1.19.1-3jh) integrated as 1.19.1-3ts for release 1.1-U3 + * Wed Oct 27 2004 Jaakko Heinonen 1.19.1-3jh - add tempfile patch Copied: tinysofa/releases/1.1/groff/releases/1.19.1/3ts (from rev 5268, tinysofa/releases/1.1/groff/current) Modified: tinysofa/releases/1.1/groff/releases/1.19.1/3ts/specs/groff.spec =================================================================== --- tinysofa/releases/1.1/groff/current/specs/groff.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/groff/releases/1.19.1/3ts/specs/groff.spec 2005-01-04 13:29:33 UTC (rev 5384) @@ -1,7 +1,7 @@ Summary: A document formatting system. Name: groff Version: 1.19.1 -Release: 3jh +Release: 3ts License: GPL Group: main Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz @@ -119,6 +119,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.19.1-3ts +- current (1.19.1-3jh) integrated as 1.19.1-3ts for release 1.1-U3 + * Wed Oct 27 2004 Jaakko Heinonen 1.19.1-3jh - add tempfile patch From svn at tinysofa.org Tue Jan 4 13:29:52 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:29:52 -0500 (EST) Subject: [tinysofa-svn] r5385 - tinysofa/releases/1.1/groff Message-ID: <20050104132952.2A8BE3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:29:47 -0500 (Tue, 04 Jan 2005) New Revision: 5385 Removed: tinysofa/releases/1.1/groff/pristine/ Log: groff: * removing pristine (1.19.1-2ts) From svn at tinysofa.org Tue Jan 4 13:30:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:30:02 -0500 (EST) Subject: [tinysofa-svn] r5386 - tinysofa/releases/1.1/groff Message-ID: <20050104133002.AD45A3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:29:56 -0500 (Tue, 04 Jan 2005) New Revision: 5386 Added: tinysofa/releases/1.1/groff/pristine/ Log: groff: * retarget pristine (1.19.1-2ts) to releases/1.19.1/3ts Copied: tinysofa/releases/1.1/groff/pristine (from rev 5384, tinysofa/releases/1.1/groff/releases/1.19.1/3ts) From svn at tinysofa.org Tue Jan 4 13:30:20 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:30:20 -0500 (EST) Subject: [tinysofa-svn] r5387 - in tinysofa/releases/1.1/grub: current/specs releases releases/0.95 releases/0.95/2ts/specs Message-ID: <20050104133020.303F93440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:30:09 -0500 (Tue, 04 Jan 2005) New Revision: 5387 Added: tinysofa/releases/1.1/grub/releases/0.95/ tinysofa/releases/1.1/grub/releases/0.95/2ts/ Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec tinysofa/releases/1.1/grub/releases/0.95/2ts/specs/grub.spec Log: grub: * integrate current (0.95-2jh) as releases/0.95/2ts Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec =================================================================== --- tinysofa/releases/1.1/grub/current/specs/grub.spec 2005-01-04 13:29:56 UTC (rev 5386) +++ tinysofa/releases/1.1/grub/current/specs/grub.spec 2005-01-04 13:30:09 UTC (rev 5387) @@ -1,6 +1,6 @@ Name: grub Version: 0.95 -Release: 2jh +Release: 2ts Summary: GRUB - the Grand Unified Boot Loader. Group: main License: GPL @@ -140,6 +140,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.95-2ts +- current (0.95-2jh) integrated as 0.95-2ts for release 1.1-U3 + * Sun Dec 19 2004 Jaakko Heinonen 0.95-2jh - add patches from Fedora Copied: tinysofa/releases/1.1/grub/releases/0.95/2ts (from rev 5268, tinysofa/releases/1.1/grub/current) Modified: tinysofa/releases/1.1/grub/releases/0.95/2ts/specs/grub.spec =================================================================== --- tinysofa/releases/1.1/grub/current/specs/grub.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/grub/releases/0.95/2ts/specs/grub.spec 2005-01-04 13:30:09 UTC (rev 5387) @@ -1,6 +1,6 @@ Name: grub Version: 0.95 -Release: 2jh +Release: 2ts Summary: GRUB - the Grand Unified Boot Loader. Group: main License: GPL @@ -140,6 +140,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.95-2ts +- current (0.95-2jh) integrated as 0.95-2ts for release 1.1-U3 + * Sun Dec 19 2004 Jaakko Heinonen 0.95-2jh - add patches from Fedora From svn at tinysofa.org Tue Jan 4 13:30:29 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:30:29 -0500 (EST) Subject: [tinysofa-svn] r5388 - tinysofa/releases/1.1/grub Message-ID: <20050104133029.3E4D03440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:30:24 -0500 (Tue, 04 Jan 2005) New Revision: 5388 Removed: tinysofa/releases/1.1/grub/pristine/ Log: grub: * removing pristine (0.94-3ts) From svn at tinysofa.org Tue Jan 4 13:30:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:30:39 -0500 (EST) Subject: [tinysofa-svn] r5389 - tinysofa/releases/1.1/grub Message-ID: <20050104133039.87A6D3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:30:33 -0500 (Tue, 04 Jan 2005) New Revision: 5389 Added: tinysofa/releases/1.1/grub/pristine/ Log: grub: * retarget pristine (0.94-3ts) to releases/0.95/2ts Copied: tinysofa/releases/1.1/grub/pristine (from rev 5387, tinysofa/releases/1.1/grub/releases/0.95/2ts) From svn at tinysofa.org Tue Jan 4 13:30:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:30:55 -0500 (EST) Subject: [tinysofa-svn] r5390 - in tinysofa/releases/1.1/gzip: current/specs releases releases/1.3.3 releases/1.3.3/1ts/specs Message-ID: <20050104133055.CAC923440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:30:45 -0500 (Tue, 04 Jan 2005) New Revision: 5390 Added: tinysofa/releases/1.1/gzip/releases/1.3.3/ tinysofa/releases/1.1/gzip/releases/1.3.3/1ts/ Modified: tinysofa/releases/1.1/gzip/current/specs/gzip.spec tinysofa/releases/1.1/gzip/releases/1.3.3/1ts/specs/gzip.spec Log: gzip: * integrate current (1.3.3-1jh) as releases/1.3.3/1ts Modified: tinysofa/releases/1.1/gzip/current/specs/gzip.spec =================================================================== --- tinysofa/releases/1.1/gzip/current/specs/gzip.spec 2005-01-04 13:30:33 UTC (rev 5389) +++ tinysofa/releases/1.1/gzip/current/specs/gzip.spec 2005-01-04 13:30:45 UTC (rev 5390) @@ -1,7 +1,7 @@ Summary: The GNU data compression program. Name: gzip Version: 1.3.3 -Release: 1jh +Release: 1ts License: GPL Group: main Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz @@ -75,6 +75,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.3.3-1ts +- current (1.3.3-1jh) integrated as 1.3.3-1ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt Copied: tinysofa/releases/1.1/gzip/releases/1.3.3/1ts (from rev 5268, tinysofa/releases/1.1/gzip/current) Modified: tinysofa/releases/1.1/gzip/releases/1.3.3/1ts/specs/gzip.spec =================================================================== --- tinysofa/releases/1.1/gzip/current/specs/gzip.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/gzip/releases/1.3.3/1ts/specs/gzip.spec 2005-01-04 13:30:45 UTC (rev 5390) @@ -1,7 +1,7 @@ Summary: The GNU data compression program. Name: gzip Version: 1.3.3 -Release: 1jh +Release: 1ts License: GPL Group: main Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz @@ -75,6 +75,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.3.3-1ts +- current (1.3.3-1jh) integrated as 1.3.3-1ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt From svn at tinysofa.org Tue Jan 4 13:31:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:31:04 -0500 (EST) Subject: [tinysofa-svn] r5391 - tinysofa/releases/1.1/gzip Message-ID: <20050104133104.2227C3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:30:59 -0500 (Tue, 04 Jan 2005) New Revision: 5391 Removed: tinysofa/releases/1.1/gzip/pristine/ Log: gzip: * removing pristine (1.2.4a-31ts) From svn at tinysofa.org Tue Jan 4 13:31:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:31:14 -0500 (EST) Subject: [tinysofa-svn] r5392 - tinysofa/releases/1.1/gzip Message-ID: <20050104133114.4DA983440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:31:08 -0500 (Tue, 04 Jan 2005) New Revision: 5392 Added: tinysofa/releases/1.1/gzip/pristine/ Log: gzip: * retarget pristine (1.2.4a-31ts) to releases/1.3.3/1ts Copied: tinysofa/releases/1.1/gzip/pristine (from rev 5390, tinysofa/releases/1.1/gzip/releases/1.3.3/1ts) From svn at tinysofa.org Tue Jan 4 13:31:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:31:31 -0500 (EST) Subject: [tinysofa-svn] r5393 - in tinysofa/releases/1.1/httpd: current/specs releases releases/2.0.52 releases/2.0.52/1ts/specs Message-ID: <20050104133131.00E9F3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:31:21 -0500 (Tue, 04 Jan 2005) New Revision: 5393 Added: tinysofa/releases/1.1/httpd/releases/2.0.52/ tinysofa/releases/1.1/httpd/releases/2.0.52/1ts/ Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec tinysofa/releases/1.1/httpd/releases/2.0.52/1ts/specs/httpd.spec Log: httpd: * integrate current (2.0.52-1jh) as releases/2.0.52/1ts Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec =================================================================== --- tinysofa/releases/1.1/httpd/current/specs/httpd.spec 2005-01-04 13:31:08 UTC (rev 5392) +++ tinysofa/releases/1.1/httpd/current/specs/httpd.spec 2005-01-04 13:31:21 UTC (rev 5393) @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.0.52 -Release: 1jh +Release: 1ts URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html.tinysofa @@ -568,6 +568,9 @@ %{_mandir}/man8/suexec.8* %changelog +* Tue Jan 04 2005 tsintegrate 2.0.52-1ts +- current (2.0.52-1jh) integrated as 2.0.52-1ts for release 1.1-U3 + * Tue Nov 16 2004 Jaakko Heinonen 2.0.52-1jh - update to 2.0.52 - include all Fedora patches Copied: tinysofa/releases/1.1/httpd/releases/2.0.52/1ts (from rev 5268, tinysofa/releases/1.1/httpd/current) Modified: tinysofa/releases/1.1/httpd/releases/2.0.52/1ts/specs/httpd.spec =================================================================== --- tinysofa/releases/1.1/httpd/current/specs/httpd.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/httpd/releases/2.0.52/1ts/specs/httpd.spec 2005-01-04 13:31:21 UTC (rev 5393) @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.0.52 -Release: 1jh +Release: 1ts URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html.tinysofa @@ -568,6 +568,9 @@ %{_mandir}/man8/suexec.8* %changelog +* Tue Jan 04 2005 tsintegrate 2.0.52-1ts +- current (2.0.52-1jh) integrated as 2.0.52-1ts for release 1.1-U3 + * Tue Nov 16 2004 Jaakko Heinonen 2.0.52-1jh - update to 2.0.52 - include all Fedora patches From svn at tinysofa.org Tue Jan 4 13:31:41 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:31:41 -0500 (EST) Subject: [tinysofa-svn] r5394 - tinysofa/releases/1.1/httpd Message-ID: <20050104133141.53A533440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:31:36 -0500 (Tue, 04 Jan 2005) New Revision: 5394 Removed: tinysofa/releases/1.1/httpd/pristine/ Log: httpd: * removing pristine (2.0.50-3ts) From svn at tinysofa.org Tue Jan 4 13:31:52 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:31:52 -0500 (EST) Subject: [tinysofa-svn] r5395 - tinysofa/releases/1.1/httpd Message-ID: <20050104133152.11C463440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:31:45 -0500 (Tue, 04 Jan 2005) New Revision: 5395 Added: tinysofa/releases/1.1/httpd/pristine/ Log: httpd: * retarget pristine (2.0.50-3ts) to releases/2.0.52/1ts Copied: tinysofa/releases/1.1/httpd/pristine (from rev 5393, tinysofa/releases/1.1/httpd/releases/2.0.52/1ts) From svn at tinysofa.org Tue Jan 4 13:32:29 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:32:29 -0500 (EST) Subject: [tinysofa-svn] r5397 - tinysofa/releases/1.1/hwdata Message-ID: <20050104133229.3E0BC3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:32:24 -0500 (Tue, 04 Jan 2005) New Revision: 5397 Removed: tinysofa/releases/1.1/hwdata/pristine/ Log: hwdata: * removing pristine (0.44-20ts) From svn at tinysofa.org Tue Jan 4 13:32:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:32:39 -0500 (EST) Subject: [tinysofa-svn] r5398 - tinysofa/releases/1.1/hwdata Message-ID: <20050104133239.4F6743440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:32:33 -0500 (Tue, 04 Jan 2005) New Revision: 5398 Added: tinysofa/releases/1.1/hwdata/pristine/ Log: hwdata: * retarget pristine (0.44-20ts) to releases/0.44/22ts Copied: tinysofa/releases/1.1/hwdata/pristine (from rev 5396, tinysofa/releases/1.1/hwdata/releases/0.44/22ts) From svn at tinysofa.org Tue Jan 4 13:33:05 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:33:05 -0500 (EST) Subject: [tinysofa-svn] r5399 - in tinysofa/releases/1.1/initscripts: current/specs releases/7.31.9 releases/7.31.9/9ts/specs Message-ID: <20050104133305.525913440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:32:54 -0500 (Tue, 04 Jan 2005) New Revision: 5399 Added: tinysofa/releases/1.1/initscripts/releases/7.31.9/9ts/ Modified: tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec tinysofa/releases/1.1/initscripts/releases/7.31.9/9ts/specs/initscripts.spec Log: initscripts: * integrate current (7.31.9-9jh) as releases/7.31.9/9ts Modified: tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec 2005-01-04 13:32:33 UTC (rev 5398) +++ tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec 2005-01-04 13:32:54 UTC (rev 5399) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: main -Release: 9jh +Release: 9ts Source: initscripts-%{version}.tar.bz2 URL: http://rhlinux.redhat.com/initscripts/ Patch0: initscripts-s390.patch @@ -210,6 +210,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 7.31.9-9ts +- current (7.31.9-9jh) integrated as 7.31.9-9ts for release 1.1-U3 + * Tue Nov 9 2004 Jaakko Heinonen 7.31-9jh - add dovecot patch - apply patches nicely Copied: tinysofa/releases/1.1/initscripts/releases/7.31.9/9ts (from rev 5268, tinysofa/releases/1.1/initscripts/current) Modified: tinysofa/releases/1.1/initscripts/releases/7.31.9/9ts/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/initscripts/releases/7.31.9/9ts/specs/initscripts.spec 2005-01-04 13:32:54 UTC (rev 5399) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: main -Release: 9jh +Release: 9ts Source: initscripts-%{version}.tar.bz2 URL: http://rhlinux.redhat.com/initscripts/ Patch0: initscripts-s390.patch @@ -210,6 +210,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 7.31.9-9ts +- current (7.31.9-9jh) integrated as 7.31.9-9ts for release 1.1-U3 + * Tue Nov 9 2004 Jaakko Heinonen 7.31-9jh - add dovecot patch - apply patches nicely From svn at tinysofa.org Tue Jan 4 13:33:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:33:14 -0500 (EST) Subject: [tinysofa-svn] r5400 - tinysofa/releases/1.1/initscripts Message-ID: <20050104133314.31F293440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:33:09 -0500 (Tue, 04 Jan 2005) New Revision: 5400 Removed: tinysofa/releases/1.1/initscripts/pristine/ Log: initscripts: * removing pristine (7.31.9-5ts) From svn at tinysofa.org Tue Jan 4 13:33:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:33:24 -0500 (EST) Subject: [tinysofa-svn] r5401 - tinysofa/releases/1.1/initscripts Message-ID: <20050104133324.68C473440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:33:18 -0500 (Tue, 04 Jan 2005) New Revision: 5401 Added: tinysofa/releases/1.1/initscripts/pristine/ Log: initscripts: * retarget pristine (7.31.9-5ts) to releases/7.31.9/9ts Copied: tinysofa/releases/1.1/initscripts/pristine (from rev 5399, tinysofa/releases/1.1/initscripts/releases/7.31.9/9ts) From svn at tinysofa.org Tue Jan 4 13:33:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:33:40 -0500 (EST) Subject: [tinysofa-svn] r5402 - in tinysofa/releases/1.1/iptables: current/specs releases releases/1.2.11 releases/1.2.11/1ts/specs Message-ID: <20050104133340.A0A743440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:33:30 -0500 (Tue, 04 Jan 2005) New Revision: 5402 Added: tinysofa/releases/1.1/iptables/releases/1.2.11/ tinysofa/releases/1.1/iptables/releases/1.2.11/1ts/ Modified: tinysofa/releases/1.1/iptables/current/specs/iptables.spec tinysofa/releases/1.1/iptables/releases/1.2.11/1ts/specs/iptables.spec Log: iptables: * integrate current (1.2.11-1jh) as releases/1.2.11/1ts Modified: tinysofa/releases/1.1/iptables/current/specs/iptables.spec =================================================================== --- tinysofa/releases/1.1/iptables/current/specs/iptables.spec 2005-01-04 13:33:18 UTC (rev 5401) +++ tinysofa/releases/1.1/iptables/current/specs/iptables.spec 2005-01-04 13:33:30 UTC (rev 5402) @@ -1,7 +1,7 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities. Version: 1.2.11 -Release: 1jh +Release: 1ts Source: http://www.netfilter.org/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables6.init @@ -107,6 +107,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.2.11-1ts +- current (1.2.11-1jh) integrated as 1.2.11-1ts for release 1.1-U3 + * Wed Dec 8 2004 Jaakko Heinonen 1.2.11-1jh - update to 1.2.11, fixes CAN-2004-0986 Copied: tinysofa/releases/1.1/iptables/releases/1.2.11/1ts (from rev 5268, tinysofa/releases/1.1/iptables/current) Modified: tinysofa/releases/1.1/iptables/releases/1.2.11/1ts/specs/iptables.spec =================================================================== --- tinysofa/releases/1.1/iptables/current/specs/iptables.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/iptables/releases/1.2.11/1ts/specs/iptables.spec 2005-01-04 13:33:30 UTC (rev 5402) @@ -1,7 +1,7 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities. Version: 1.2.11 -Release: 1jh +Release: 1ts Source: http://www.netfilter.org/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables6.init @@ -107,6 +107,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.2.11-1ts +- current (1.2.11-1jh) integrated as 1.2.11-1ts for release 1.1-U3 + * Wed Dec 8 2004 Jaakko Heinonen 1.2.11-1jh - update to 1.2.11, fixes CAN-2004-0986 From svn at tinysofa.org Tue Jan 4 13:33:49 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:33:49 -0500 (EST) Subject: [tinysofa-svn] r5403 - tinysofa/releases/1.1/iptables Message-ID: <20050104133349.2960A3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:33:44 -0500 (Tue, 04 Jan 2005) New Revision: 5403 Removed: tinysofa/releases/1.1/iptables/pristine/ Log: iptables: * removing pristine (1.2.10-2ts) From svn at tinysofa.org Tue Jan 4 13:34:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:34:02 -0500 (EST) Subject: [tinysofa-svn] r5404 - tinysofa/releases/1.1/iptables Message-ID: <20050104133402.569943440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:33:53 -0500 (Tue, 04 Jan 2005) New Revision: 5404 Added: tinysofa/releases/1.1/iptables/pristine/ Log: iptables: * retarget pristine (1.2.10-2ts) to releases/1.2.11/1ts Copied: tinysofa/releases/1.1/iptables/pristine (from rev 5402, tinysofa/releases/1.1/iptables/releases/1.2.11/1ts) From svn at tinysofa.org Tue Jan 4 13:34:26 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:34:26 -0500 (EST) Subject: [tinysofa-svn] r5405 - in tinysofa/releases/1.1/jwhois: current/specs releases/3.2.2 releases/3.2.2/7ts/specs Message-ID: <20050104133426.D931D3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:34:16 -0500 (Tue, 04 Jan 2005) New Revision: 5405 Added: tinysofa/releases/1.1/jwhois/releases/3.2.2/7ts/ Modified: tinysofa/releases/1.1/jwhois/current/specs/jwhois.spec tinysofa/releases/1.1/jwhois/releases/3.2.2/7ts/specs/jwhois.spec Log: jwhois: * integrate current (3.2.2-7jh) as releases/3.2.2/7ts Modified: tinysofa/releases/1.1/jwhois/current/specs/jwhois.spec =================================================================== --- tinysofa/releases/1.1/jwhois/current/specs/jwhois.spec 2005-01-04 13:33:53 UTC (rev 5404) +++ tinysofa/releases/1.1/jwhois/current/specs/jwhois.spec 2005-01-04 13:34:16 UTC (rev 5405) @@ -1,6 +1,6 @@ Name: jwhois Version: 3.2.2 -Release: 7jh +Release: 7ts URL: http://www.gnu.org/software/jwhois/ Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz Patch0: jwhois-3.2.2-typos.patch @@ -56,6 +56,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.2.2-7ts +- current (3.2.2-7jh) integrated as 3.2.2-7ts for release 1.1-U3 + * Mon Nov 1 2004 Miloslav Trmac - 3.2.2-7 - Fix double free (#137693) Copied: tinysofa/releases/1.1/jwhois/releases/3.2.2/7ts (from rev 5268, tinysofa/releases/1.1/jwhois/current) Modified: tinysofa/releases/1.1/jwhois/releases/3.2.2/7ts/specs/jwhois.spec =================================================================== --- tinysofa/releases/1.1/jwhois/current/specs/jwhois.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/jwhois/releases/3.2.2/7ts/specs/jwhois.spec 2005-01-04 13:34:16 UTC (rev 5405) @@ -1,6 +1,6 @@ Name: jwhois Version: 3.2.2 -Release: 7jh +Release: 7ts URL: http://www.gnu.org/software/jwhois/ Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz Patch0: jwhois-3.2.2-typos.patch @@ -56,6 +56,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.2.2-7ts +- current (3.2.2-7jh) integrated as 3.2.2-7ts for release 1.1-U3 + * Mon Nov 1 2004 Miloslav Trmac - 3.2.2-7 - Fix double free (#137693) From svn at tinysofa.org Tue Jan 4 13:34:35 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:34:35 -0500 (EST) Subject: [tinysofa-svn] r5406 - tinysofa/releases/1.1/jwhois Message-ID: <20050104133435.B17D33440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:34:30 -0500 (Tue, 04 Jan 2005) New Revision: 5406 Removed: tinysofa/releases/1.1/jwhois/pristine/ Log: jwhois: * removing pristine (3.2.2-6ts) From svn at tinysofa.org Tue Jan 4 13:34:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:34:45 -0500 (EST) Subject: [tinysofa-svn] r5407 - tinysofa/releases/1.1/jwhois Message-ID: <20050104133445.613D93440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:34:39 -0500 (Tue, 04 Jan 2005) New Revision: 5407 Added: tinysofa/releases/1.1/jwhois/pristine/ Log: jwhois: * retarget pristine (3.2.2-6ts) to releases/3.2.2/7ts Copied: tinysofa/releases/1.1/jwhois/pristine (from rev 5405, tinysofa/releases/1.1/jwhois/releases/3.2.2/7ts) From svn at tinysofa.org Tue Jan 4 13:43:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:43:32 -0500 (EST) Subject: [tinysofa-svn] r5409 - tinysofa/releases/1.1/kernel Message-ID: <20050104134332.58D483440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:43:25 -0500 (Tue, 04 Jan 2005) New Revision: 5409 Removed: tinysofa/releases/1.1/kernel/pristine/ Log: kernel: * removing pristine (2.4.21-4ts) From svn at tinysofa.org Tue Jan 4 13:44:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:44:02 -0500 (EST) Subject: [tinysofa-svn] r5410 - tinysofa/releases/1.1/kernel Message-ID: <20050104134402.00E823440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:43:55 -0500 (Tue, 04 Jan 2005) New Revision: 5410 Added: tinysofa/releases/1.1/kernel/pristine/ Log: kernel: * retarget pristine (2.4.21-4ts) to releases/2.4.21/8ts Copied: tinysofa/releases/1.1/kernel/pristine (from rev 5408, tinysofa/releases/1.1/kernel/releases/2.4.21/8ts) From svn at tinysofa.org Tue Jan 4 13:44:30 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:44:30 -0500 (EST) Subject: [tinysofa-svn] r5411 - in tinysofa/releases/1.1/libpng: current/specs releases releases/1.2.7 releases/1.2.7/2ts/specs Message-ID: <20050104134430.A7FB03440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:44:16 -0500 (Tue, 04 Jan 2005) New Revision: 5411 Added: tinysofa/releases/1.1/libpng/releases/1.2.7/ tinysofa/releases/1.1/libpng/releases/1.2.7/2ts/ Modified: tinysofa/releases/1.1/libpng/current/specs/libpng.spec tinysofa/releases/1.1/libpng/releases/1.2.7/2ts/specs/libpng.spec Log: libpng: * integrate current (1.2.7-2gd) as releases/1.2.7/2ts Modified: tinysofa/releases/1.1/libpng/current/specs/libpng.spec =================================================================== --- tinysofa/releases/1.1/libpng/current/specs/libpng.spec 2005-01-04 13:43:55 UTC (rev 5410) +++ tinysofa/releases/1.1/libpng/current/specs/libpng.spec 2005-01-04 13:44:16 UTC (rev 5411) @@ -1,7 +1,7 @@ Summary: libpng, library for working with PNG files Name: libpng Version: 1.2.7 -Release: 2gd +Release: 2ts License: OSI Group: extra Source: http://www.libpng.org/pub/png/src/%{name}-%{version}.tar.bz2 @@ -118,6 +118,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.2.7-2ts +- current (1.2.7-2gd) integrated as 1.2.7-2ts for release 1.1-U3 + * Sun Oct 31 2004 Gerald Dachs 1.2.7-2gd - added libz patch Copied: tinysofa/releases/1.1/libpng/releases/1.2.7/2ts (from rev 5268, tinysofa/releases/1.1/libpng/current) Modified: tinysofa/releases/1.1/libpng/releases/1.2.7/2ts/specs/libpng.spec =================================================================== --- tinysofa/releases/1.1/libpng/current/specs/libpng.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/libpng/releases/1.2.7/2ts/specs/libpng.spec 2005-01-04 13:44:16 UTC (rev 5411) @@ -1,7 +1,7 @@ Summary: libpng, library for working with PNG files Name: libpng Version: 1.2.7 -Release: 2gd +Release: 2ts License: OSI Group: extra Source: http://www.libpng.org/pub/png/src/%{name}-%{version}.tar.bz2 @@ -118,6 +118,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.2.7-2ts +- current (1.2.7-2gd) integrated as 1.2.7-2ts for release 1.1-U3 + * Sun Oct 31 2004 Gerald Dachs 1.2.7-2gd - added libz patch From svn at tinysofa.org Tue Jan 4 13:44:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:44:40 -0500 (EST) Subject: [tinysofa-svn] r5412 - tinysofa/releases/1.1/libpng Message-ID: <20050104134440.9D2373440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:44:34 -0500 (Tue, 04 Jan 2005) New Revision: 5412 Removed: tinysofa/releases/1.1/libpng/pristine/ Log: libpng: * removing pristine (1.2.5-14ts) From svn at tinysofa.org Tue Jan 4 13:44:52 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:44:52 -0500 (EST) Subject: [tinysofa-svn] r5413 - tinysofa/releases/1.1/libpng Message-ID: <20050104134452.394DE3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:44:44 -0500 (Tue, 04 Jan 2005) New Revision: 5413 Added: tinysofa/releases/1.1/libpng/pristine/ Log: libpng: * retarget pristine (1.2.5-14ts) to releases/1.2.7/2ts Copied: tinysofa/releases/1.1/libpng/pristine (from rev 5411, tinysofa/releases/1.1/libpng/releases/1.2.7/2ts) From svn at tinysofa.org Tue Jan 4 13:45:23 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:45:23 -0500 (EST) Subject: [tinysofa-svn] r5415 - tinysofa/releases/1.1/libtiff Message-ID: <20050104134523.A1C733440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:45:17 -0500 (Tue, 04 Jan 2005) New Revision: 5415 Removed: tinysofa/releases/1.1/libtiff/pristine/ Log: libtiff: * removing pristine (3.6.0-6ts) From svn at tinysofa.org Tue Jan 4 13:45:13 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:45:13 -0500 (EST) Subject: [tinysofa-svn] r5414 - in tinysofa/releases/1.1/libtiff: current/specs releases releases/3.6.1 releases/3.6.1/2ts/specs Message-ID: <20050104134513.BF07A3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:45:00 -0500 (Tue, 04 Jan 2005) New Revision: 5414 Added: tinysofa/releases/1.1/libtiff/releases/3.6.1/ tinysofa/releases/1.1/libtiff/releases/3.6.1/2ts/ Modified: tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec tinysofa/releases/1.1/libtiff/releases/3.6.1/2ts/specs/libtiff.spec Log: libtiff: * integrate current (3.6.1-2jh) as releases/3.6.1/2ts Modified: tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec =================================================================== --- tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2005-01-04 13:44:44 UTC (rev 5413) +++ tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2005-01-04 13:45:00 UTC (rev 5414) @@ -1,7 +1,7 @@ Summary: A library of functions for manipulating TIFF format image files. Name: libtiff Version: 3.6.1 -Release: 2jh +Release: 2ts License: distributable Group: extra Source0: http://www.libtiff.org/tiff-v%{version}.tar.gz @@ -121,6 +121,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.6.1-2ts +- current (3.6.1-2jh) integrated as 3.6.1-2ts for release 1.1-U3 + * Thu Dec 23 2004 Jaakko Heinonen 3.6.1-2jh - add fix for CAN-2004-1308 Copied: tinysofa/releases/1.1/libtiff/releases/3.6.1/2ts (from rev 5268, tinysofa/releases/1.1/libtiff/current) Modified: tinysofa/releases/1.1/libtiff/releases/3.6.1/2ts/specs/libtiff.spec =================================================================== --- tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/libtiff/releases/3.6.1/2ts/specs/libtiff.spec 2005-01-04 13:45:00 UTC (rev 5414) @@ -1,7 +1,7 @@ Summary: A library of functions for manipulating TIFF format image files. Name: libtiff Version: 3.6.1 -Release: 2jh +Release: 2ts License: distributable Group: extra Source0: http://www.libtiff.org/tiff-v%{version}.tar.gz @@ -121,6 +121,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.6.1-2ts +- current (3.6.1-2jh) integrated as 3.6.1-2ts for release 1.1-U3 + * Thu Dec 23 2004 Jaakko Heinonen 3.6.1-2jh - add fix for CAN-2004-1308 From svn at tinysofa.org Tue Jan 4 13:45:35 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:45:35 -0500 (EST) Subject: [tinysofa-svn] r5416 - tinysofa/releases/1.1/libtiff Message-ID: <20050104134535.449FD3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:45:27 -0500 (Tue, 04 Jan 2005) New Revision: 5416 Added: tinysofa/releases/1.1/libtiff/pristine/ Log: libtiff: * retarget pristine (3.6.0-6ts) to releases/3.6.1/2ts Copied: tinysofa/releases/1.1/libtiff/pristine (from rev 5414, tinysofa/releases/1.1/libtiff/releases/3.6.1/2ts) From svn at tinysofa.org Tue Jan 4 13:46:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:46:04 -0500 (EST) Subject: [tinysofa-svn] r5418 - tinysofa/releases/1.1/libtool Message-ID: <20050104134604.97CE43440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:45:58 -0500 (Tue, 04 Jan 2005) New Revision: 5418 Removed: tinysofa/releases/1.1/libtool/pristine/ Log: libtool: * removing pristine (1.5.6-3ts) From svn at tinysofa.org Tue Jan 4 13:45:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:45:54 -0500 (EST) Subject: [tinysofa-svn] r5417 - in tinysofa/releases/1.1/libtool: current/specs releases releases/1.5.10 releases/1.5.10/1ts/specs Message-ID: <20050104134554.2F4BF3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:45:40 -0500 (Tue, 04 Jan 2005) New Revision: 5417 Added: tinysofa/releases/1.1/libtool/releases/1.5.10/ tinysofa/releases/1.1/libtool/releases/1.5.10/1ts/ Modified: tinysofa/releases/1.1/libtool/current/specs/libtool.spec tinysofa/releases/1.1/libtool/releases/1.5.10/1ts/specs/libtool.spec Log: libtool: * integrate current (1.5.10-1jh) as releases/1.5.10/1ts Modified: tinysofa/releases/1.1/libtool/current/specs/libtool.spec =================================================================== --- tinysofa/releases/1.1/libtool/current/specs/libtool.spec 2005-01-04 13:45:27 UTC (rev 5416) +++ tinysofa/releases/1.1/libtool/current/specs/libtool.spec 2005-01-04 13:45:40 UTC (rev 5417) @@ -1,7 +1,7 @@ Summary: The GNU libtool, which simplifies the use of shared libraries. Name: libtool Version: 1.5.10 -Release: 1jh +Release: 1ts License: GPL Group: development Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.gz @@ -79,6 +79,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.5.10-1ts +- current (1.5.10-1jh) integrated as 1.5.10-1ts for release 1.1-U3 + * Tue Oct 26 2004 Daniel Reed 1.5.10-1 - update to the 1.5.10 bugfix release - obsoletes libtool-1.4-nonneg.patch Copied: tinysofa/releases/1.1/libtool/releases/1.5.10/1ts (from rev 5268, tinysofa/releases/1.1/libtool/current) Modified: tinysofa/releases/1.1/libtool/releases/1.5.10/1ts/specs/libtool.spec =================================================================== --- tinysofa/releases/1.1/libtool/current/specs/libtool.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/libtool/releases/1.5.10/1ts/specs/libtool.spec 2005-01-04 13:45:40 UTC (rev 5417) @@ -1,7 +1,7 @@ Summary: The GNU libtool, which simplifies the use of shared libraries. Name: libtool Version: 1.5.10 -Release: 1jh +Release: 1ts License: GPL Group: development Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.gz @@ -79,6 +79,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.5.10-1ts +- current (1.5.10-1jh) integrated as 1.5.10-1ts for release 1.1-U3 + * Tue Oct 26 2004 Daniel Reed 1.5.10-1 - update to the 1.5.10 bugfix release - obsoletes libtool-1.4-nonneg.patch From svn at tinysofa.org Tue Jan 4 13:46:36 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:46:36 -0500 (EST) Subject: [tinysofa-svn] r5420 - in tinysofa/releases/1.1/libxml2: current/specs releases releases/2.6.15 releases/2.6.15/1ts/specs Message-ID: <20050104134636.184DB3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:46:22 -0500 (Tue, 04 Jan 2005) New Revision: 5420 Added: tinysofa/releases/1.1/libxml2/releases/2.6.15/ tinysofa/releases/1.1/libxml2/releases/2.6.15/1ts/ Modified: tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec tinysofa/releases/1.1/libxml2/releases/2.6.15/1ts/specs/libxml2.spec Log: libxml2: * integrate current (2.6.15-1jh) as releases/2.6.15/1ts Modified: tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec =================================================================== --- tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec 2005-01-04 13:46:08 UTC (rev 5419) +++ tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec 2005-01-04 13:46:22 UTC (rev 5420) @@ -1,7 +1,7 @@ Summary: Library providing XML and HTML support Name: libxml2 Version: 2.6.15 -Release: 1jh +Release: 1ts License: MIT Group: main Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz @@ -119,6 +119,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.6.15-1ts +- current (2.6.15-1jh) integrated as 2.6.15-1ts for release 1.1-U3 + * Thu Oct 28 2004 Jaakko Heinonen 2.6.15-1jh - update to 2.6.15, which fixes CAN-2004-0989 (Bug ID #12) Copied: tinysofa/releases/1.1/libxml2/releases/2.6.15/1ts (from rev 5268, tinysofa/releases/1.1/libxml2/current) Modified: tinysofa/releases/1.1/libxml2/releases/2.6.15/1ts/specs/libxml2.spec =================================================================== --- tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/libxml2/releases/2.6.15/1ts/specs/libxml2.spec 2005-01-04 13:46:22 UTC (rev 5420) @@ -1,7 +1,7 @@ Summary: Library providing XML and HTML support Name: libxml2 Version: 2.6.15 -Release: 1jh +Release: 1ts License: MIT Group: main Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz @@ -119,6 +119,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.6.15-1ts +- current (2.6.15-1jh) integrated as 2.6.15-1ts for release 1.1-U3 + * Thu Oct 28 2004 Jaakko Heinonen 2.6.15-1jh - update to 2.6.15, which fixes CAN-2004-0989 (Bug ID #12) From svn at tinysofa.org Tue Jan 4 13:46:16 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:46:16 -0500 (EST) Subject: [tinysofa-svn] r5419 - tinysofa/releases/1.1/libtool Message-ID: <20050104134616.3F9553440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:46:08 -0500 (Tue, 04 Jan 2005) New Revision: 5419 Added: tinysofa/releases/1.1/libtool/pristine/ Log: libtool: * retarget pristine (1.5.6-3ts) to releases/1.5.10/1ts Copied: tinysofa/releases/1.1/libtool/pristine (from rev 5417, tinysofa/releases/1.1/libtool/releases/1.5.10/1ts) From svn at tinysofa.org Tue Jan 4 13:46:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:46:46 -0500 (EST) Subject: [tinysofa-svn] r5421 - tinysofa/releases/1.1/libxml2 Message-ID: <20050104134646.A76B73440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:46:40 -0500 (Tue, 04 Jan 2005) New Revision: 5421 Removed: tinysofa/releases/1.1/libxml2/pristine/ Log: libxml2: * removing pristine (2.6.9-2ts) From svn at tinysofa.org Tue Jan 4 13:46:58 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:46:58 -0500 (EST) Subject: [tinysofa-svn] r5422 - tinysofa/releases/1.1/libxml2 Message-ID: <20050104134658.6FB913440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:46:50 -0500 (Tue, 04 Jan 2005) New Revision: 5422 Added: tinysofa/releases/1.1/libxml2/pristine/ Log: libxml2: * retarget pristine (2.6.9-2ts) to releases/2.6.15/1ts Copied: tinysofa/releases/1.1/libxml2/pristine (from rev 5420, tinysofa/releases/1.1/libxml2/releases/2.6.15/1ts) From svn at tinysofa.org Tue Jan 4 13:47:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:47:40 -0500 (EST) Subject: [tinysofa-svn] r5425 - tinysofa/releases/1.1/lilo Message-ID: <20050104134740.6172D3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:47:32 -0500 (Tue, 04 Jan 2005) New Revision: 5425 Added: tinysofa/releases/1.1/lilo/pristine/ Log: lilo: * retarget pristine (22.3.2-1ts) to releases/22.6/2ts Copied: tinysofa/releases/1.1/lilo/pristine (from rev 5423, tinysofa/releases/1.1/lilo/releases/22.6/2ts) From svn at tinysofa.org Tue Jan 4 13:47:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:47:18 -0500 (EST) Subject: [tinysofa-svn] r5423 - in tinysofa/releases/1.1/lilo: current/specs releases releases/22.6 releases/22.6/2ts/specs Message-ID: <20050104134718.380093440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:47:04 -0500 (Tue, 04 Jan 2005) New Revision: 5423 Added: tinysofa/releases/1.1/lilo/releases/22.6/ tinysofa/releases/1.1/lilo/releases/22.6/2ts/ Modified: tinysofa/releases/1.1/lilo/current/specs/lilo.spec tinysofa/releases/1.1/lilo/releases/22.6/2ts/specs/lilo.spec Log: lilo: * integrate current (22.6-2jh) as releases/22.6/2ts Modified: tinysofa/releases/1.1/lilo/current/specs/lilo.spec =================================================================== --- tinysofa/releases/1.1/lilo/current/specs/lilo.spec 2005-01-04 13:46:50 UTC (rev 5422) +++ tinysofa/releases/1.1/lilo/current/specs/lilo.spec 2005-01-04 13:47:04 UTC (rev 5423) @@ -3,7 +3,7 @@ Summary(es): Cargador de arranque para Linux y otros sistemas operativos Name: lilo Version: 22.6 -Release: 2jh +Release: 2ts License: MIT Group: main Source: http://www.ibiblio.org/pub/Linux/system/boot/lilo/%{name}-%{version}.tar.gz @@ -100,6 +100,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 22.6-2ts +- current (22.6-2jh) integrated as 22.6-2ts for release 1.1-U3 + * Fri Dec 3 2004 Jaakko Heinonen 22.6-2jh - install /boot/boot.b, /boot/chain.b and /boot/os2_d.b Copied: tinysofa/releases/1.1/lilo/releases/22.6/2ts (from rev 5268, tinysofa/releases/1.1/lilo/current) Modified: tinysofa/releases/1.1/lilo/releases/22.6/2ts/specs/lilo.spec =================================================================== --- tinysofa/releases/1.1/lilo/current/specs/lilo.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/lilo/releases/22.6/2ts/specs/lilo.spec 2005-01-04 13:47:04 UTC (rev 5423) @@ -3,7 +3,7 @@ Summary(es): Cargador de arranque para Linux y otros sistemas operativos Name: lilo Version: 22.6 -Release: 2jh +Release: 2ts License: MIT Group: main Source: http://www.ibiblio.org/pub/Linux/system/boot/lilo/%{name}-%{version}.tar.gz @@ -100,6 +100,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 22.6-2ts +- current (22.6-2jh) integrated as 22.6-2ts for release 1.1-U3 + * Fri Dec 3 2004 Jaakko Heinonen 22.6-2jh - install /boot/boot.b, /boot/chain.b and /boot/os2_d.b From svn at tinysofa.org Tue Jan 4 13:47:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:47:28 -0500 (EST) Subject: [tinysofa-svn] r5424 - tinysofa/releases/1.1/lilo Message-ID: <20050104134728.8E9103440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:47:22 -0500 (Tue, 04 Jan 2005) New Revision: 5424 Removed: tinysofa/releases/1.1/lilo/pristine/ Log: lilo: * removing pristine (22.3.2-1ts) From svn at tinysofa.org Tue Jan 4 13:48:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:48:11 -0500 (EST) Subject: [tinysofa-svn] r5427 - tinysofa/releases/1.1/lsof Message-ID: <20050104134811.AB4503440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:48:05 -0500 (Tue, 04 Jan 2005) New Revision: 5427 Removed: tinysofa/releases/1.1/lsof/pristine/ Log: lsof: * removing pristine (4.71-4ts) From svn at tinysofa.org Tue Jan 4 13:48:23 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:48:23 -0500 (EST) Subject: [tinysofa-svn] r5428 - tinysofa/releases/1.1/lsof Message-ID: <20050104134823.2EB4E3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:48:15 -0500 (Tue, 04 Jan 2005) New Revision: 5428 Added: tinysofa/releases/1.1/lsof/pristine/ Log: lsof: * retarget pristine (4.71-4ts) to releases/4.72/1ts Copied: tinysofa/releases/1.1/lsof/pristine (from rev 5426, tinysofa/releases/1.1/lsof/releases/4.72/1ts) From svn at tinysofa.org Tue Jan 4 13:48:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:48:00 -0500 (EST) Subject: [tinysofa-svn] r5426 - in tinysofa/releases/1.1/lsof: current/specs releases releases/4.72 releases/4.72/1ts/specs Message-ID: <20050104134800.D0BBE3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:47:47 -0500 (Tue, 04 Jan 2005) New Revision: 5426 Added: tinysofa/releases/1.1/lsof/releases/4.72/ tinysofa/releases/1.1/lsof/releases/4.72/1ts/ Modified: tinysofa/releases/1.1/lsof/current/specs/lsof.spec tinysofa/releases/1.1/lsof/releases/4.72/1ts/specs/lsof.spec Log: lsof: * integrate current (4.72-1jh) as releases/4.72/1ts Modified: tinysofa/releases/1.1/lsof/current/specs/lsof.spec =================================================================== --- tinysofa/releases/1.1/lsof/current/specs/lsof.spec 2005-01-04 13:47:32 UTC (rev 5425) +++ tinysofa/releases/1.1/lsof/current/specs/lsof.spec 2005-01-04 13:47:47 UTC (rev 5426) @@ -1,7 +1,7 @@ Summary: A utility which lists open files on a Linux/UNIX system. Name: lsof Version: 4.72 -Release: 1jh +Release: 1ts Copyright: Free Group: main Source0: ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.bz2 @@ -72,6 +72,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.72-1ts +- current (4.72-1jh) integrated as 4.72-1ts for release 1.1-U3 + * Fri Jul 30 2004 Jakub Jelinek 4.72-1 - update to 4.72 - use st_dev/st_ino comparison for sockets by name if possible Copied: tinysofa/releases/1.1/lsof/releases/4.72/1ts (from rev 5268, tinysofa/releases/1.1/lsof/current) Modified: tinysofa/releases/1.1/lsof/releases/4.72/1ts/specs/lsof.spec =================================================================== --- tinysofa/releases/1.1/lsof/current/specs/lsof.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/lsof/releases/4.72/1ts/specs/lsof.spec 2005-01-04 13:47:47 UTC (rev 5426) @@ -1,7 +1,7 @@ Summary: A utility which lists open files on a Linux/UNIX system. Name: lsof Version: 4.72 -Release: 1jh +Release: 1ts Copyright: Free Group: main Source0: ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.bz2 @@ -72,6 +72,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.72-1ts +- current (4.72-1jh) integrated as 4.72-1ts for release 1.1-U3 + * Fri Jul 30 2004 Jakub Jelinek 4.72-1 - update to 4.72 - use st_dev/st_ino comparison for sockets by name if possible From svn at tinysofa.org Tue Jan 4 13:48:51 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:48:51 -0500 (EST) Subject: [tinysofa-svn] r5429 - in tinysofa/releases/1.1/mailx: current/specs releases/8.1.1 releases/8.1.1/32ts/specs Message-ID: <20050104134851.EA3F83440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:48:38 -0500 (Tue, 04 Jan 2005) New Revision: 5429 Added: tinysofa/releases/1.1/mailx/releases/8.1.1/32ts/ Modified: tinysofa/releases/1.1/mailx/current/specs/mailx.spec tinysofa/releases/1.1/mailx/releases/8.1.1/32ts/specs/mailx.spec Log: mailx: * integrate current (8.1.1-32jh) as releases/8.1.1/32ts Modified: tinysofa/releases/1.1/mailx/current/specs/mailx.spec =================================================================== --- tinysofa/releases/1.1/mailx/current/specs/mailx.spec 2005-01-04 13:48:15 UTC (rev 5428) +++ tinysofa/releases/1.1/mailx/current/specs/mailx.spec 2005-01-04 13:48:38 UTC (rev 5429) @@ -3,7 +3,7 @@ Summary: The /bin/mail program for sending e-mail messages. Name: mailx Version: 8.1.1 -Release: 32jh +Release: 32ts Copyright: BSD Group: main Source: ftp://ftp.debian.org/pub/debian/hamm/source/mail/mailx-8.1.1.tar.gz @@ -109,6 +109,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 8.1.1-32ts +- current (8.1.1-32jh) integrated as 8.1.1-32ts for release 1.1-U3 + * Thu Nov 18 2004 Ivana Varekova - fix problem with patch bug44798 Copied: tinysofa/releases/1.1/mailx/releases/8.1.1/32ts (from rev 5268, tinysofa/releases/1.1/mailx/current) Modified: tinysofa/releases/1.1/mailx/releases/8.1.1/32ts/specs/mailx.spec =================================================================== --- tinysofa/releases/1.1/mailx/current/specs/mailx.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/mailx/releases/8.1.1/32ts/specs/mailx.spec 2005-01-04 13:48:38 UTC (rev 5429) @@ -3,7 +3,7 @@ Summary: The /bin/mail program for sending e-mail messages. Name: mailx Version: 8.1.1 -Release: 32jh +Release: 32ts Copyright: BSD Group: main Source: ftp://ftp.debian.org/pub/debian/hamm/source/mail/mailx-8.1.1.tar.gz @@ -109,6 +109,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 8.1.1-32ts +- current (8.1.1-32jh) integrated as 8.1.1-32ts for release 1.1-U3 + * Thu Nov 18 2004 Ivana Varekova - fix problem with patch bug44798 From svn at tinysofa.org Tue Jan 4 13:49:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:49:02 -0500 (EST) Subject: [tinysofa-svn] r5430 - tinysofa/releases/1.1/mailx Message-ID: <20050104134902.F15493440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:48:56 -0500 (Tue, 04 Jan 2005) New Revision: 5430 Removed: tinysofa/releases/1.1/mailx/pristine/ Log: mailx: * removing pristine (8.1.1-31ts) From svn at tinysofa.org Tue Jan 4 13:49:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:49:14 -0500 (EST) Subject: [tinysofa-svn] r5431 - tinysofa/releases/1.1/mailx Message-ID: <20050104134914.4598A3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:49:06 -0500 (Tue, 04 Jan 2005) New Revision: 5431 Added: tinysofa/releases/1.1/mailx/pristine/ Log: mailx: * retarget pristine (8.1.1-31ts) to releases/8.1.1/32ts Copied: tinysofa/releases/1.1/mailx/pristine (from rev 5429, tinysofa/releases/1.1/mailx/releases/8.1.1/32ts) From svn at tinysofa.org Tue Jan 4 13:49:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:49:43 -0500 (EST) Subject: [tinysofa-svn] r5432 - in tinysofa/releases/1.1/man: current/specs releases/1.5m2 releases/1.5m2/9ts/specs Message-ID: <20050104134943.D86103440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:49:30 -0500 (Tue, 04 Jan 2005) New Revision: 5432 Added: tinysofa/releases/1.1/man/releases/1.5m2/9ts/ Modified: tinysofa/releases/1.1/man/current/specs/man.spec tinysofa/releases/1.1/man/releases/1.5m2/9ts/specs/man.spec Log: man: * integrate current (1.5m2-9jh) as releases/1.5m2/9ts Modified: tinysofa/releases/1.1/man/current/specs/man.spec =================================================================== --- tinysofa/releases/1.1/man/current/specs/man.spec 2005-01-04 13:49:06 UTC (rev 5431) +++ tinysofa/releases/1.1/man/current/specs/man.spec 2005-01-04 13:49:30 UTC (rev 5432) @@ -4,7 +4,7 @@ Summary: A set of documentation tools: man, apropos and whatis. Name: man Version: 1.5m2 -Release: 9jh +Release: 9ts License: GPL Group: main Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/man-%{version}.tar.bz2 @@ -163,6 +163,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.5m2-9ts +- current (1.5m2-9jh) integrated as 1.5m2-9ts for release 1.1-U3 + * Tue Sep 28 2004 Jaakko Heinonen 1.5m2-9jh - own cache directories even if usecache is not set Copied: tinysofa/releases/1.1/man/releases/1.5m2/9ts (from rev 5268, tinysofa/releases/1.1/man/current) Modified: tinysofa/releases/1.1/man/releases/1.5m2/9ts/specs/man.spec =================================================================== --- tinysofa/releases/1.1/man/current/specs/man.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/man/releases/1.5m2/9ts/specs/man.spec 2005-01-04 13:49:30 UTC (rev 5432) @@ -4,7 +4,7 @@ Summary: A set of documentation tools: man, apropos and whatis. Name: man Version: 1.5m2 -Release: 9jh +Release: 9ts License: GPL Group: main Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/man-%{version}.tar.bz2 @@ -163,6 +163,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.5m2-9ts +- current (1.5m2-9jh) integrated as 1.5m2-9ts for release 1.1-U3 + * Tue Sep 28 2004 Jaakko Heinonen 1.5m2-9jh - own cache directories even if usecache is not set From svn at tinysofa.org Tue Jan 4 13:49:53 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:49:53 -0500 (EST) Subject: [tinysofa-svn] r5433 - tinysofa/releases/1.1/man Message-ID: <20050104134953.9C96D3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:49:47 -0500 (Tue, 04 Jan 2005) New Revision: 5433 Removed: tinysofa/releases/1.1/man/pristine/ Log: man: * removing pristine (1.5m2-8ts) From svn at tinysofa.org Tue Jan 4 13:50:05 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:50:05 -0500 (EST) Subject: [tinysofa-svn] r5434 - tinysofa/releases/1.1/man Message-ID: <20050104135005.434103440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:49:57 -0500 (Tue, 04 Jan 2005) New Revision: 5434 Added: tinysofa/releases/1.1/man/pristine/ Log: man: * retarget pristine (1.5m2-8ts) to releases/1.5m2/9ts Copied: tinysofa/releases/1.1/man/pristine (from rev 5432, tinysofa/releases/1.1/man/releases/1.5m2/9ts) From svn at tinysofa.org Tue Jan 4 13:50:35 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:50:35 -0500 (EST) Subject: [tinysofa-svn] r5435 - in tinysofa/releases/1.1/module-init-tools: current/specs releases/3.0 releases/3.0/8ts/specs Message-ID: <20050104135035.AEFAF3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:50:22 -0500 (Tue, 04 Jan 2005) New Revision: 5435 Added: tinysofa/releases/1.1/module-init-tools/releases/3.0/8ts/ Modified: tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec tinysofa/releases/1.1/module-init-tools/releases/3.0/8ts/specs/module-init-tools.spec Log: module-init-tools: * integrate current (3.0-8jh) as releases/3.0/8ts Modified: tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec =================================================================== --- tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec 2005-01-04 13:49:57 UTC (rev 5434) +++ tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec 2005-01-04 13:50:22 UTC (rev 5435) @@ -1,7 +1,7 @@ Summary: Kernel module management utilities. Name: module-init-tools Version: 3.0 -Release: 8jh +Release: 8ts License: GPL Group: main Source: http://kernel.us.themoes.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2 @@ -79,6 +79,9 @@ %ghost %{_sysconfdir}/modprobe.conf %changelog +* Tue Jan 04 2005 tsintegrate 3.0-8ts +- current (3.0-8jh) integrated as 3.0-8ts for release 1.1-U3 + * Wed Oct 27 2004 Jaakko Heinonen 3.0-7jh - add modprobe.conf.dist - spec cleanups Copied: tinysofa/releases/1.1/module-init-tools/releases/3.0/8ts (from rev 5268, tinysofa/releases/1.1/module-init-tools/current) Modified: tinysofa/releases/1.1/module-init-tools/releases/3.0/8ts/specs/module-init-tools.spec =================================================================== --- tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/module-init-tools/releases/3.0/8ts/specs/module-init-tools.spec 2005-01-04 13:50:22 UTC (rev 5435) @@ -1,7 +1,7 @@ Summary: Kernel module management utilities. Name: module-init-tools Version: 3.0 -Release: 8jh +Release: 8ts License: GPL Group: main Source: http://kernel.us.themoes.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2 @@ -79,6 +79,9 @@ %ghost %{_sysconfdir}/modprobe.conf %changelog +* Tue Jan 04 2005 tsintegrate 3.0-8ts +- current (3.0-8jh) integrated as 3.0-8ts for release 1.1-U3 + * Wed Oct 27 2004 Jaakko Heinonen 3.0-7jh - add modprobe.conf.dist - spec cleanups From svn at tinysofa.org Tue Jan 4 13:50:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:50:46 -0500 (EST) Subject: [tinysofa-svn] r5436 - tinysofa/releases/1.1/module-init-tools Message-ID: <20050104135046.255953440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:50:39 -0500 (Tue, 04 Jan 2005) New Revision: 5436 Removed: tinysofa/releases/1.1/module-init-tools/pristine/ Log: module-init-tools: * removing pristine (3.0-6ts) From svn at tinysofa.org Tue Jan 4 13:50:57 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:50:57 -0500 (EST) Subject: [tinysofa-svn] r5437 - tinysofa/releases/1.1/module-init-tools Message-ID: <20050104135057.2C2E73440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:50:49 -0500 (Tue, 04 Jan 2005) New Revision: 5437 Added: tinysofa/releases/1.1/module-init-tools/pristine/ Log: module-init-tools: * retarget pristine (3.0-6ts) to releases/3.0/8ts Copied: tinysofa/releases/1.1/module-init-tools/pristine (from rev 5435, tinysofa/releases/1.1/module-init-tools/releases/3.0/8ts) From svn at tinysofa.org Tue Jan 4 13:51:16 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:51:16 -0500 (EST) Subject: [tinysofa-svn] r5438 - in tinysofa/releases/1.1/mt-st: current/specs releases releases/0.8 releases/0.8/1ts/specs Message-ID: <20050104135116.95A573440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:51:03 -0500 (Tue, 04 Jan 2005) New Revision: 5438 Added: tinysofa/releases/1.1/mt-st/releases/0.8/ tinysofa/releases/1.1/mt-st/releases/0.8/1ts/ Modified: tinysofa/releases/1.1/mt-st/current/specs/mt-st.spec tinysofa/releases/1.1/mt-st/releases/0.8/1ts/specs/mt-st.spec Log: mt-st: * integrate current (0.8-1jh) as releases/0.8/1ts Modified: tinysofa/releases/1.1/mt-st/current/specs/mt-st.spec =================================================================== --- tinysofa/releases/1.1/mt-st/current/specs/mt-st.spec 2005-01-04 13:50:49 UTC (rev 5437) +++ tinysofa/releases/1.1/mt-st/current/specs/mt-st.spec 2005-01-04 13:51:03 UTC (rev 5438) @@ -1,7 +1,7 @@ Summary: Install mt-st if you need a tool to control tape drives. Name: mt-st Version: 0.8 -Release: 1jh +Release: 1ts License: GPL Group: main Source: ftp://metalab.unc.edu/pub/Linux/system/backup/mt-st-%{version}.tar.gz @@ -46,6 +46,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.8-1ts +- current (0.8-1jh) integrated as 0.8-1ts for release 1.1-U3 + * Mon Aug 09 2004 Jindrich Novy 0.8-1 - updated to 0.8 - updated .redhat patch Copied: tinysofa/releases/1.1/mt-st/releases/0.8/1ts (from rev 5268, tinysofa/releases/1.1/mt-st/current) Modified: tinysofa/releases/1.1/mt-st/releases/0.8/1ts/specs/mt-st.spec =================================================================== --- tinysofa/releases/1.1/mt-st/current/specs/mt-st.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/mt-st/releases/0.8/1ts/specs/mt-st.spec 2005-01-04 13:51:03 UTC (rev 5438) @@ -1,7 +1,7 @@ Summary: Install mt-st if you need a tool to control tape drives. Name: mt-st Version: 0.8 -Release: 1jh +Release: 1ts License: GPL Group: main Source: ftp://metalab.unc.edu/pub/Linux/system/backup/mt-st-%{version}.tar.gz @@ -46,6 +46,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.8-1ts +- current (0.8-1jh) integrated as 0.8-1ts for release 1.1-U3 + * Mon Aug 09 2004 Jindrich Novy 0.8-1 - updated to 0.8 - updated .redhat patch From svn at tinysofa.org Tue Jan 4 13:51:26 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:51:26 -0500 (EST) Subject: [tinysofa-svn] r5439 - tinysofa/releases/1.1/mt-st Message-ID: <20050104135126.A6EE93440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:51:20 -0500 (Tue, 04 Jan 2005) New Revision: 5439 Removed: tinysofa/releases/1.1/mt-st/pristine/ Log: mt-st: * removing pristine (0.7-9ts) From svn at tinysofa.org Tue Jan 4 13:51:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:51:38 -0500 (EST) Subject: [tinysofa-svn] r5440 - tinysofa/releases/1.1/mt-st Message-ID: <20050104135138.679733440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:51:30 -0500 (Tue, 04 Jan 2005) New Revision: 5440 Added: tinysofa/releases/1.1/mt-st/pristine/ Log: mt-st: * retarget pristine (0.7-9ts) to releases/0.8/1ts Copied: tinysofa/releases/1.1/mt-st/pristine (from rev 5438, tinysofa/releases/1.1/mt-st/releases/0.8/1ts) From svn at tinysofa.org Tue Jan 4 13:52:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:52:09 -0500 (EST) Subject: [tinysofa-svn] r5441 - in tinysofa/releases/1.1/mutt: current/specs releases/1.4.2.1 releases/1.4.2.1/7ts/specs Message-ID: <20050104135209.607BF3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:51:55 -0500 (Tue, 04 Jan 2005) New Revision: 5441 Added: tinysofa/releases/1.1/mutt/releases/1.4.2.1/7ts/ Modified: tinysofa/releases/1.1/mutt/current/specs/mutt.spec tinysofa/releases/1.1/mutt/releases/1.4.2.1/7ts/specs/mutt.spec Log: mutt: * integrate current (1.4.2.1-7jh) as releases/1.4.2.1/7ts Modified: tinysofa/releases/1.1/mutt/current/specs/mutt.spec =================================================================== --- tinysofa/releases/1.1/mutt/current/specs/mutt.spec 2005-01-04 13:51:30 UTC (rev 5440) +++ tinysofa/releases/1.1/mutt/current/specs/mutt.spec 2005-01-04 13:51:55 UTC (rev 5441) @@ -1,7 +1,7 @@ Name: mutt Summary: A text mode mail user agent. Version: 1.4.2.1 -Release: 7jh +Release: 7ts License: GPL Group: extra URL: http://www.mutt.org/ @@ -68,6 +68,9 @@ %exclude /etc/mime.types %changelog +* Tue Jan 04 2005 tsintegrate 1.4.2.1-7ts +- current (1.4.2.1-7jh) integrated as 1.4.2.1-7ts for release 1.1-U3 + * Sat Sep 11 2004 Jaakko Heinonen 1.4.2.1-7jh - add gpg support to default Muttrc - spec cleanup Copied: tinysofa/releases/1.1/mutt/releases/1.4.2.1/7ts (from rev 5268, tinysofa/releases/1.1/mutt/current) Modified: tinysofa/releases/1.1/mutt/releases/1.4.2.1/7ts/specs/mutt.spec =================================================================== --- tinysofa/releases/1.1/mutt/current/specs/mutt.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/mutt/releases/1.4.2.1/7ts/specs/mutt.spec 2005-01-04 13:51:55 UTC (rev 5441) @@ -1,7 +1,7 @@ Name: mutt Summary: A text mode mail user agent. Version: 1.4.2.1 -Release: 7jh +Release: 7ts License: GPL Group: extra URL: http://www.mutt.org/ @@ -68,6 +68,9 @@ %exclude /etc/mime.types %changelog +* Tue Jan 04 2005 tsintegrate 1.4.2.1-7ts +- current (1.4.2.1-7jh) integrated as 1.4.2.1-7ts for release 1.1-U3 + * Sat Sep 11 2004 Jaakko Heinonen 1.4.2.1-7jh - add gpg support to default Muttrc - spec cleanup From svn at tinysofa.org Tue Jan 4 13:52:19 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:52:19 -0500 (EST) Subject: [tinysofa-svn] r5442 - tinysofa/releases/1.1/mutt Message-ID: <20050104135219.9DBD83440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:52:13 -0500 (Tue, 04 Jan 2005) New Revision: 5442 Removed: tinysofa/releases/1.1/mutt/pristine/ Log: mutt: * removing pristine (1.4.2.1-6ts) From svn at tinysofa.org Tue Jan 4 13:52:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:52:31 -0500 (EST) Subject: [tinysofa-svn] r5443 - tinysofa/releases/1.1/mutt Message-ID: <20050104135231.4681D3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:52:23 -0500 (Tue, 04 Jan 2005) New Revision: 5443 Added: tinysofa/releases/1.1/mutt/pristine/ Log: mutt: * retarget pristine (1.4.2.1-6ts) to releases/1.4.2.1/7ts Copied: tinysofa/releases/1.1/mutt/pristine (from rev 5441, tinysofa/releases/1.1/mutt/releases/1.4.2.1/7ts) From svn at tinysofa.org Tue Jan 4 13:52:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:52:54 -0500 (EST) Subject: [tinysofa-svn] r5444 - in tinysofa/releases/1.1/mysql: current/specs releases releases/4.0.21 releases/4.0.21/3ts/specs Message-ID: <20050104135254.D4AFF3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:52:41 -0500 (Tue, 04 Jan 2005) New Revision: 5444 Added: tinysofa/releases/1.1/mysql/releases/4.0.21/ tinysofa/releases/1.1/mysql/releases/4.0.21/3ts/ Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec tinysofa/releases/1.1/mysql/releases/4.0.21/3ts/specs/mysql.spec Log: mysql: * integrate current (4.0.21-3jh) as releases/4.0.21/3ts Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2005-01-04 13:52:23 UTC (rev 5443) +++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2005-01-04 13:52:41 UTC (rev 5444) @@ -2,7 +2,7 @@ Name: mysql Group: main Version: 4.0.21 -Release: 3jh +Release: 3ts License: GPL / LGPL %define shared_libversion 12:0:0 %define mysqld_user mysql @@ -344,6 +344,9 @@ %{_bindir}/mysqlmanagerc %changelog +* Tue Jan 04 2005 tsintegrate 4.0.21-3ts +- current (4.0.21-3jh) integrated as 4.0.21-3ts for release 1.1-U3 + * Wed Oct 13 2004 Jaakko Heinonen 4.0.21-3jh - disable initgroups hack as updated nss_ldap should work with mysql Copied: tinysofa/releases/1.1/mysql/releases/4.0.21/3ts (from rev 5268, tinysofa/releases/1.1/mysql/current) Modified: tinysofa/releases/1.1/mysql/releases/4.0.21/3ts/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/mysql/releases/4.0.21/3ts/specs/mysql.spec 2005-01-04 13:52:41 UTC (rev 5444) @@ -2,7 +2,7 @@ Name: mysql Group: main Version: 4.0.21 -Release: 3jh +Release: 3ts License: GPL / LGPL %define shared_libversion 12:0:0 %define mysqld_user mysql @@ -344,6 +344,9 @@ %{_bindir}/mysqlmanagerc %changelog +* Tue Jan 04 2005 tsintegrate 4.0.21-3ts +- current (4.0.21-3jh) integrated as 4.0.21-3ts for release 1.1-U3 + * Wed Oct 13 2004 Jaakko Heinonen 4.0.21-3jh - disable initgroups hack as updated nss_ldap should work with mysql From svn at tinysofa.org Tue Jan 4 13:53:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:53:06 -0500 (EST) Subject: [tinysofa-svn] r5445 - tinysofa/releases/1.1/mysql Message-ID: <20050104135306.9F8F03440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:53:00 -0500 (Tue, 04 Jan 2005) New Revision: 5445 Removed: tinysofa/releases/1.1/mysql/pristine/ Log: mysql: * removing pristine (4.0.20-4ts) From svn at tinysofa.org Tue Jan 4 13:53:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:53:18 -0500 (EST) Subject: [tinysofa-svn] r5446 - tinysofa/releases/1.1/mysql Message-ID: <20050104135318.7D31D3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:53:10 -0500 (Tue, 04 Jan 2005) New Revision: 5446 Added: tinysofa/releases/1.1/mysql/pristine/ Log: mysql: * retarget pristine (4.0.20-4ts) to releases/4.0.21/3ts Copied: tinysofa/releases/1.1/mysql/pristine (from rev 5444, tinysofa/releases/1.1/mysql/releases/4.0.21/3ts) From svn at tinysofa.org Tue Jan 4 13:53:41 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:53:41 -0500 (EST) Subject: [tinysofa-svn] r5447 - in tinysofa/releases/1.1/m4: current/specs releases releases/1.4.2 releases/1.4.2/1ts/sources releases/1.4.2/1ts/specs Message-ID: <20050104135341.2225D3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:53:24 -0500 (Tue, 04 Jan 2005) New Revision: 5447 Added: tinysofa/releases/1.1/m4/releases/1.4.2/ tinysofa/releases/1.1/m4/releases/1.4.2/1ts/ tinysofa/releases/1.1/m4/releases/1.4.2/1ts/sources/m4-1.4.2.tar.gz Modified: tinysofa/releases/1.1/m4/current/specs/m4.spec tinysofa/releases/1.1/m4/releases/1.4.2/1ts/specs/m4.spec Log: m4: * integrate current (1.4.2-1jh) as releases/1.4.2/1ts Modified: tinysofa/releases/1.1/m4/current/specs/m4.spec =================================================================== --- tinysofa/releases/1.1/m4/current/specs/m4.spec 2005-01-04 13:53:10 UTC (rev 5446) +++ tinysofa/releases/1.1/m4/current/specs/m4.spec 2005-01-04 13:53:24 UTC (rev 5447) @@ -1,7 +1,7 @@ Summary: The GNU macro processor. Name: m4 Version: 1.4.2 -Release: 1jh +Release: 1ts License: GPL Group: development Source: ftp://ftp.gnu.org/gnu/m4/m4-1.4.2.tar.gz @@ -58,6 +58,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.4.2-1ts +- current (1.4.2-1jh) integrated as 1.4.2-1ts for release 1.1-U3 + * Sun Dec 12 2004 Miloslav Trmac - 1.4.2-1 - Update to m4-1.4.2 Copied: tinysofa/releases/1.1/m4/releases/1.4.2/1ts (from rev 5268, tinysofa/releases/1.1/m4/current) Copied: tinysofa/releases/1.1/m4/releases/1.4.2/1ts/sources/m4-1.4.2.tar.gz (from rev 5274, tinysofa/releases/1.1/m4/current/sources/m4-1.4.2.tar.gz) Modified: tinysofa/releases/1.1/m4/releases/1.4.2/1ts/specs/m4.spec =================================================================== --- tinysofa/releases/1.1/m4/current/specs/m4.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/m4/releases/1.4.2/1ts/specs/m4.spec 2005-01-04 13:53:24 UTC (rev 5447) @@ -1,7 +1,7 @@ Summary: The GNU macro processor. Name: m4 Version: 1.4.2 -Release: 1jh +Release: 1ts License: GPL Group: development Source: ftp://ftp.gnu.org/gnu/m4/m4-1.4.2.tar.gz @@ -58,6 +58,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.4.2-1ts +- current (1.4.2-1jh) integrated as 1.4.2-1ts for release 1.1-U3 + * Sun Dec 12 2004 Miloslav Trmac - 1.4.2-1 - Update to m4-1.4.2 From svn at tinysofa.org Tue Jan 4 13:53:51 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:53:51 -0500 (EST) Subject: [tinysofa-svn] r5448 - tinysofa/releases/1.1/m4 Message-ID: <20050104135351.A8E0C3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:53:45 -0500 (Tue, 04 Jan 2005) New Revision: 5448 Removed: tinysofa/releases/1.1/m4/pristine/ Log: m4: * removing pristine (1.4.1-2ts) From svn at tinysofa.org Tue Jan 4 13:54:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:54:03 -0500 (EST) Subject: [tinysofa-svn] r5449 - tinysofa/releases/1.1/m4 Message-ID: <20050104135403.5CA9F3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:53:55 -0500 (Tue, 04 Jan 2005) New Revision: 5449 Added: tinysofa/releases/1.1/m4/pristine/ Log: m4: * retarget pristine (1.4.1-2ts) to releases/1.4.2/1ts Copied: tinysofa/releases/1.1/m4/pristine (from rev 5447, tinysofa/releases/1.1/m4/releases/1.4.2/1ts) From svn at tinysofa.org Tue Jan 4 13:54:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:54:33 -0500 (EST) Subject: [tinysofa-svn] r5450 - in tinysofa/releases/1.1/nasm: current/specs releases/0.98.38 releases/0.98.38/7ts/specs Message-ID: <20050104135433.45A423440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:54:19 -0500 (Tue, 04 Jan 2005) New Revision: 5450 Added: tinysofa/releases/1.1/nasm/releases/0.98.38/7ts/ Modified: tinysofa/releases/1.1/nasm/current/specs/nasm.spec tinysofa/releases/1.1/nasm/releases/0.98.38/7ts/specs/nasm.spec Log: nasm: * integrate current (0.98.38-7jh) as releases/0.98.38/7ts Modified: tinysofa/releases/1.1/nasm/current/specs/nasm.spec =================================================================== --- tinysofa/releases/1.1/nasm/current/specs/nasm.spec 2005-01-04 13:53:55 UTC (rev 5449) +++ tinysofa/releases/1.1/nasm/current/specs/nasm.spec 2005-01-04 13:54:19 UTC (rev 5450) @@ -1,7 +1,7 @@ Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax Name: nasm Version: 0.98.38 -Release: 7jh +Release: 7ts License: LGPL Group: development Source: http://unc.dl.sourceforge.net/sourceforge/nasm/nasm-%{version}.tar.bz2 @@ -70,6 +70,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.98.38-7ts +- current (0.98.38-7jh) integrated as 0.98.38-7ts for release 1.1-U3 + * Tue Dec 21 2004 Jaakko Heinonen 0.98.38-7jh - fix a buffer overflow (nasm-0.98.38-overflow.patch) - use macros Copied: tinysofa/releases/1.1/nasm/releases/0.98.38/7ts (from rev 5268, tinysofa/releases/1.1/nasm/current) Modified: tinysofa/releases/1.1/nasm/releases/0.98.38/7ts/specs/nasm.spec =================================================================== --- tinysofa/releases/1.1/nasm/current/specs/nasm.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/nasm/releases/0.98.38/7ts/specs/nasm.spec 2005-01-04 13:54:19 UTC (rev 5450) @@ -1,7 +1,7 @@ Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax Name: nasm Version: 0.98.38 -Release: 7jh +Release: 7ts License: LGPL Group: development Source: http://unc.dl.sourceforge.net/sourceforge/nasm/nasm-%{version}.tar.bz2 @@ -70,6 +70,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.98.38-7ts +- current (0.98.38-7jh) integrated as 0.98.38-7ts for release 1.1-U3 + * Tue Dec 21 2004 Jaakko Heinonen 0.98.38-7jh - fix a buffer overflow (nasm-0.98.38-overflow.patch) - use macros From svn at tinysofa.org Tue Jan 4 13:54:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:54:43 -0500 (EST) Subject: [tinysofa-svn] r5451 - tinysofa/releases/1.1/nasm Message-ID: <20050104135443.A68D13440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:54:37 -0500 (Tue, 04 Jan 2005) New Revision: 5451 Removed: tinysofa/releases/1.1/nasm/pristine/ Log: nasm: * removing pristine (0.98.38-6ts) From svn at tinysofa.org Tue Jan 4 13:54:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:54:55 -0500 (EST) Subject: [tinysofa-svn] r5452 - tinysofa/releases/1.1/nasm Message-ID: <20050104135455.3587F3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:54:47 -0500 (Tue, 04 Jan 2005) New Revision: 5452 Added: tinysofa/releases/1.1/nasm/pristine/ Log: nasm: * retarget pristine (0.98.38-6ts) to releases/0.98.38/7ts Copied: tinysofa/releases/1.1/nasm/pristine (from rev 5450, tinysofa/releases/1.1/nasm/releases/0.98.38/7ts) From svn at tinysofa.org Tue Jan 4 13:55:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:55:24 -0500 (EST) Subject: [tinysofa-svn] r5453 - in tinysofa/releases/1.1/nc: current/specs releases/1.10 releases/1.10/12ts/specs Message-ID: <20050104135524.262A63440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:55:09 -0500 (Tue, 04 Jan 2005) New Revision: 5453 Added: tinysofa/releases/1.1/nc/releases/1.10/12ts/ Modified: tinysofa/releases/1.1/nc/current/specs/nc.spec tinysofa/releases/1.1/nc/releases/1.10/12ts/specs/nc.spec Log: nc: * integrate current (1.10-12jh) as releases/1.10/12ts Modified: tinysofa/releases/1.1/nc/current/specs/nc.spec =================================================================== --- tinysofa/releases/1.1/nc/current/specs/nc.spec 2005-01-04 13:54:47 UTC (rev 5452) +++ tinysofa/releases/1.1/nc/current/specs/nc.spec 2005-01-04 13:55:09 UTC (rev 5453) @@ -1,7 +1,7 @@ Summary: Reads and writes data across network connections using TCP or UDP. Name: nc Version: 1.10 -Release: 12jh +Release: 12ts Source0: ftp://ftp.avian.org/src/hacks/nc110.tgz Source1: http://www.openbsd.org/src/usr.bin/nc/nc.1 Patch0: nc-arm.patch @@ -66,6 +66,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.10-12ts +- current (1.10-12jh) integrated as 1.10-12ts for release 1.1-U3 + * Mon Nov 01 2004 Radek Vokal 1.10-23 - return value of help function fixed (#137785) Copied: tinysofa/releases/1.1/nc/releases/1.10/12ts (from rev 5268, tinysofa/releases/1.1/nc/current) Modified: tinysofa/releases/1.1/nc/releases/1.10/12ts/specs/nc.spec =================================================================== --- tinysofa/releases/1.1/nc/current/specs/nc.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/nc/releases/1.10/12ts/specs/nc.spec 2005-01-04 13:55:09 UTC (rev 5453) @@ -1,7 +1,7 @@ Summary: Reads and writes data across network connections using TCP or UDP. Name: nc Version: 1.10 -Release: 12jh +Release: 12ts Source0: ftp://ftp.avian.org/src/hacks/nc110.tgz Source1: http://www.openbsd.org/src/usr.bin/nc/nc.1 Patch0: nc-arm.patch @@ -66,6 +66,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.10-12ts +- current (1.10-12jh) integrated as 1.10-12ts for release 1.1-U3 + * Mon Nov 01 2004 Radek Vokal 1.10-23 - return value of help function fixed (#137785) From svn at tinysofa.org Tue Jan 4 13:55:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:55:34 -0500 (EST) Subject: [tinysofa-svn] r5454 - tinysofa/releases/1.1/nc Message-ID: <20050104135534.9F1123440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:55:28 -0500 (Tue, 04 Jan 2005) New Revision: 5454 Removed: tinysofa/releases/1.1/nc/pristine/ Log: nc: * removing pristine (1.10-11ts) From svn at tinysofa.org Tue Jan 4 13:55:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:55:46 -0500 (EST) Subject: [tinysofa-svn] r5455 - tinysofa/releases/1.1/nc Message-ID: <20050104135546.754023440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:55:38 -0500 (Tue, 04 Jan 2005) New Revision: 5455 Added: tinysofa/releases/1.1/nc/pristine/ Log: nc: * retarget pristine (1.10-11ts) to releases/1.10/12ts Copied: tinysofa/releases/1.1/nc/pristine (from rev 5453, tinysofa/releases/1.1/nc/releases/1.10/12ts) From svn at tinysofa.org Tue Jan 4 13:56:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:56:17 -0500 (EST) Subject: [tinysofa-svn] r5456 - in tinysofa/releases/1.1/nfs-utils: current/specs releases/1.0.6 releases/1.0.6/8ts/specs Message-ID: <20050104135617.815E33440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:56:03 -0500 (Tue, 04 Jan 2005) New Revision: 5456 Added: tinysofa/releases/1.1/nfs-utils/releases/1.0.6/8ts/ Modified: tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec tinysofa/releases/1.1/nfs-utils/releases/1.0.6/8ts/specs/nfs-utils.spec Log: nfs-utils: * integrate current (1.0.6-8jh) as releases/1.0.6/8ts Modified: tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2005-01-04 13:55:38 UTC (rev 5455) +++ tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2005-01-04 13:56:03 UTC (rev 5456) @@ -3,7 +3,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.6 -Release: 8jh +Release: 8ts Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.6.tar.gz Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz Source10: nfs.init @@ -219,6 +219,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.0.6-8ts +- current (1.0.6-8jh) integrated as 1.0.6-8ts for release 1.1-U3 + * Fri Dec 10 2004 Jaakko Heinonen 1.0.6-8jh - CAN-2004-1014 fix (nfs-utils-1.0.6-statd-SIGPIPE.patch) Copied: tinysofa/releases/1.1/nfs-utils/releases/1.0.6/8ts (from rev 5268, tinysofa/releases/1.1/nfs-utils/current) Modified: tinysofa/releases/1.1/nfs-utils/releases/1.0.6/8ts/specs/nfs-utils.spec =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/nfs-utils/releases/1.0.6/8ts/specs/nfs-utils.spec 2005-01-04 13:56:03 UTC (rev 5456) @@ -3,7 +3,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.6 -Release: 8jh +Release: 8ts Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.6.tar.gz Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz Source10: nfs.init @@ -219,6 +219,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.0.6-8ts +- current (1.0.6-8jh) integrated as 1.0.6-8ts for release 1.1-U3 + * Fri Dec 10 2004 Jaakko Heinonen 1.0.6-8jh - CAN-2004-1014 fix (nfs-utils-1.0.6-statd-SIGPIPE.patch) From svn at tinysofa.org Tue Jan 4 13:56:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:56:28 -0500 (EST) Subject: [tinysofa-svn] r5457 - tinysofa/releases/1.1/nfs-utils Message-ID: <20050104135628.1242B3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:56:21 -0500 (Tue, 04 Jan 2005) New Revision: 5457 Removed: tinysofa/releases/1.1/nfs-utils/pristine/ Log: nfs-utils: * removing pristine (1.0.6-7ts) From svn at tinysofa.org Tue Jan 4 13:56:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:56:39 -0500 (EST) Subject: [tinysofa-svn] r5458 - tinysofa/releases/1.1/nfs-utils Message-ID: <20050104135639.5A1353440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:56:31 -0500 (Tue, 04 Jan 2005) New Revision: 5458 Added: tinysofa/releases/1.1/nfs-utils/pristine/ Log: nfs-utils: * retarget pristine (1.0.6-7ts) to releases/1.0.6/8ts Copied: tinysofa/releases/1.1/nfs-utils/pristine (from rev 5456, tinysofa/releases/1.1/nfs-utils/releases/1.0.6/8ts) From svn at tinysofa.org Tue Jan 4 13:56:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:56:59 -0500 (EST) Subject: [tinysofa-svn] r5459 - in tinysofa/releases/1.1/nss_ldap: current/specs releases releases/226 releases/226/2ts/specs Message-ID: <20050104135659.933963440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:56:46 -0500 (Tue, 04 Jan 2005) New Revision: 5459 Added: tinysofa/releases/1.1/nss_ldap/releases/226/ tinysofa/releases/1.1/nss_ldap/releases/226/2ts/ Modified: tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec tinysofa/releases/1.1/nss_ldap/releases/226/2ts/specs/nss_ldap.spec Log: nss_ldap: * integrate current (226-2jh) as releases/226/2ts Modified: tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec =================================================================== --- tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec 2005-01-04 13:56:31 UTC (rev 5458) +++ tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec 2005-01-04 13:56:46 UTC (rev 5459) @@ -3,7 +3,7 @@ Summary: NSS library and PAM module for LDAP. Name: nss_ldap Version: %{nss_ldap_version} -Release: 2jh +Release: 2ts Source0: ftp://ftp.padl.com/pub/nss_ldap-%{nss_ldap_version}.tar.gz Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz Source3: nss_ldap.versions @@ -213,6 +213,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 226-2ts +- current (226-2jh) integrated as 226-2ts for release 1.1-U3 + * Tue Nov 9 2004 Jaakko Heinonen 226-2jh - include /lib/libnss_ldap.so.2 link to the nss_ldap package Copied: tinysofa/releases/1.1/nss_ldap/releases/226/2ts (from rev 5268, tinysofa/releases/1.1/nss_ldap/current) Modified: tinysofa/releases/1.1/nss_ldap/releases/226/2ts/specs/nss_ldap.spec =================================================================== --- tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/nss_ldap/releases/226/2ts/specs/nss_ldap.spec 2005-01-04 13:56:46 UTC (rev 5459) @@ -3,7 +3,7 @@ Summary: NSS library and PAM module for LDAP. Name: nss_ldap Version: %{nss_ldap_version} -Release: 2jh +Release: 2ts Source0: ftp://ftp.padl.com/pub/nss_ldap-%{nss_ldap_version}.tar.gz Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz Source3: nss_ldap.versions @@ -213,6 +213,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 226-2ts +- current (226-2jh) integrated as 226-2ts for release 1.1-U3 + * Tue Nov 9 2004 Jaakko Heinonen 226-2jh - include /lib/libnss_ldap.so.2 link to the nss_ldap package From svn at tinysofa.org Tue Jan 4 13:57:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:57:09 -0500 (EST) Subject: [tinysofa-svn] r5460 - tinysofa/releases/1.1/nss_ldap Message-ID: <20050104135709.AB6F23440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:57:03 -0500 (Tue, 04 Jan 2005) New Revision: 5460 Removed: tinysofa/releases/1.1/nss_ldap/pristine/ Log: nss_ldap: * removing pristine (220-1ts) From svn at tinysofa.org Tue Jan 4 13:57:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:57:21 -0500 (EST) Subject: [tinysofa-svn] r5461 - tinysofa/releases/1.1/nss_ldap Message-ID: <20050104135721.4E0103440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:57:13 -0500 (Tue, 04 Jan 2005) New Revision: 5461 Added: tinysofa/releases/1.1/nss_ldap/pristine/ Log: nss_ldap: * retarget pristine (220-1ts) to releases/226/2ts Copied: tinysofa/releases/1.1/nss_ldap/pristine (from rev 5459, tinysofa/releases/1.1/nss_ldap/releases/226/2ts) From svn at tinysofa.org Tue Jan 4 13:57:51 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:57:51 -0500 (EST) Subject: [tinysofa-svn] r5462 - in tinysofa/releases/1.1/openldap: current/specs releases/2.1.30 releases/2.1.30/5ts/specs Message-ID: <20050104135751.030AC3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:57:38 -0500 (Tue, 04 Jan 2005) New Revision: 5462 Added: tinysofa/releases/1.1/openldap/releases/2.1.30/5ts/ Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec tinysofa/releases/1.1/openldap/releases/2.1.30/5ts/specs/openldap.spec Log: openldap: * integrate current (2.1.30-5jh) as releases/2.1.30/5ts Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec =================================================================== --- tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2005-01-04 13:57:13 UTC (rev 5461) +++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2005-01-04 13:57:38 UTC (rev 5462) @@ -6,7 +6,7 @@ Summary: Lightweight Directory Access Protocol clients/servers Name: openldap Version: 2.1.30 -Release: 5jh +Release: 5ts Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz Source1: openldap.init Source2: openldap-slapd.conf @@ -280,6 +280,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.1.30-5ts +- current (2.1.30-5jh) integrated as 2.1.30-5ts for release 1.1-U3 + * Thu Oct 21 2004 Jaakko Heinonen 2.1.30-5jh - change start priority Copied: tinysofa/releases/1.1/openldap/releases/2.1.30/5ts (from rev 5268, tinysofa/releases/1.1/openldap/current) Modified: tinysofa/releases/1.1/openldap/releases/2.1.30/5ts/specs/openldap.spec =================================================================== --- tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/openldap/releases/2.1.30/5ts/specs/openldap.spec 2005-01-04 13:57:38 UTC (rev 5462) @@ -6,7 +6,7 @@ Summary: Lightweight Directory Access Protocol clients/servers Name: openldap Version: 2.1.30 -Release: 5jh +Release: 5ts Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz Source1: openldap.init Source2: openldap-slapd.conf @@ -280,6 +280,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.1.30-5ts +- current (2.1.30-5jh) integrated as 2.1.30-5ts for release 1.1-U3 + * Thu Oct 21 2004 Jaakko Heinonen 2.1.30-5jh - change start priority From svn at tinysofa.org Tue Jan 4 13:58:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:58:03 -0500 (EST) Subject: [tinysofa-svn] r5463 - tinysofa/releases/1.1/openldap Message-ID: <20050104135803.368B43440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:57:56 -0500 (Tue, 04 Jan 2005) New Revision: 5463 Removed: tinysofa/releases/1.1/openldap/pristine/ Log: openldap: * removing pristine (2.1.30-3ts) From svn at tinysofa.org Tue Jan 4 13:58:15 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:58:15 -0500 (EST) Subject: [tinysofa-svn] r5464 - tinysofa/releases/1.1/openldap Message-ID: <20050104135815.5E8AE3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:58:07 -0500 (Tue, 04 Jan 2005) New Revision: 5464 Added: tinysofa/releases/1.1/openldap/pristine/ Log: openldap: * retarget pristine (2.1.30-3ts) to releases/2.1.30/5ts Copied: tinysofa/releases/1.1/openldap/pristine (from rev 5462, tinysofa/releases/1.1/openldap/releases/2.1.30/5ts) From svn at tinysofa.org Tue Jan 4 13:58:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:58:34 -0500 (EST) Subject: [tinysofa-svn] r5465 - in tinysofa/releases/1.1/openssh: current/specs releases releases/3.8.1p1 releases/3.8.1p1/2ts/specs Message-ID: <20050104135834.6AEEB3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:58:21 -0500 (Tue, 04 Jan 2005) New Revision: 5465 Added: tinysofa/releases/1.1/openssh/releases/3.8.1p1/ tinysofa/releases/1.1/openssh/releases/3.8.1p1/2ts/ Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec tinysofa/releases/1.1/openssh/releases/3.8.1p1/2ts/specs/openssh.spec Log: openssh: * integrate current (3.8.1p1-2jh) as releases/3.8.1p1/2ts Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec =================================================================== --- tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2005-01-04 13:58:07 UTC (rev 5464) +++ tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2005-01-04 13:58:21 UTC (rev 5465) @@ -4,7 +4,7 @@ Summary: OpenSSH free Secure Shell (SSH) implementation Name: openssh Version: 3.8.1p1 -Release: 2jh +Release: 2ts License: BSD Group: main Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{realversion}.tar.gz @@ -202,6 +202,9 @@ %attr(0644,root,root) %config(noreplace) /etc/ssh/sshd_config %changelog +* Tue Jan 04 2005 tsintegrate 3.8.1p1-2ts +- current (3.8.1p1-2jh) integrated as 3.8.1p1-2ts for release 1.1-U3 + * Wed Dec 15 2004 Jaakko Heinonen 3.8.1p1-2jh - server requires now tcp_wrappers Copied: tinysofa/releases/1.1/openssh/releases/3.8.1p1/2ts (from rev 5268, tinysofa/releases/1.1/openssh/current) Modified: tinysofa/releases/1.1/openssh/releases/3.8.1p1/2ts/specs/openssh.spec =================================================================== --- tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/openssh/releases/3.8.1p1/2ts/specs/openssh.spec 2005-01-04 13:58:21 UTC (rev 5465) @@ -4,7 +4,7 @@ Summary: OpenSSH free Secure Shell (SSH) implementation Name: openssh Version: 3.8.1p1 -Release: 2jh +Release: 2ts License: BSD Group: main Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{realversion}.tar.gz @@ -202,6 +202,9 @@ %attr(0644,root,root) %config(noreplace) /etc/ssh/sshd_config %changelog +* Tue Jan 04 2005 tsintegrate 3.8.1p1-2ts +- current (3.8.1p1-2jh) integrated as 3.8.1p1-2ts for release 1.1-U3 + * Wed Dec 15 2004 Jaakko Heinonen 3.8.1p1-2jh - server requires now tcp_wrappers From svn at tinysofa.org Tue Jan 4 13:58:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:58:44 -0500 (EST) Subject: [tinysofa-svn] r5466 - tinysofa/releases/1.1/openssh Message-ID: <20050104135844.A5BFB3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:58:38 -0500 (Tue, 04 Jan 2005) New Revision: 5466 Removed: tinysofa/releases/1.1/openssh/pristine/ Log: openssh: * removing pristine (3.8.0p1-6ts) From svn at tinysofa.org Tue Jan 4 13:58:56 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:58:56 -0500 (EST) Subject: [tinysofa-svn] r5467 - tinysofa/releases/1.1/openssh Message-ID: <20050104135856.359FB3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:58:48 -0500 (Tue, 04 Jan 2005) New Revision: 5467 Added: tinysofa/releases/1.1/openssh/pristine/ Log: openssh: * retarget pristine (3.8.0p1-6ts) to releases/3.8.1p1/2ts Copied: tinysofa/releases/1.1/openssh/pristine (from rev 5465, tinysofa/releases/1.1/openssh/releases/3.8.1p1/2ts) From svn at tinysofa.org Tue Jan 4 13:59:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:59:18 -0500 (EST) Subject: [tinysofa-svn] r5468 - in tinysofa/releases/1.1/openssl: current/specs releases releases/0.9.7e releases/0.9.7e/2ts/specs Message-ID: <20050104135918.108A43440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:59:04 -0500 (Tue, 04 Jan 2005) New Revision: 5468 Added: tinysofa/releases/1.1/openssl/releases/0.9.7e/ tinysofa/releases/1.1/openssl/releases/0.9.7e/2ts/ Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec tinysofa/releases/1.1/openssl/releases/0.9.7e/2ts/specs/openssl.spec Log: openssl: * integrate current (0.9.7e-2jh) as releases/0.9.7e/2ts Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec =================================================================== --- tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2005-01-04 13:58:48 UTC (rev 5467) +++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2005-01-04 13:59:04 UTC (rev 5468) @@ -2,7 +2,7 @@ Name: openssl %define majorver 0.9.7 Version: %{majorver}e -Release: 2jh +Release: 2ts License: BSD-like Group: main %define m2crypto_version 0.13.1 @@ -246,6 +246,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.9.7e-2ts +- current (0.9.7e-2jh) integrated as 0.9.7e-2ts for release 1.1-U3 + * Sat Dec 18 2004 Jaakko Heinonen 0.9.7e-2jh - install ca-bundle.crt Copied: tinysofa/releases/1.1/openssl/releases/0.9.7e/2ts (from rev 5268, tinysofa/releases/1.1/openssl/current) Modified: tinysofa/releases/1.1/openssl/releases/0.9.7e/2ts/specs/openssl.spec =================================================================== --- tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/openssl/releases/0.9.7e/2ts/specs/openssl.spec 2005-01-04 13:59:04 UTC (rev 5468) @@ -2,7 +2,7 @@ Name: openssl %define majorver 0.9.7 Version: %{majorver}e -Release: 2jh +Release: 2ts License: BSD-like Group: main %define m2crypto_version 0.13.1 @@ -246,6 +246,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.9.7e-2ts +- current (0.9.7e-2jh) integrated as 0.9.7e-2ts for release 1.1-U3 + * Sat Dec 18 2004 Jaakko Heinonen 0.9.7e-2jh - install ca-bundle.crt From svn at tinysofa.org Tue Jan 4 13:59:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:59:28 -0500 (EST) Subject: [tinysofa-svn] r5469 - tinysofa/releases/1.1/openssl Message-ID: <20050104135928.B1AA73440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:59:22 -0500 (Tue, 04 Jan 2005) New Revision: 5469 Removed: tinysofa/releases/1.1/openssl/pristine/ Log: openssl: * removing pristine (0.9.7c-12ts) From svn at tinysofa.org Tue Jan 4 13:59:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 08:59:40 -0500 (EST) Subject: [tinysofa-svn] r5470 - tinysofa/releases/1.1/openssl Message-ID: <20050104135940.687623440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:59:32 -0500 (Tue, 04 Jan 2005) New Revision: 5470 Added: tinysofa/releases/1.1/openssl/pristine/ Log: openssl: * retarget pristine (0.9.7c-12ts) to releases/0.9.7e/2ts Copied: tinysofa/releases/1.1/openssl/pristine (from rev 5468, tinysofa/releases/1.1/openssl/releases/0.9.7e/2ts) From svn at tinysofa.org Tue Jan 4 14:00:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:00:00 -0500 (EST) Subject: [tinysofa-svn] r5471 - in tinysofa/releases/1.1/openswan: current/specs releases releases/2.2.0 releases/2.2.0/1ts/specs Message-ID: <20050104140000.46687344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 08:59:46 -0500 (Tue, 04 Jan 2005) New Revision: 5471 Added: tinysofa/releases/1.1/openswan/releases/2.2.0/ tinysofa/releases/1.1/openswan/releases/2.2.0/1ts/ Modified: tinysofa/releases/1.1/openswan/current/specs/openswan.spec tinysofa/releases/1.1/openswan/releases/2.2.0/1ts/specs/openswan.spec Log: openswan: * integrate current (2.2.0-1jh) as releases/2.2.0/1ts Modified: tinysofa/releases/1.1/openswan/current/specs/openswan.spec =================================================================== --- tinysofa/releases/1.1/openswan/current/specs/openswan.spec 2005-01-04 13:59:32 UTC (rev 5470) +++ tinysofa/releases/1.1/openswan/current/specs/openswan.spec 2005-01-04 13:59:46 UTC (rev 5471) @@ -1,7 +1,7 @@ Summary: A free ipsec VPN solution for Linux Name: openswan Version: 2.2.0 -Release: 1jh +Release: 1ts License: GPL Group: main URL: http://www.openswan.org/ @@ -113,6 +113,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.2.0-1ts +- current (2.2.0-1jh) integrated as 2.2.0-1ts for release 1.1-U3 + * Mon Nov 15 2004 Jaakko Heinonen - multilib fix - make with -j1 Copied: tinysofa/releases/1.1/openswan/releases/2.2.0/1ts (from rev 5268, tinysofa/releases/1.1/openswan/current) Modified: tinysofa/releases/1.1/openswan/releases/2.2.0/1ts/specs/openswan.spec =================================================================== --- tinysofa/releases/1.1/openswan/current/specs/openswan.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/openswan/releases/2.2.0/1ts/specs/openswan.spec 2005-01-04 13:59:46 UTC (rev 5471) @@ -1,7 +1,7 @@ Summary: A free ipsec VPN solution for Linux Name: openswan Version: 2.2.0 -Release: 1jh +Release: 1ts License: GPL Group: main URL: http://www.openswan.org/ @@ -113,6 +113,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.2.0-1ts +- current (2.2.0-1jh) integrated as 2.2.0-1ts for release 1.1-U3 + * Mon Nov 15 2004 Jaakko Heinonen - multilib fix - make with -j1 From svn at tinysofa.org Tue Jan 4 14:00:10 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:00:10 -0500 (EST) Subject: [tinysofa-svn] r5472 - tinysofa/releases/1.1/openswan Message-ID: <20050104140010.B3D453440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:00:04 -0500 (Tue, 04 Jan 2005) New Revision: 5472 Removed: tinysofa/releases/1.1/openswan/pristine/ Log: openswan: * removing pristine (2.1.4-1ts) From svn at tinysofa.org Tue Jan 4 14:00:22 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:00:22 -0500 (EST) Subject: [tinysofa-svn] r5473 - tinysofa/releases/1.1/openswan Message-ID: <20050104140022.4D4AA3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:00:14 -0500 (Tue, 04 Jan 2005) New Revision: 5473 Added: tinysofa/releases/1.1/openswan/pristine/ Log: openswan: * retarget pristine (2.1.4-1ts) to releases/2.2.0/1ts Copied: tinysofa/releases/1.1/openswan/pristine (from rev 5471, tinysofa/releases/1.1/openswan/releases/2.2.0/1ts) From svn at tinysofa.org Tue Jan 4 14:00:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:00:54 -0500 (EST) Subject: [tinysofa-svn] r5474 - in tinysofa/releases/1.1/pam: current/specs releases/0.77 releases/0.77/43ts/specs Message-ID: <20050104140054.787623440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:00:40 -0500 (Tue, 04 Jan 2005) New Revision: 5474 Added: tinysofa/releases/1.1/pam/releases/0.77/43ts/ Modified: tinysofa/releases/1.1/pam/current/specs/pam.spec tinysofa/releases/1.1/pam/releases/0.77/43ts/specs/pam.spec Log: pam: * integrate current (0.77-43jh) as releases/0.77/43ts Modified: tinysofa/releases/1.1/pam/current/specs/pam.spec =================================================================== --- tinysofa/releases/1.1/pam/current/specs/pam.spec 2005-01-04 14:00:14 UTC (rev 5473) +++ tinysofa/releases/1.1/pam/current/specs/pam.spec 2005-01-04 14:00:40 UTC (rev 5474) @@ -9,7 +9,7 @@ Summary: A security tool which provides authentication for applications. Name: pam Version: 0.77 -Release: 43jh +Release: 43ts License: GPL or BSD Group: main Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -414,6 +414,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.77-43ts +- current (0.77-43jh) integrated as 0.77-43ts for release 1.1-U3 + * Wed Dec 8 2004 Jaakko Heinonen - fix other.pamd for multilib arches Copied: tinysofa/releases/1.1/pam/releases/0.77/43ts (from rev 5268, tinysofa/releases/1.1/pam/current) Modified: tinysofa/releases/1.1/pam/releases/0.77/43ts/specs/pam.spec =================================================================== --- tinysofa/releases/1.1/pam/current/specs/pam.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/pam/releases/0.77/43ts/specs/pam.spec 2005-01-04 14:00:40 UTC (rev 5474) @@ -9,7 +9,7 @@ Summary: A security tool which provides authentication for applications. Name: pam Version: 0.77 -Release: 43jh +Release: 43ts License: GPL or BSD Group: main Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -414,6 +414,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.77-43ts +- current (0.77-43jh) integrated as 0.77-43ts for release 1.1-U3 + * Wed Dec 8 2004 Jaakko Heinonen - fix other.pamd for multilib arches From svn at tinysofa.org Tue Jan 4 14:01:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:01:04 -0500 (EST) Subject: [tinysofa-svn] r5475 - tinysofa/releases/1.1/pam Message-ID: <20050104140104.D77563440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:00:58 -0500 (Tue, 04 Jan 2005) New Revision: 5475 Removed: tinysofa/releases/1.1/pam/pristine/ Log: pam: * removing pristine (0.77-42ts) From svn at tinysofa.org Tue Jan 4 14:01:16 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:01:16 -0500 (EST) Subject: [tinysofa-svn] r5476 - tinysofa/releases/1.1/pam Message-ID: <20050104140116.CC2E53440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:01:08 -0500 (Tue, 04 Jan 2005) New Revision: 5476 Added: tinysofa/releases/1.1/pam/pristine/ Log: pam: * retarget pristine (0.77-42ts) to releases/0.77/43ts Copied: tinysofa/releases/1.1/pam/pristine (from rev 5474, tinysofa/releases/1.1/pam/releases/0.77/43ts) From svn at tinysofa.org Tue Jan 4 14:01:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:01:46 -0500 (EST) Subject: [tinysofa-svn] r5477 - in tinysofa/releases/1.1/patch: current/specs releases/2.5.4 releases/2.5.4/13ts/specs Message-ID: <20050104140146.0E6A83440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:01:32 -0500 (Tue, 04 Jan 2005) New Revision: 5477 Added: tinysofa/releases/1.1/patch/releases/2.5.4/13ts/ Modified: tinysofa/releases/1.1/patch/current/specs/patch.spec tinysofa/releases/1.1/patch/releases/2.5.4/13ts/specs/patch.spec Log: patch: * integrate current (2.5.4-13jh) as releases/2.5.4/13ts Modified: tinysofa/releases/1.1/patch/current/specs/patch.spec =================================================================== --- tinysofa/releases/1.1/patch/current/specs/patch.spec 2005-01-04 14:01:08 UTC (rev 5476) +++ tinysofa/releases/1.1/patch/current/specs/patch.spec 2005-01-04 14:01:32 UTC (rev 5477) @@ -1,7 +1,7 @@ Summary: The GNU patch command, for modifying/upgrading files. Name: patch Version: 2.5.4 -Release: 13jh +Release: 13ts License: GPL URL: http://www.gnu.org/software/patch/patch.html Group: development @@ -61,6 +61,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.5.4-13ts +- current (2.5.4-13jh) integrated as 2.5.4-13ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt Copied: tinysofa/releases/1.1/patch/releases/2.5.4/13ts (from rev 5268, tinysofa/releases/1.1/patch/current) Modified: tinysofa/releases/1.1/patch/releases/2.5.4/13ts/specs/patch.spec =================================================================== --- tinysofa/releases/1.1/patch/current/specs/patch.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/patch/releases/2.5.4/13ts/specs/patch.spec 2005-01-04 14:01:32 UTC (rev 5477) @@ -1,7 +1,7 @@ Summary: The GNU patch command, for modifying/upgrading files. Name: patch Version: 2.5.4 -Release: 13jh +Release: 13ts License: GPL URL: http://www.gnu.org/software/patch/patch.html Group: development @@ -61,6 +61,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.5.4-13ts +- current (2.5.4-13jh) integrated as 2.5.4-13ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt From svn at tinysofa.org Tue Jan 4 14:01:56 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:01:56 -0500 (EST) Subject: [tinysofa-svn] r5478 - tinysofa/releases/1.1/patch Message-ID: <20050104140156.A44033440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:01:50 -0500 (Tue, 04 Jan 2005) New Revision: 5478 Removed: tinysofa/releases/1.1/patch/pristine/ Log: patch: * removing pristine (2.5.4-12ts) From svn at tinysofa.org Tue Jan 4 14:02:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:02:08 -0500 (EST) Subject: [tinysofa-svn] r5479 - tinysofa/releases/1.1/patch Message-ID: <20050104140208.384C83440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:02:00 -0500 (Tue, 04 Jan 2005) New Revision: 5479 Added: tinysofa/releases/1.1/patch/pristine/ Log: patch: * retarget pristine (2.5.4-12ts) to releases/2.5.4/13ts Copied: tinysofa/releases/1.1/patch/pristine (from rev 5477, tinysofa/releases/1.1/patch/releases/2.5.4/13ts) From svn at tinysofa.org Tue Jan 4 14:02:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:02:28 -0500 (EST) Subject: [tinysofa-svn] r5480 - in tinysofa/releases/1.1/php4: current/specs releases releases/4.3.10 releases/4.3.10/1ts/specs Message-ID: <20050104140228.04BEC3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:02:15 -0500 (Tue, 04 Jan 2005) New Revision: 5480 Added: tinysofa/releases/1.1/php4/releases/4.3.10/ tinysofa/releases/1.1/php4/releases/4.3.10/1ts/ Modified: tinysofa/releases/1.1/php4/current/specs/php4.spec tinysofa/releases/1.1/php4/releases/4.3.10/1ts/specs/php4.spec Log: php4: * integrate current (4.3.10-1jh) as releases/4.3.10/1ts Modified: tinysofa/releases/1.1/php4/current/specs/php4.spec =================================================================== --- tinysofa/releases/1.1/php4/current/specs/php4.spec 2005-01-04 14:02:00 UTC (rev 5479) +++ tinysofa/releases/1.1/php4/current/specs/php4.spec 2005-01-04 14:02:15 UTC (rev 5480) @@ -7,7 +7,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php4 Version: 4.3.10 -Release: 1jh +Release: 1ts License: The PHP License Group: main URL: http://www.php.net/ @@ -610,6 +610,9 @@ %endif %changelog +* Tue Jan 04 2005 tsintegrate 4.3.10-1ts +- current (4.3.10-1jh) integrated as 4.3.10-1ts for release 1.1-U3 + * Fri Dec 17 2004 Jaakko Heinonen 4.3.10-1jh - 4.3.10 Copied: tinysofa/releases/1.1/php4/releases/4.3.10/1ts (from rev 5268, tinysofa/releases/1.1/php4/current) Modified: tinysofa/releases/1.1/php4/releases/4.3.10/1ts/specs/php4.spec =================================================================== --- tinysofa/releases/1.1/php4/current/specs/php4.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/php4/releases/4.3.10/1ts/specs/php4.spec 2005-01-04 14:02:15 UTC (rev 5480) @@ -7,7 +7,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php4 Version: 4.3.10 -Release: 1jh +Release: 1ts License: The PHP License Group: main URL: http://www.php.net/ @@ -610,6 +610,9 @@ %endif %changelog +* Tue Jan 04 2005 tsintegrate 4.3.10-1ts +- current (4.3.10-1jh) integrated as 4.3.10-1ts for release 1.1-U3 + * Fri Dec 17 2004 Jaakko Heinonen 4.3.10-1jh - 4.3.10 From svn at tinysofa.org Tue Jan 4 14:02:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:02:39 -0500 (EST) Subject: [tinysofa-svn] r5481 - tinysofa/releases/1.1/php4 Message-ID: <20050104140239.967FC3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:02:33 -0500 (Tue, 04 Jan 2005) New Revision: 5481 Removed: tinysofa/releases/1.1/php4/pristine/ Log: php4: * removing pristine (4.3.8-5ts) From svn at tinysofa.org Tue Jan 4 14:02:51 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:02:51 -0500 (EST) Subject: [tinysofa-svn] r5482 - tinysofa/releases/1.1/php4 Message-ID: <20050104140251.51A943440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:02:43 -0500 (Tue, 04 Jan 2005) New Revision: 5482 Added: tinysofa/releases/1.1/php4/pristine/ Log: php4: * retarget pristine (4.3.8-5ts) to releases/4.3.10/1ts Copied: tinysofa/releases/1.1/php4/pristine (from rev 5480, tinysofa/releases/1.1/php4/releases/4.3.10/1ts) From svn at tinysofa.org Tue Jan 4 14:03:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:03:17 -0500 (EST) Subject: [tinysofa-svn] r5483 - in tinysofa/releases/1.1/postgresql: current/specs releases releases/7.4.5 releases/7.4.5/1ts/specs Message-ID: <20050104140317.0D00C3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:03:03 -0500 (Tue, 04 Jan 2005) New Revision: 5483 Added: tinysofa/releases/1.1/postgresql/releases/7.4.5/ tinysofa/releases/1.1/postgresql/releases/7.4.5/1ts/ Modified: tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec tinysofa/releases/1.1/postgresql/releases/7.4.5/1ts/specs/postgresql.spec Log: postgresql: * integrate current (7.4.5-1jh) as releases/7.4.5/1ts Modified: tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec =================================================================== --- tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec 2005-01-04 14:02:43 UTC (rev 5482) +++ tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec 2005-01-04 14:03:03 UTC (rev 5483) @@ -8,7 +8,7 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql Version: 7.4.5 -Release: 1jh +Release: 1ts License: BSD Group: main Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 @@ -653,6 +653,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 7.4.5-1ts +- current (7.4.5-1jh) integrated as 7.4.5-1ts for release 1.1-U3 + * Tue Oct 19 2004 Jaakko Heinonen 7.4.5-1jh - 7.4.5 - add tempfile patch Copied: tinysofa/releases/1.1/postgresql/releases/7.4.5/1ts (from rev 5268, tinysofa/releases/1.1/postgresql/current) Modified: tinysofa/releases/1.1/postgresql/releases/7.4.5/1ts/specs/postgresql.spec =================================================================== --- tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/postgresql/releases/7.4.5/1ts/specs/postgresql.spec 2005-01-04 14:03:03 UTC (rev 5483) @@ -8,7 +8,7 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql Version: 7.4.5 -Release: 1jh +Release: 1ts License: BSD Group: main Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 @@ -653,6 +653,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 7.4.5-1ts +- current (7.4.5-1jh) integrated as 7.4.5-1ts for release 1.1-U3 + * Tue Oct 19 2004 Jaakko Heinonen 7.4.5-1jh - 7.4.5 - add tempfile patch From svn at tinysofa.org Tue Jan 4 14:03:27 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:03:27 -0500 (EST) Subject: [tinysofa-svn] r5484 - tinysofa/releases/1.1/postgresql Message-ID: <20050104140327.C3B403440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:03:21 -0500 (Tue, 04 Jan 2005) New Revision: 5484 Removed: tinysofa/releases/1.1/postgresql/pristine/ Log: postgresql: * removing pristine (7.4.3-3ts) From svn at tinysofa.org Tue Jan 4 14:03:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:03:40 -0500 (EST) Subject: [tinysofa-svn] r5485 - tinysofa/releases/1.1/postgresql Message-ID: <20050104140340.072233440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:03:32 -0500 (Tue, 04 Jan 2005) New Revision: 5485 Added: tinysofa/releases/1.1/postgresql/pristine/ Log: postgresql: * retarget pristine (7.4.3-3ts) to releases/7.4.5/1ts Copied: tinysofa/releases/1.1/postgresql/pristine (from rev 5483, tinysofa/releases/1.1/postgresql/releases/7.4.5/1ts) From svn at tinysofa.org Tue Jan 4 14:04:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:04:00 -0500 (EST) Subject: [tinysofa-svn] r5486 - in tinysofa/releases/1.1/procps: current/specs releases releases/3.2.3 releases/3.2.3/1ts/specs Message-ID: <20050104140400.35E383440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:03:46 -0500 (Tue, 04 Jan 2005) New Revision: 5486 Added: tinysofa/releases/1.1/procps/releases/3.2.3/ tinysofa/releases/1.1/procps/releases/3.2.3/1ts/ Modified: tinysofa/releases/1.1/procps/current/specs/procps.spec tinysofa/releases/1.1/procps/releases/3.2.3/1ts/specs/procps.spec Log: procps: * integrate current (3.2.3-1jh) as releases/3.2.3/1ts Modified: tinysofa/releases/1.1/procps/current/specs/procps.spec =================================================================== --- tinysofa/releases/1.1/procps/current/specs/procps.spec 2005-01-04 14:03:32 UTC (rev 5485) +++ tinysofa/releases/1.1/procps/current/specs/procps.spec 2005-01-04 14:03:46 UTC (rev 5486) @@ -1,7 +1,7 @@ Summary: System and process monitoring utilities. Name: procps Version: 3.2.3 -Release: 1jh +Release: 1ts License: GPL Group: main Source: http://procps.sourceforge.net/procps-%{version}.tar.gz @@ -78,6 +78,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.2.3-1ts +- current (3.2.3-1jh) integrated as 3.2.3-1ts for release 1.1-U3 + * Tue Sep 28 2004 Dan Walsh 3.2.3-5 - Fix terminal handling when /proc is not available. - Patch provided by Karel Zak Copied: tinysofa/releases/1.1/procps/releases/3.2.3/1ts (from rev 5268, tinysofa/releases/1.1/procps/current) Modified: tinysofa/releases/1.1/procps/releases/3.2.3/1ts/specs/procps.spec =================================================================== --- tinysofa/releases/1.1/procps/current/specs/procps.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/procps/releases/3.2.3/1ts/specs/procps.spec 2005-01-04 14:03:46 UTC (rev 5486) @@ -1,7 +1,7 @@ Summary: System and process monitoring utilities. Name: procps Version: 3.2.3 -Release: 1jh +Release: 1ts License: GPL Group: main Source: http://procps.sourceforge.net/procps-%{version}.tar.gz @@ -78,6 +78,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.2.3-1ts +- current (3.2.3-1jh) integrated as 3.2.3-1ts for release 1.1-U3 + * Tue Sep 28 2004 Dan Walsh 3.2.3-5 - Fix terminal handling when /proc is not available. - Patch provided by Karel Zak From svn at tinysofa.org Tue Jan 4 14:04:10 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:04:10 -0500 (EST) Subject: [tinysofa-svn] r5487 - tinysofa/releases/1.1/procps Message-ID: <20050104140410.AD5463440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:04:04 -0500 (Tue, 04 Jan 2005) New Revision: 5487 Removed: tinysofa/releases/1.1/procps/pristine/ Log: procps: * removing pristine (3.2.1-2ts) From svn at tinysofa.org Tue Jan 4 14:04:22 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:04:22 -0500 (EST) Subject: [tinysofa-svn] r5488 - tinysofa/releases/1.1/procps Message-ID: <20050104140422.3829F3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:04:14 -0500 (Tue, 04 Jan 2005) New Revision: 5488 Added: tinysofa/releases/1.1/procps/pristine/ Log: procps: * retarget pristine (3.2.1-2ts) to releases/3.2.3/1ts Copied: tinysofa/releases/1.1/procps/pristine (from rev 5486, tinysofa/releases/1.1/procps/releases/3.2.3/1ts) From svn at tinysofa.org Tue Jan 4 14:04:42 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:04:42 -0500 (EST) Subject: [tinysofa-svn] r5489 - in tinysofa/releases/1.1/rdate: current/specs releases releases/1.4 releases/1.4/1ts/specs Message-ID: <20050104140442.D82673440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:04:28 -0500 (Tue, 04 Jan 2005) New Revision: 5489 Added: tinysofa/releases/1.1/rdate/releases/1.4/ tinysofa/releases/1.1/rdate/releases/1.4/1ts/ Modified: tinysofa/releases/1.1/rdate/current/specs/rdate.spec tinysofa/releases/1.1/rdate/releases/1.4/1ts/specs/rdate.spec Log: rdate: * integrate current (1.4-1jh) as releases/1.4/1ts Modified: tinysofa/releases/1.1/rdate/current/specs/rdate.spec =================================================================== --- tinysofa/releases/1.1/rdate/current/specs/rdate.spec 2005-01-04 14:04:14 UTC (rev 5488) +++ tinysofa/releases/1.1/rdate/current/specs/rdate.spec 2005-01-04 14:04:28 UTC (rev 5489) @@ -1,7 +1,7 @@ Summary: Tool for getting the date/time from a remote machine. Name: rdate Version: 1.4 -Release: 1jh +Release: 1ts License: GPL Group: extra Source: ftp://people.redhat.com/sopwith/rdate-%{version}.tar.gz @@ -38,6 +38,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.4-1ts +- current (1.4-1jh) integrated as 1.4-1ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt Copied: tinysofa/releases/1.1/rdate/releases/1.4/1ts (from rev 5268, tinysofa/releases/1.1/rdate/current) Modified: tinysofa/releases/1.1/rdate/releases/1.4/1ts/specs/rdate.spec =================================================================== --- tinysofa/releases/1.1/rdate/current/specs/rdate.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/rdate/releases/1.4/1ts/specs/rdate.spec 2005-01-04 14:04:28 UTC (rev 5489) @@ -1,7 +1,7 @@ Summary: Tool for getting the date/time from a remote machine. Name: rdate Version: 1.4 -Release: 1jh +Release: 1ts License: GPL Group: extra Source: ftp://people.redhat.com/sopwith/rdate-%{version}.tar.gz @@ -38,6 +38,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.4-1ts +- current (1.4-1jh) integrated as 1.4-1ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt From svn at tinysofa.org Tue Jan 4 14:04:52 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:04:52 -0500 (EST) Subject: [tinysofa-svn] r5490 - tinysofa/releases/1.1/rdate Message-ID: <20050104140452.90A223440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:04:46 -0500 (Tue, 04 Jan 2005) New Revision: 5490 Removed: tinysofa/releases/1.1/rdate/pristine/ Log: rdate: * removing pristine (1.3-2ts) From svn at tinysofa.org Tue Jan 4 14:05:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:05:04 -0500 (EST) Subject: [tinysofa-svn] r5491 - tinysofa/releases/1.1/rdate Message-ID: <20050104140504.364D03440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:04:56 -0500 (Tue, 04 Jan 2005) New Revision: 5491 Added: tinysofa/releases/1.1/rdate/pristine/ Log: rdate: * retarget pristine (1.3-2ts) to releases/1.4/1ts Copied: tinysofa/releases/1.1/rdate/pristine (from rev 5489, tinysofa/releases/1.1/rdate/releases/1.4/1ts) From svn at tinysofa.org Tue Jan 4 14:05:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:05:32 -0500 (EST) Subject: [tinysofa-svn] r5492 - in tinysofa/releases/1.1/release: current/specs releases/1.1 releases/1.1/3ts/specs Message-ID: <20050104140532.A05143440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:05:19 -0500 (Tue, 04 Jan 2005) New Revision: 5492 Added: tinysofa/releases/1.1/release/releases/1.1/3ts/ Modified: tinysofa/releases/1.1/release/current/specs/release.spec tinysofa/releases/1.1/release/releases/1.1/3ts/specs/release.spec Log: release: * integrate current (1.1-3jh) as releases/1.1/3ts Modified: tinysofa/releases/1.1/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.1/release/current/specs/release.spec 2005-01-04 14:04:56 UTC (rev 5491) +++ tinysofa/releases/1.1/release/current/specs/release.spec 2005-01-04 14:05:19 UTC (rev 5492) @@ -5,7 +5,7 @@ Summary: tinysofa release file Name: release Version: 1.1 -Release: 3jh +Release: 3ts Epoch: 2 License: GPL Group: main @@ -45,6 +45,9 @@ %{_sysconfdir}/tinysofa-release %changelog +* Tue Jan 04 2005 tsintegrate 1.1-3ts +- current (1.1-3jh) integrated as 1.1-3ts for release 1.1-U3 + * Sat Sep 04 2004 tsintegrate 1.1-1ts - current (1.1-1jh) integrated as 1.1-1ts for release 1.1-U1 Copied: tinysofa/releases/1.1/release/releases/1.1/3ts (from rev 5268, tinysofa/releases/1.1/release/current) Modified: tinysofa/releases/1.1/release/releases/1.1/3ts/specs/release.spec =================================================================== --- tinysofa/releases/1.1/release/current/specs/release.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/release/releases/1.1/3ts/specs/release.spec 2005-01-04 14:05:19 UTC (rev 5492) @@ -5,7 +5,7 @@ Summary: tinysofa release file Name: release Version: 1.1 -Release: 3jh +Release: 3ts Epoch: 2 License: GPL Group: main @@ -45,6 +45,9 @@ %{_sysconfdir}/tinysofa-release %changelog +* Tue Jan 04 2005 tsintegrate 1.1-3ts +- current (1.1-3jh) integrated as 1.1-3ts for release 1.1-U3 + * Sat Sep 04 2004 tsintegrate 1.1-1ts - current (1.1-1jh) integrated as 1.1-1ts for release 1.1-U1 From svn at tinysofa.org Tue Jan 4 14:05:42 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:05:42 -0500 (EST) Subject: [tinysofa-svn] r5493 - tinysofa/releases/1.1/release Message-ID: <20050104140542.93A793440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:05:36 -0500 (Tue, 04 Jan 2005) New Revision: 5493 Removed: tinysofa/releases/1.1/release/pristine/ Log: release: * removing pristine (1.1-1ts) From svn at tinysofa.org Tue Jan 4 14:05:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:05:54 -0500 (EST) Subject: [tinysofa-svn] r5494 - tinysofa/releases/1.1/release Message-ID: <20050104140554.226613440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:05:46 -0500 (Tue, 04 Jan 2005) New Revision: 5494 Added: tinysofa/releases/1.1/release/pristine/ Log: release: * retarget pristine (1.1-1ts) to releases/1.1/3ts Copied: tinysofa/releases/1.1/release/pristine (from rev 5492, tinysofa/releases/1.1/release/releases/1.1/3ts) From svn at tinysofa.org Tue Jan 4 14:06:13 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:06:13 -0500 (EST) Subject: [tinysofa-svn] r5495 - in tinysofa/releases/1.1/rpm: current/specs releases releases/4.3.3 releases/4.3.3/1ts/specs Message-ID: <20050104140613.CD5363440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:06:00 -0500 (Tue, 04 Jan 2005) New Revision: 5495 Added: tinysofa/releases/1.1/rpm/releases/4.3.3/ tinysofa/releases/1.1/rpm/releases/4.3.3/1ts/ Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec tinysofa/releases/1.1/rpm/releases/4.3.3/1ts/specs/rpm.spec Log: rpm: * integrate current (4.3.3-1jh) as releases/4.3.3/1ts Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2005-01-04 14:05:46 UTC (rev 5494) +++ tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2005-01-04 14:06:00 UTC (rev 5495) @@ -21,7 +21,7 @@ %define version 4.3.3 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 1jh +Release: 1ts Group: main Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Source1: GROUPS @@ -515,6 +515,9 @@ %{__includedir}/popt.h %changelog +* Tue Jan 04 2005 tsintegrate 4.3.3-1ts +- current (4.3.3-1jh) integrated as 4.3.3-1ts for release 1.1-U3 + * Sun Nov 28 2004 Jaakko Heinonen 4.3.3-1jh - 4.3.3 Copied: tinysofa/releases/1.1/rpm/releases/4.3.3/1ts (from rev 5268, tinysofa/releases/1.1/rpm/current) Modified: tinysofa/releases/1.1/rpm/releases/4.3.3/1ts/specs/rpm.spec =================================================================== --- tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/rpm/releases/4.3.3/1ts/specs/rpm.spec 2005-01-04 14:06:00 UTC (rev 5495) @@ -21,7 +21,7 @@ %define version 4.3.3 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 1jh +Release: 1ts Group: main Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Source1: GROUPS @@ -515,6 +515,9 @@ %{__includedir}/popt.h %changelog +* Tue Jan 04 2005 tsintegrate 4.3.3-1ts +- current (4.3.3-1jh) integrated as 4.3.3-1ts for release 1.1-U3 + * Sun Nov 28 2004 Jaakko Heinonen 4.3.3-1jh - 4.3.3 From svn at tinysofa.org Tue Jan 4 14:06:25 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:06:25 -0500 (EST) Subject: [tinysofa-svn] r5496 - tinysofa/releases/1.1/rpm Message-ID: <20050104140625.51EF83440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:06:18 -0500 (Tue, 04 Jan 2005) New Revision: 5496 Removed: tinysofa/releases/1.1/rpm/pristine/ Log: rpm: * removing pristine (4.3.2-3ts) From svn at tinysofa.org Tue Jan 4 14:06:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:06:37 -0500 (EST) Subject: [tinysofa-svn] r5497 - tinysofa/releases/1.1/rpm Message-ID: <20050104140637.6835F3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:06:29 -0500 (Tue, 04 Jan 2005) New Revision: 5497 Added: tinysofa/releases/1.1/rpm/pristine/ Log: rpm: * retarget pristine (4.3.2-3ts) to releases/4.3.3/1ts Copied: tinysofa/releases/1.1/rpm/pristine (from rev 5495, tinysofa/releases/1.1/rpm/releases/4.3.3/1ts) From svn at tinysofa.org Tue Jan 4 14:07:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:07:00 -0500 (EST) Subject: [tinysofa-svn] r5498 - in tinysofa/releases/1.1/samba: current/specs releases releases/3.0.10 releases/3.0.10/1ts/specs Message-ID: <20050104140700.CFD413440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:06:47 -0500 (Tue, 04 Jan 2005) New Revision: 5498 Added: tinysofa/releases/1.1/samba/releases/3.0.10/ tinysofa/releases/1.1/samba/releases/3.0.10/1ts/ Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec tinysofa/releases/1.1/samba/releases/3.0.10/1ts/specs/samba.spec Log: samba: * integrate current (3.0.10-1jh) as releases/3.0.10/1ts Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec =================================================================== --- tinysofa/releases/1.1/samba/current/specs/samba.spec 2005-01-04 14:06:29 UTC (rev 5497) +++ tinysofa/releases/1.1/samba/current/specs/samba.spec 2005-01-04 14:06:47 UTC (rev 5498) @@ -3,7 +3,7 @@ Summary: The Samba SMB server. Name: samba Version: 3.0.10 -Release: 1jh +Release: 1ts Epoch: 0 License: GNU GPL Version 2 Group: extra @@ -455,6 +455,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.0.10-1ts +- current (3.0.10-1jh) integrated as 3.0.10-1ts for release 1.1-U3 + * Fri Dec 17 2004 Jaakko Heinonen 3.0.10-1jh - 3.0.10, CAN-2004-1154 Copied: tinysofa/releases/1.1/samba/releases/3.0.10/1ts (from rev 5268, tinysofa/releases/1.1/samba/current) Modified: tinysofa/releases/1.1/samba/releases/3.0.10/1ts/specs/samba.spec =================================================================== --- tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/samba/releases/3.0.10/1ts/specs/samba.spec 2005-01-04 14:06:47 UTC (rev 5498) @@ -3,7 +3,7 @@ Summary: The Samba SMB server. Name: samba Version: 3.0.10 -Release: 1jh +Release: 1ts Epoch: 0 License: GNU GPL Version 2 Group: extra @@ -455,6 +455,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.0.10-1ts +- current (3.0.10-1jh) integrated as 3.0.10-1ts for release 1.1-U3 + * Fri Dec 17 2004 Jaakko Heinonen 3.0.10-1jh - 3.0.10, CAN-2004-1154 From svn at tinysofa.org Tue Jan 4 14:07:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:07:11 -0500 (EST) Subject: [tinysofa-svn] r5499 - tinysofa/releases/1.1/samba Message-ID: <20050104140711.D29763440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:07:05 -0500 (Tue, 04 Jan 2005) New Revision: 5499 Removed: tinysofa/releases/1.1/samba/pristine/ Log: samba: * removing pristine (3.0.6-1ts) From svn at tinysofa.org Tue Jan 4 14:07:23 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:07:23 -0500 (EST) Subject: [tinysofa-svn] r5500 - tinysofa/releases/1.1/samba Message-ID: <20050104140723.CA3D03440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:07:15 -0500 (Tue, 04 Jan 2005) New Revision: 5500 Added: tinysofa/releases/1.1/samba/pristine/ Log: samba: * retarget pristine (3.0.6-1ts) to releases/3.0.10/1ts Copied: tinysofa/releases/1.1/samba/pristine (from rev 5498, tinysofa/releases/1.1/samba/releases/3.0.10/1ts) From svn at tinysofa.org Tue Jan 4 14:07:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:07:43 -0500 (EST) Subject: [tinysofa-svn] r5501 - in tinysofa/releases/1.1/sash: current/specs releases releases/3.7 releases/3.7/1ts/specs Message-ID: <20050104140743.9733C3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:07:30 -0500 (Tue, 04 Jan 2005) New Revision: 5501 Added: tinysofa/releases/1.1/sash/releases/3.7/ tinysofa/releases/1.1/sash/releases/3.7/1ts/ Modified: tinysofa/releases/1.1/sash/current/specs/sash.spec tinysofa/releases/1.1/sash/releases/3.7/1ts/specs/sash.spec Log: sash: * integrate current (3.7-1jh) as releases/3.7/1ts Modified: tinysofa/releases/1.1/sash/current/specs/sash.spec =================================================================== --- tinysofa/releases/1.1/sash/current/specs/sash.spec 2005-01-04 14:07:15 UTC (rev 5500) +++ tinysofa/releases/1.1/sash/current/specs/sash.spec 2005-01-04 14:07:30 UTC (rev 5501) @@ -1,7 +1,7 @@ Summary: A statically-linked shell, including some built-in basic commands. Name: sash Version: 3.7 -Release: 1jh +Release: 1ts License: GPL Group: main Source0: http://www.canb.auug.org.au/~dbell/programs/sash-%{version}.tar.gz @@ -55,6 +55,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.7-1ts +- current (3.7-1jh) integrated as 3.7-1ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt Copied: tinysofa/releases/1.1/sash/releases/3.7/1ts (from rev 5268, tinysofa/releases/1.1/sash/current) Modified: tinysofa/releases/1.1/sash/releases/3.7/1ts/specs/sash.spec =================================================================== --- tinysofa/releases/1.1/sash/current/specs/sash.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/sash/releases/3.7/1ts/specs/sash.spec 2005-01-04 14:07:30 UTC (rev 5501) @@ -1,7 +1,7 @@ Summary: A statically-linked shell, including some built-in basic commands. Name: sash Version: 3.7 -Release: 1jh +Release: 1ts License: GPL Group: main Source0: http://www.canb.auug.org.au/~dbell/programs/sash-%{version}.tar.gz @@ -55,6 +55,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 3.7-1ts +- current (3.7-1jh) integrated as 3.7-1ts for release 1.1-U3 + * Tue Jun 15 2004 Elliot Lee - rebuilt From svn at tinysofa.org Tue Jan 4 14:07:53 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:07:53 -0500 (EST) Subject: [tinysofa-svn] r5502 - tinysofa/releases/1.1/sash Message-ID: <20050104140753.AB2923440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:07:47 -0500 (Tue, 04 Jan 2005) New Revision: 5502 Removed: tinysofa/releases/1.1/sash/pristine/ Log: sash: * removing pristine (3.6-6ts) From svn at tinysofa.org Tue Jan 4 14:08:05 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:08:05 -0500 (EST) Subject: [tinysofa-svn] r5503 - tinysofa/releases/1.1/sash Message-ID: <20050104140805.50F063440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:07:57 -0500 (Tue, 04 Jan 2005) New Revision: 5503 Added: tinysofa/releases/1.1/sash/pristine/ Log: sash: * retarget pristine (3.6-6ts) to releases/3.7/1ts Copied: tinysofa/releases/1.1/sash/pristine (from rev 5501, tinysofa/releases/1.1/sash/releases/3.7/1ts) From svn at tinysofa.org Tue Jan 4 14:08:36 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:08:36 -0500 (EST) Subject: [tinysofa-svn] r5504 - in tinysofa/releases/1.1/screen: current/specs releases/4.0.2 releases/4.0.2/5ts/specs Message-ID: <20050104140836.8A6BF3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:08:22 -0500 (Tue, 04 Jan 2005) New Revision: 5504 Added: tinysofa/releases/1.1/screen/releases/4.0.2/5ts/ Modified: tinysofa/releases/1.1/screen/current/specs/screen.spec tinysofa/releases/1.1/screen/releases/4.0.2/5ts/specs/screen.spec Log: screen: * integrate current (4.0.2-5jh) as releases/4.0.2/5ts Modified: tinysofa/releases/1.1/screen/current/specs/screen.spec =================================================================== --- tinysofa/releases/1.1/screen/current/specs/screen.spec 2005-01-04 14:07:57 UTC (rev 5503) +++ tinysofa/releases/1.1/screen/current/specs/screen.spec 2005-01-04 14:08:22 UTC (rev 5504) @@ -1,7 +1,7 @@ Summary: A screen manager that supports multiple logins on one terminal. Name: screen Version: 4.0.2 -Release: 5jh +Release: 5ts License: GPL2 Group: extra URL: http://www.gnu.org/software/screen @@ -162,6 +162,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.0.2-5ts +- current (4.0.2-5jh) integrated as 4.0.2-5ts for release 1.1-U3 + * Tue Oct 12 2004 Jaakko Heinonen 4.0.2-5jh - own directories correctly under /usr/share Copied: tinysofa/releases/1.1/screen/releases/4.0.2/5ts (from rev 5268, tinysofa/releases/1.1/screen/current) Modified: tinysofa/releases/1.1/screen/releases/4.0.2/5ts/specs/screen.spec =================================================================== --- tinysofa/releases/1.1/screen/current/specs/screen.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/screen/releases/4.0.2/5ts/specs/screen.spec 2005-01-04 14:08:22 UTC (rev 5504) @@ -1,7 +1,7 @@ Summary: A screen manager that supports multiple logins on one terminal. Name: screen Version: 4.0.2 -Release: 5jh +Release: 5ts License: GPL2 Group: extra URL: http://www.gnu.org/software/screen @@ -162,6 +162,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.0.2-5ts +- current (4.0.2-5jh) integrated as 4.0.2-5ts for release 1.1-U3 + * Tue Oct 12 2004 Jaakko Heinonen 4.0.2-5jh - own directories correctly under /usr/share From svn at tinysofa.org Tue Jan 4 14:08:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:08:46 -0500 (EST) Subject: [tinysofa-svn] r5505 - tinysofa/releases/1.1/screen Message-ID: <20050104140846.B03AA3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:08:40 -0500 (Tue, 04 Jan 2005) New Revision: 5505 Removed: tinysofa/releases/1.1/screen/pristine/ Log: screen: * removing pristine (4.0.2-4ts) From svn at tinysofa.org Tue Jan 4 14:08:58 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:08:58 -0500 (EST) Subject: [tinysofa-svn] r5506 - tinysofa/releases/1.1/screen Message-ID: <20050104140858.66ABB3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:08:50 -0500 (Tue, 04 Jan 2005) New Revision: 5506 Added: tinysofa/releases/1.1/screen/pristine/ Log: screen: * retarget pristine (4.0.2-4ts) to releases/4.0.2/5ts Copied: tinysofa/releases/1.1/screen/pristine (from rev 5504, tinysofa/releases/1.1/screen/releases/4.0.2/5ts) From svn at tinysofa.org Tue Jan 4 14:09:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:09:24 -0500 (EST) Subject: [tinysofa-svn] r5507 - in tinysofa/releases/1.1/sed: current/specs releases releases/4.1.2 releases/4.1.2/2ts/sources releases/4.1.2/2ts/specs Message-ID: <20050104140924.693E13440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:09:04 -0500 (Tue, 04 Jan 2005) New Revision: 5507 Added: tinysofa/releases/1.1/sed/releases/4.1.2/ tinysofa/releases/1.1/sed/releases/4.1.2/2ts/ tinysofa/releases/1.1/sed/releases/4.1.2/2ts/sources/sed-4.1.2-lib-cvs20050104.patch tinysofa/releases/1.1/sed/releases/4.1.2/2ts/specs/sed.spec Removed: tinysofa/releases/1.1/sed/releases/4.1.2/2ts/specs/sed.spec Modified: tinysofa/releases/1.1/sed/current/specs/sed.spec Log: sed: * integrate current (4.1.2-2jh) as releases/4.1.2/2ts Modified: tinysofa/releases/1.1/sed/current/specs/sed.spec =================================================================== --- tinysofa/releases/1.1/sed/current/specs/sed.spec 2005-01-04 14:08:50 UTC (rev 5506) +++ tinysofa/releases/1.1/sed/current/specs/sed.spec 2005-01-04 14:09:04 UTC (rev 5507) @@ -5,7 +5,7 @@ Summary: A GNU stream text editor. Name: sed Version: 4.1.2 -Release: 2jh +Release: 2ts License: GPL Group: main Source0: ftp://ftp.gnu.org/gnu/sed/sed-%{version}.tar.gz @@ -54,6 +54,9 @@ %{_mandir}/man1/sed.1* %changelog +* Tue Jan 04 2005 tsintegrate 4.1.2-2ts +- current (4.1.2-2jh) integrated as 4.1.2-2ts for release 1.1-U3 + * Tue Jan 4 2005 Jaakko Heinonen 4.1.2-2jh - update lib from CVS (fixes a segfault with I flag) Copied: tinysofa/releases/1.1/sed/releases/4.1.2/2ts (from rev 5268, tinysofa/releases/1.1/sed/current) Copied: tinysofa/releases/1.1/sed/releases/4.1.2/2ts/sources/sed-4.1.2-lib-cvs20050104.patch (from rev 5286, tinysofa/releases/1.1/sed/current/sources/sed-4.1.2-lib-cvs20050104.patch) Deleted: tinysofa/releases/1.1/sed/releases/4.1.2/2ts/specs/sed.spec =================================================================== --- tinysofa/releases/1.1/sed/current/specs/sed.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/sed/releases/4.1.2/2ts/specs/sed.spec 2005-01-04 14:09:04 UTC (rev 5507) @@ -1,109 +0,0 @@ -%ifos linux -%define _bindir /bin -%endif - -Summary: A GNU stream text editor. -Name: sed -Version: 4.1.2 -Release: 1jh -License: GPL -Group: main -Source0: ftp://ftp.gnu.org/gnu/sed/sed-%{version}.tar.gz -%info_requires -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%description -The sed (Stream EDitor) editor is a stream or batch (non-interactive) -editor. Sed takes text as input, performs an operation or set of -operations on the text and outputs the modified text. The operations -that sed performs (substitutions, deletions, insertions, etc.) can be -specified in a script file or from the command line. - -%prep -%setup -q - -%build -%configure -%make - -%install -%makeinstall - -%install_info doc/sed.texi -%nuke_info - -%find_lang %{name} - -%post -%info_post - -%postun -%info_postun - -%clean -%clean_buildroot - -%files -f %{name}.lang -%defattr(-,root,root) -%doc BUGS NEWS README THANKS -%{_bindir}/sed -%{_htmldir}/%{name} -%{_mandir}/man1/sed.1* - -%changelog -* Sun Sep 19 2004 Jaakko Heinonen 4.1.2-1jh -- 4.1.2 -- spec cleanup - -* Thu Aug 05 2004 tsintegrate 4.1-2ts -- current (4.1-2jh) integrated as 4.1-2ts for release 1.1 - -* Fri Jun 18 2004 tsintegrate 4.1-1ts -- current (4.1-5ts) integrated as 4.1-1ts for release 1.0-U2 - -* Wed May 19 2004 tsintegrate 4.0.9-5ts -- current (4.0.9-4ts) integrated as 4.0.9-5ts for release 1.0-U1 - -* Sat Feb 7 2004 Omar Kilani 4.0.9-1ok -- New upstream. - -* Mon Dec 8 2003 Erlend Midttun 4.0.8-1tr -- New upstream. - -* Wed Jun 18 2003 Erlend Midttun 3.02-10tr -- Big rebuild - -* Mon Mar 24 2003 Erlend Midttun 3.02-9em -- Rebuilt against glibc 2.3.2. - -* Fri Oct 25 2002 Christian H. Toldnes 3.02-8ct -- Replaced info with htmlinfo - -* Wed Jul 24 2002 Daniel Meyer 3.02-7dm -- rebuild for Trustix Secure Linux 2.0 - -* Tue Jan 25 2000 Tore Olsen -- moved /usr/{man,info} to /usr/share/{man,info} for FHS compliance - -* Sun Mar 21 1999 Cristian Gafton -- auto rebuild in the new build environment (release 4) - -* Tue Aug 18 1998 Jeff Johnson -- update to 3.02 - -* Sun Jul 26 1998 Jeff Johnson -- update to 3.01 - -* Mon Apr 27 1998 Prospector System -- translations modified for de, fr, tr - -* Thu Oct 23 1997 Donnie Barnes -- removed references to the -g option from the man page that we add - -* Fri Oct 17 1997 Donnie Barnes -- spec file cleanups -- added BuildRoot - -* Mon Jun 02 1997 Erik Troan -- built against glibc Copied: tinysofa/releases/1.1/sed/releases/4.1.2/2ts/specs/sed.spec (from rev 5286, tinysofa/releases/1.1/sed/current/specs/sed.spec) =================================================================== --- tinysofa/releases/1.1/sed/current/specs/sed.spec 2005-01-04 12:02:37 UTC (rev 5286) +++ tinysofa/releases/1.1/sed/releases/4.1.2/2ts/specs/sed.spec 2005-01-04 14:09:04 UTC (rev 5507) @@ -0,0 +1,117 @@ +%ifos linux +%define _bindir /bin +%endif + +Summary: A GNU stream text editor. +Name: sed +Version: 4.1.2 +Release: 2ts +License: GPL +Group: main +Source0: ftp://ftp.gnu.org/gnu/sed/sed-%{version}.tar.gz +Patch0: sed-4.1.2-lib-cvs20050104.patch +%info_requires +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The sed (Stream EDitor) editor is a stream or batch (non-interactive) +editor. Sed takes text as input, performs an operation or set of +operations on the text and outputs the modified text. The operations +that sed performs (substitutions, deletions, insertions, etc.) can be +specified in a script file or from the command line. + +%prep +%setup -q +%patch0 -p1 + +%build +%configure +%make + +%install +%makeinstall + +%install_info doc/sed.texi +%nuke_info + +%find_lang %{name} + +%post +%info_post + +%postun +%info_postun + +%clean +%clean_buildroot + +%files -f %{name}.lang +%defattr(-,root,root) +%doc BUGS NEWS README THANKS +%{_bindir}/sed +%{_htmldir}/%{name} +%{_mandir}/man1/sed.1* + +%changelog +* Tue Jan 04 2005 tsintegrate 4.1.2-2ts +- current (4.1.2-2jh) integrated as 4.1.2-2ts for release 1.1-U3 + +* Tue Jan 4 2005 Jaakko Heinonen 4.1.2-2jh +- update lib from CVS (fixes a segfault with I flag) + +* Sun Sep 19 2004 Jaakko Heinonen 4.1.2-1jh +- 4.1.2 +- spec cleanup + +* Thu Aug 05 2004 tsintegrate 4.1-2ts +- current (4.1-2jh) integrated as 4.1-2ts for release 1.1 + +* Fri Jun 18 2004 tsintegrate 4.1-1ts +- current (4.1-5ts) integrated as 4.1-1ts for release 1.0-U2 + +* Wed May 19 2004 tsintegrate 4.0.9-5ts +- current (4.0.9-4ts) integrated as 4.0.9-5ts for release 1.0-U1 + +* Sat Feb 7 2004 Omar Kilani 4.0.9-1ok +- New upstream. + +* Mon Dec 8 2003 Erlend Midttun 4.0.8-1tr +- New upstream. + +* Wed Jun 18 2003 Erlend Midttun 3.02-10tr +- Big rebuild + +* Mon Mar 24 2003 Erlend Midttun 3.02-9em +- Rebuilt against glibc 2.3.2. + +* Fri Oct 25 2002 Christian H. Toldnes 3.02-8ct +- Replaced info with htmlinfo + +* Wed Jul 24 2002 Daniel Meyer 3.02-7dm +- rebuild for Trustix Secure Linux 2.0 + +* Tue Jan 25 2000 Tore Olsen +- moved /usr/{man,info} to /usr/share/{man,info} for FHS compliance + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 4) + +* Tue Aug 18 1998 Jeff Johnson +- update to 3.02 + +* Sun Jul 26 1998 Jeff Johnson +- update to 3.01 + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Oct 23 1997 Donnie Barnes +- removed references to the -g option from the man page that we add + +* Fri Oct 17 1997 Donnie Barnes +- spec file cleanups +- added BuildRoot + +* Mon Jun 02 1997 Erik Troan +- built against glibc From svn at tinysofa.org Tue Jan 4 14:09:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:09:34 -0500 (EST) Subject: [tinysofa-svn] r5508 - tinysofa/releases/1.1/sed Message-ID: <20050104140934.975E83440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:09:28 -0500 (Tue, 04 Jan 2005) New Revision: 5508 Removed: tinysofa/releases/1.1/sed/pristine/ Log: sed: * removing pristine (4.1-2ts) From svn at tinysofa.org Tue Jan 4 14:09:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:09:46 -0500 (EST) Subject: [tinysofa-svn] r5509 - tinysofa/releases/1.1/sed Message-ID: <20050104140946.334453440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:09:38 -0500 (Tue, 04 Jan 2005) New Revision: 5509 Added: tinysofa/releases/1.1/sed/pristine/ Log: sed: * retarget pristine (4.1-2ts) to releases/4.1.2/2ts Copied: tinysofa/releases/1.1/sed/pristine (from rev 5507, tinysofa/releases/1.1/sed/releases/4.1.2/2ts) From svn at tinysofa.org Tue Jan 4 14:10:15 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:10:15 -0500 (EST) Subject: [tinysofa-svn] r5510 - in tinysofa/releases/1.1/setup: current/specs releases/2.2.5 releases/2.2.5/10ts/specs Message-ID: <20050104141015.E01503440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:10:02 -0500 (Tue, 04 Jan 2005) New Revision: 5510 Added: tinysofa/releases/1.1/setup/releases/2.2.5/10ts/ Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec tinysofa/releases/1.1/setup/releases/2.2.5/10ts/specs/setup.spec Log: setup: * integrate current (2.2.5-10jh) as releases/2.2.5/10ts Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec =================================================================== --- tinysofa/releases/1.1/setup/current/specs/setup.spec 2005-01-04 14:09:38 UTC (rev 5509) +++ tinysofa/releases/1.1/setup/current/specs/setup.spec 2005-01-04 14:10:02 UTC (rev 5510) @@ -1,7 +1,7 @@ Summary: A set of system configuration and setup files. Name: setup Version: 2.2.5 -Release: 10jh +Release: 10ts License: public domain Group: main Source: setup-%{version}.tar.gz @@ -76,6 +76,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.2.5-10ts +- current (2.2.5-10jh) integrated as 2.2.5-10ts for release 1.1-U3 + * Thu Dec 9 2004 Jaakko Heinonen - add /etc/sysconfig/bootloader as %%ghost Copied: tinysofa/releases/1.1/setup/releases/2.2.5/10ts (from rev 5268, tinysofa/releases/1.1/setup/current) Modified: tinysofa/releases/1.1/setup/releases/2.2.5/10ts/specs/setup.spec =================================================================== --- tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/setup/releases/2.2.5/10ts/specs/setup.spec 2005-01-04 14:10:02 UTC (rev 5510) @@ -1,7 +1,7 @@ Summary: A set of system configuration and setup files. Name: setup Version: 2.2.5 -Release: 10jh +Release: 10ts License: public domain Group: main Source: setup-%{version}.tar.gz @@ -76,6 +76,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.2.5-10ts +- current (2.2.5-10jh) integrated as 2.2.5-10ts for release 1.1-U3 + * Thu Dec 9 2004 Jaakko Heinonen - add /etc/sysconfig/bootloader as %%ghost From svn at tinysofa.org Tue Jan 4 14:10:25 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:10:25 -0500 (EST) Subject: [tinysofa-svn] r5511 - tinysofa/releases/1.1/setup Message-ID: <20050104141025.94F643440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:10:19 -0500 (Tue, 04 Jan 2005) New Revision: 5511 Removed: tinysofa/releases/1.1/setup/pristine/ Log: setup: * removing pristine (2.2.5-8ts) From svn at tinysofa.org Tue Jan 4 14:10:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:10:37 -0500 (EST) Subject: [tinysofa-svn] r5512 - tinysofa/releases/1.1/setup Message-ID: <20050104141037.329BB3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:10:29 -0500 (Tue, 04 Jan 2005) New Revision: 5512 Added: tinysofa/releases/1.1/setup/pristine/ Log: setup: * retarget pristine (2.2.5-8ts) to releases/2.2.5/10ts Copied: tinysofa/releases/1.1/setup/pristine (from rev 5510, tinysofa/releases/1.1/setup/releases/2.2.5/10ts) From svn at tinysofa.org Tue Jan 4 14:11:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:11:06 -0500 (EST) Subject: [tinysofa-svn] r5513 - in tinysofa/releases/1.1/shadow-utils: current/specs releases/4.0.3 releases/4.0.3/27ts/specs Message-ID: <20050104141106.ECDC33440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:10:53 -0500 (Tue, 04 Jan 2005) New Revision: 5513 Added: tinysofa/releases/1.1/shadow-utils/releases/4.0.3/27ts/ Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec tinysofa/releases/1.1/shadow-utils/releases/4.0.3/27ts/specs/shadow-utils.spec Log: shadow-utils: * integrate current (4.0.3-27jh) as releases/4.0.3/27ts Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec =================================================================== --- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2005-01-04 14:10:29 UTC (rev 5512) +++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2005-01-04 14:10:53 UTC (rev 5513) @@ -3,7 +3,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.3 -Release: 27jh +Release: 27ts 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 @@ -255,6 +255,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.0.3-27ts +- current (4.0.3-27jh) integrated as 4.0.3-27ts for release 1.1-U3 + * Fri Nov 5 2004 Jaakko Heinonen 4.0.3-27jh - add 036_CAN-2004-1001_passwd_check.diff to fix security problem - (Bug ID: #19) Copied: tinysofa/releases/1.1/shadow-utils/releases/4.0.3/27ts (from rev 5268, tinysofa/releases/1.1/shadow-utils/current) Modified: tinysofa/releases/1.1/shadow-utils/releases/4.0.3/27ts/specs/shadow-utils.spec =================================================================== --- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/shadow-utils/releases/4.0.3/27ts/specs/shadow-utils.spec 2005-01-04 14:10:53 UTC (rev 5513) @@ -3,7 +3,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.3 -Release: 27jh +Release: 27ts 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 @@ -255,6 +255,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 4.0.3-27ts +- current (4.0.3-27jh) integrated as 4.0.3-27ts for release 1.1-U3 + * Fri Nov 5 2004 Jaakko Heinonen 4.0.3-27jh - add 036_CAN-2004-1001_passwd_check.diff to fix security problem - (Bug ID: #19) From svn at tinysofa.org Tue Jan 4 14:11:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:11:17 -0500 (EST) Subject: [tinysofa-svn] r5514 - tinysofa/releases/1.1/shadow-utils Message-ID: <20050104141117.7780C3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:11:11 -0500 (Tue, 04 Jan 2005) New Revision: 5514 Removed: tinysofa/releases/1.1/shadow-utils/pristine/ Log: shadow-utils: * removing pristine (4.0.3-26ts) From svn at tinysofa.org Tue Jan 4 14:11:27 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:11:27 -0500 (EST) Subject: [tinysofa-svn] r5515 - tinysofa/releases/1.1/shadow-utils Message-ID: <20050104141127.933D83440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:11:21 -0500 (Tue, 04 Jan 2005) New Revision: 5515 Added: tinysofa/releases/1.1/shadow-utils/pristine/ Log: shadow-utils: * retarget pristine (4.0.3-26ts) to releases/4.0.3/27ts Copied: tinysofa/releases/1.1/shadow-utils/pristine (from rev 5513, tinysofa/releases/1.1/shadow-utils/releases/4.0.3/27ts) From svn at tinysofa.org Tue Jan 4 14:11:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:11:45 -0500 (EST) Subject: [tinysofa-svn] r5516 - in tinysofa/releases/1.1/squid: current/specs releases releases/2.5.STABLE7 releases/2.5.STABLE7/1ts/specs Message-ID: <20050104141145.52A753440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:11:34 -0500 (Tue, 04 Jan 2005) New Revision: 5516 Added: tinysofa/releases/1.1/squid/releases/2.5.STABLE7/ tinysofa/releases/1.1/squid/releases/2.5.STABLE7/1ts/ Modified: tinysofa/releases/1.1/squid/current/specs/squid.spec tinysofa/releases/1.1/squid/releases/2.5.STABLE7/1ts/specs/squid.spec Log: squid: * integrate current (2.5.STABLE7-1jh) as releases/2.5.STABLE7/1ts Modified: tinysofa/releases/1.1/squid/current/specs/squid.spec =================================================================== --- tinysofa/releases/1.1/squid/current/specs/squid.spec 2005-01-04 14:11:21 UTC (rev 5515) +++ tinysofa/releases/1.1/squid/current/specs/squid.spec 2005-01-04 14:11:34 UTC (rev 5516) @@ -4,7 +4,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE7 -Release: 1jh +Release: 1ts Epoch: 0 License: GPL Group: extra @@ -275,6 +275,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.5.STABLE7-1ts +- current (2.5.STABLE7-1jh) integrated as 2.5.STABLE7-1ts for release 1.1-U3 + * Thu Oct 7 2004 Jaakko Heinonen - add proxy-abuse patch - change /etc/squid.conf attr to 640,root,squid Copied: tinysofa/releases/1.1/squid/releases/2.5.STABLE7/1ts (from rev 5268, tinysofa/releases/1.1/squid/current) Modified: tinysofa/releases/1.1/squid/releases/2.5.STABLE7/1ts/specs/squid.spec =================================================================== --- tinysofa/releases/1.1/squid/current/specs/squid.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/squid/releases/2.5.STABLE7/1ts/specs/squid.spec 2005-01-04 14:11:34 UTC (rev 5516) @@ -4,7 +4,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE7 -Release: 1jh +Release: 1ts Epoch: 0 License: GPL Group: extra @@ -275,6 +275,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.5.STABLE7-1ts +- current (2.5.STABLE7-1jh) integrated as 2.5.STABLE7-1ts for release 1.1-U3 + * Thu Oct 7 2004 Jaakko Heinonen - add proxy-abuse patch - change /etc/squid.conf attr to 640,root,squid From svn at tinysofa.org Tue Jan 4 14:11:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:11:54 -0500 (EST) Subject: [tinysofa-svn] r5517 - tinysofa/releases/1.1/squid Message-ID: <20050104141154.32B7E3440D4@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:11:49 -0500 (Tue, 04 Jan 2005) New Revision: 5517 Removed: tinysofa/releases/1.1/squid/pristine/ Log: squid: * removing pristine (2.5.STABLE5-8ts) From svn at tinysofa.org Tue Jan 4 14:12:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:12:04 -0500 (EST) Subject: [tinysofa-svn] r5518 - tinysofa/releases/1.1/squid Message-ID: <20050104141204.7D1A0344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:11:58 -0500 (Tue, 04 Jan 2005) New Revision: 5518 Added: tinysofa/releases/1.1/squid/pristine/ Log: squid: * retarget pristine (2.5.STABLE5-8ts) to releases/2.5.STABLE7/1ts Copied: tinysofa/releases/1.1/squid/pristine (from rev 5516, tinysofa/releases/1.1/squid/releases/2.5.STABLE7/1ts) From svn at tinysofa.org Tue Jan 4 14:12:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:12:21 -0500 (EST) Subject: [tinysofa-svn] r5519 - in tinysofa/releases/1.1/sudo: current/specs releases releases/1.6.8p5 releases/1.6.8p5/1ts/specs Message-ID: <20050104141221.97950344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:12:10 -0500 (Tue, 04 Jan 2005) New Revision: 5519 Added: tinysofa/releases/1.1/sudo/releases/1.6.8p5/ tinysofa/releases/1.1/sudo/releases/1.6.8p5/1ts/ Modified: tinysofa/releases/1.1/sudo/current/specs/sudo.spec tinysofa/releases/1.1/sudo/releases/1.6.8p5/1ts/specs/sudo.spec Log: sudo: * integrate current (1.6.8p5-1jh) as releases/1.6.8p5/1ts Modified: tinysofa/releases/1.1/sudo/current/specs/sudo.spec =================================================================== --- tinysofa/releases/1.1/sudo/current/specs/sudo.spec 2005-01-04 14:11:58 UTC (rev 5518) +++ tinysofa/releases/1.1/sudo/current/specs/sudo.spec 2005-01-04 14:12:10 UTC (rev 5519) @@ -1,7 +1,7 @@ Summary: Allows restricted root access for specified users. Name: sudo Version: 1.6.8p5 -Release: 1jh +Release: 1ts 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 +* Tue Jan 04 2005 tsintegrate 1.6.8p5-1ts +- current (1.6.8p5-1jh) integrated as 1.6.8p5-1ts for release 1.1-U3 + * Wed Dec 15 2004 Jaakko Heinonen 1.6.8p5-1jh - new upstream Copied: tinysofa/releases/1.1/sudo/releases/1.6.8p5/1ts (from rev 5268, tinysofa/releases/1.1/sudo/current) Modified: tinysofa/releases/1.1/sudo/releases/1.6.8p5/1ts/specs/sudo.spec =================================================================== --- tinysofa/releases/1.1/sudo/current/specs/sudo.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/sudo/releases/1.6.8p5/1ts/specs/sudo.spec 2005-01-04 14:12:10 UTC (rev 5519) @@ -1,7 +1,7 @@ Summary: Allows restricted root access for specified users. Name: sudo Version: 1.6.8p5 -Release: 1jh +Release: 1ts 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 +* Tue Jan 04 2005 tsintegrate 1.6.8p5-1ts +- current (1.6.8p5-1jh) integrated as 1.6.8p5-1ts for release 1.1-U3 + * Wed Dec 15 2004 Jaakko Heinonen 1.6.8p5-1jh - new upstream From svn at tinysofa.org Tue Jan 4 14:12:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:12:31 -0500 (EST) Subject: [tinysofa-svn] r5520 - tinysofa/releases/1.1/sudo Message-ID: <20050104141231.27970344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:12:26 -0500 (Tue, 04 Jan 2005) New Revision: 5520 Removed: tinysofa/releases/1.1/sudo/pristine/ Log: sudo: * removing pristine (1.6.7p5-7ts) From svn at tinysofa.org Tue Jan 4 14:12:41 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:12:41 -0500 (EST) Subject: [tinysofa-svn] r5521 - tinysofa/releases/1.1/sudo Message-ID: <20050104141241.4AE42344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:12:35 -0500 (Tue, 04 Jan 2005) New Revision: 5521 Added: tinysofa/releases/1.1/sudo/pristine/ Log: sudo: * retarget pristine (1.6.7p5-7ts) to releases/1.6.8p5/1ts Copied: tinysofa/releases/1.1/sudo/pristine (from rev 5519, tinysofa/releases/1.1/sudo/releases/1.6.8p5/1ts) From svn at tinysofa.org Tue Jan 4 14:12:57 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:12:57 -0500 (EST) Subject: [tinysofa-svn] r5522 - in tinysofa/releases/1.1/syslinux: current/specs releases releases/2.10 releases/2.10/1ts/specs Message-ID: <20050104141257.79D2B344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:12:47 -0500 (Tue, 04 Jan 2005) New Revision: 5522 Added: tinysofa/releases/1.1/syslinux/releases/2.10/ tinysofa/releases/1.1/syslinux/releases/2.10/1ts/ Modified: tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec tinysofa/releases/1.1/syslinux/releases/2.10/1ts/specs/syslinux.spec Log: syslinux: * integrate current (2.10-1jh) as releases/2.10/1ts Modified: tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec =================================================================== --- tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec 2005-01-04 14:12:35 UTC (rev 5521) +++ tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec 2005-01-04 14:12:47 UTC (rev 5522) @@ -1,7 +1,7 @@ Summary: Kernel loader which uses a FAT or iso9660 filesystem or a PXE network Name: syslinux Version: 2.10 -Release: 1jh +Release: 1ts License: GPL Group: extra Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2 @@ -84,6 +84,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.10-1ts +- current (2.10-1jh) integrated as 2.10-1ts for release 1.1-U3 + * Tue Nov 2 2004 Jaakko Heinonen 2.10-1jh - 2.10 - build and install correctly on x86_64 Copied: tinysofa/releases/1.1/syslinux/releases/2.10/1ts (from rev 5268, tinysofa/releases/1.1/syslinux/current) Modified: tinysofa/releases/1.1/syslinux/releases/2.10/1ts/specs/syslinux.spec =================================================================== --- tinysofa/releases/1.1/syslinux/current/specs/syslinux.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/syslinux/releases/2.10/1ts/specs/syslinux.spec 2005-01-04 14:12:47 UTC (rev 5522) @@ -1,7 +1,7 @@ Summary: Kernel loader which uses a FAT or iso9660 filesystem or a PXE network Name: syslinux Version: 2.10 -Release: 1jh +Release: 1ts License: GPL Group: extra Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2 @@ -84,6 +84,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.10-1ts +- current (2.10-1jh) integrated as 2.10-1ts for release 1.1-U3 + * Tue Nov 2 2004 Jaakko Heinonen 2.10-1jh - 2.10 - build and install correctly on x86_64 From svn at tinysofa.org Tue Jan 4 14:13:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:13:06 -0500 (EST) Subject: [tinysofa-svn] r5523 - tinysofa/releases/1.1/syslinux Message-ID: <20050104141306.C87DF344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:13:01 -0500 (Tue, 04 Jan 2005) New Revision: 5523 Removed: tinysofa/releases/1.1/syslinux/pristine/ Log: syslinux: * removing pristine (2.08-7ts) From svn at tinysofa.org Tue Jan 4 14:13:16 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:13:16 -0500 (EST) Subject: [tinysofa-svn] r5524 - tinysofa/releases/1.1/syslinux Message-ID: <20050104141316.4C474344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:13:10 -0500 (Tue, 04 Jan 2005) New Revision: 5524 Added: tinysofa/releases/1.1/syslinux/pristine/ Log: syslinux: * retarget pristine (2.08-7ts) to releases/2.10/1ts Copied: tinysofa/releases/1.1/syslinux/pristine (from rev 5522, tinysofa/releases/1.1/syslinux/releases/2.10/1ts) From svn at tinysofa.org Tue Jan 4 14:13:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:13:31 -0500 (EST) Subject: [tinysofa-svn] r5525 - in tinysofa/releases/1.1/sysstat: current/specs releases releases/5.0.5 releases/5.0.5/1ts/specs Message-ID: <20050104141331.C3810344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:13:21 -0500 (Tue, 04 Jan 2005) New Revision: 5525 Added: tinysofa/releases/1.1/sysstat/releases/5.0.5/ tinysofa/releases/1.1/sysstat/releases/5.0.5/1ts/ Modified: tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec tinysofa/releases/1.1/sysstat/releases/5.0.5/1ts/specs/sysstat.spec Log: sysstat: * integrate current (5.0.5-1jh) as releases/5.0.5/1ts Modified: tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec =================================================================== --- tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2005-01-04 14:13:10 UTC (rev 5524) +++ tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2005-01-04 14:13:21 UTC (rev 5525) @@ -1,6 +1,6 @@ Name: sysstat Version: 5.0.5 -Release: 1jh +Release: 1ts Summary: The sar and iostat system monitoring commands. License: GPL Group: extra @@ -121,6 +121,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 5.0.5-1ts +- current (5.0.5-1jh) integrated as 5.0.5-1ts for release 1.1-U3 + * Wed Jun 30 2004 Nils Philippsen - version 5.0.5 - remove some obsolete patches Copied: tinysofa/releases/1.1/sysstat/releases/5.0.5/1ts (from rev 5268, tinysofa/releases/1.1/sysstat/current) Modified: tinysofa/releases/1.1/sysstat/releases/5.0.5/1ts/specs/sysstat.spec =================================================================== --- tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/sysstat/releases/5.0.5/1ts/specs/sysstat.spec 2005-01-04 14:13:21 UTC (rev 5525) @@ -1,6 +1,6 @@ Name: sysstat Version: 5.0.5 -Release: 1jh +Release: 1ts Summary: The sar and iostat system monitoring commands. License: GPL Group: extra @@ -121,6 +121,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 5.0.5-1ts +- current (5.0.5-1jh) integrated as 5.0.5-1ts for release 1.1-U3 + * Wed Jun 30 2004 Nils Philippsen - version 5.0.5 - remove some obsolete patches From svn at tinysofa.org Tue Jan 4 14:13:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:13:40 -0500 (EST) Subject: [tinysofa-svn] r5526 - tinysofa/releases/1.1/sysstat Message-ID: <20050104141340.EEAD3344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:13:35 -0500 (Tue, 04 Jan 2005) New Revision: 5526 Removed: tinysofa/releases/1.1/sysstat/pristine/ Log: sysstat: * removing pristine (5.0.2-4ts) From svn at tinysofa.org Tue Jan 4 14:13:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:13:50 -0500 (EST) Subject: [tinysofa-svn] r5527 - tinysofa/releases/1.1/sysstat Message-ID: <20050104141350.405C1344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:13:44 -0500 (Tue, 04 Jan 2005) New Revision: 5527 Added: tinysofa/releases/1.1/sysstat/pristine/ Log: sysstat: * retarget pristine (5.0.2-4ts) to releases/5.0.5/1ts Copied: tinysofa/releases/1.1/sysstat/pristine (from rev 5525, tinysofa/releases/1.1/sysstat/releases/5.0.5/1ts) From svn at tinysofa.org Tue Jan 4 14:14:15 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:14:15 -0500 (EST) Subject: [tinysofa-svn] r5528 - in tinysofa/releases/1.1/tcp_wrappers: current/specs releases/7.6 releases/7.6/21ts/specs Message-ID: <20050104141415.C58A2344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:14:04 -0500 (Tue, 04 Jan 2005) New Revision: 5528 Added: tinysofa/releases/1.1/tcp_wrappers/releases/7.6/21ts/ Modified: tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec tinysofa/releases/1.1/tcp_wrappers/releases/7.6/21ts/specs/tcp_wrappers.spec Log: tcp_wrappers: * integrate current (7.6-21jh) as releases/7.6/21ts Modified: tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec =================================================================== --- tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec 2005-01-04 14:13:44 UTC (rev 5527) +++ tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec 2005-01-04 14:14:04 UTC (rev 5528) @@ -1,7 +1,7 @@ Summary: A security tool which acts as a wrapper for TCP daemons. Name: tcp_wrappers Version: 7.6 -Release: 21jh +Release: 21ts %define LIB_MAJOR 0 %define LIB_MINOR 7 @@ -133,6 +133,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 7.6-21ts +- current (7.6-21jh) integrated as 7.6-21ts for release 1.1-U3 + * Mon Nov 29 2004 Jaakko Heinonen 7.6-21jh - tinysofa - split to -devel subpackage Copied: tinysofa/releases/1.1/tcp_wrappers/releases/7.6/21ts (from rev 5268, tinysofa/releases/1.1/tcp_wrappers/current) Modified: tinysofa/releases/1.1/tcp_wrappers/releases/7.6/21ts/specs/tcp_wrappers.spec =================================================================== --- tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/tcp_wrappers/releases/7.6/21ts/specs/tcp_wrappers.spec 2005-01-04 14:14:04 UTC (rev 5528) @@ -1,7 +1,7 @@ Summary: A security tool which acts as a wrapper for TCP daemons. Name: tcp_wrappers Version: 7.6 -Release: 21jh +Release: 21ts %define LIB_MAJOR 0 %define LIB_MINOR 7 @@ -133,6 +133,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 7.6-21ts +- current (7.6-21jh) integrated as 7.6-21ts for release 1.1-U3 + * Mon Nov 29 2004 Jaakko Heinonen 7.6-21jh - tinysofa - split to -devel subpackage From svn at tinysofa.org Tue Jan 4 14:14:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:14:24 -0500 (EST) Subject: [tinysofa-svn] r5529 - tinysofa/releases/1.1/tcp_wrappers Message-ID: <20050104141424.1D0B0344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:14:19 -0500 (Tue, 04 Jan 2005) New Revision: 5529 Removed: tinysofa/releases/1.1/tcp_wrappers/pristine/ Log: tcp_wrappers: * removing pristine (7.6-20ts) From svn at tinysofa.org Tue Jan 4 14:14:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:14:33 -0500 (EST) Subject: [tinysofa-svn] r5530 - tinysofa/releases/1.1/tcp_wrappers Message-ID: <20050104141433.60A40344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:14:27 -0500 (Tue, 04 Jan 2005) New Revision: 5530 Added: tinysofa/releases/1.1/tcp_wrappers/pristine/ Log: tcp_wrappers: * retarget pristine (7.6-20ts) to releases/7.6/21ts Copied: tinysofa/releases/1.1/tcp_wrappers/pristine (from rev 5528, tinysofa/releases/1.1/tcp_wrappers/releases/7.6/21ts) From svn at tinysofa.org Tue Jan 4 14:14:57 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:14:57 -0500 (EST) Subject: [tinysofa-svn] r5531 - in tinysofa/releases/1.1/telnet: current/specs releases releases/1.1 releases/1.1/1ts/sources releases/1.1/1ts/specs Message-ID: <20050104141457.6553B344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:14:39 -0500 (Tue, 04 Jan 2005) New Revision: 5531 Added: tinysofa/releases/1.1/telnet/releases/1.1/ tinysofa/releases/1.1/telnet/releases/1.1/1ts/ tinysofa/releases/1.1/telnet/releases/1.1/1ts/sources/telnet-bsd-1.1.diff tinysofa/releases/1.1/telnet/releases/1.1/1ts/sources/telnet-bsd-1.1.tar.bz2 tinysofa/releases/1.1/telnet/releases/1.1/1ts/specs/telnet.spec Removed: tinysofa/releases/1.1/telnet/releases/1.1/1ts/specs/telnet.spec Modified: tinysofa/releases/1.1/telnet/current/specs/telnet.spec Log: telnet: * integrate current (1.1-1jh) as releases/1.1/1ts Modified: tinysofa/releases/1.1/telnet/current/specs/telnet.spec =================================================================== --- tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2005-01-04 14:14:27 UTC (rev 5530) +++ tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2005-01-04 14:14:39 UTC (rev 5531) @@ -1,7 +1,7 @@ Summary: A client for the telnet remote login protocol. Name: telnet Version: 1.1 -Release: 1jh +Release: 1ts License: BSD Group: main Source: telnet-bsd-%{version}.tar.bz2 @@ -51,5 +51,8 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.1-1ts +- current (1.1-1jh) integrated as 1.1-1ts for release 1.1-U3 + * Thu Dec 23 2004 Jaakko Heinonen 1.1-1jh - initial telnet-bsd spec Copied: tinysofa/releases/1.1/telnet/releases/1.1/1ts (from rev 5268, tinysofa/releases/1.1/telnet/current) Copied: tinysofa/releases/1.1/telnet/releases/1.1/1ts/sources/telnet-bsd-1.1.diff (from rev 5269, tinysofa/releases/1.1/telnet/current/sources/telnet-bsd-1.1.diff) Copied: tinysofa/releases/1.1/telnet/releases/1.1/1ts/sources/telnet-bsd-1.1.tar.bz2 (from rev 5269, tinysofa/releases/1.1/telnet/current/sources/telnet-bsd-1.1.tar.bz2) Deleted: tinysofa/releases/1.1/telnet/releases/1.1/1ts/specs/telnet.spec =================================================================== --- tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/telnet/releases/1.1/1ts/specs/telnet.spec 2005-01-04 14:14:39 UTC (rev 5531) @@ -1,135 +0,0 @@ -Summary: The client for the telnet remote login protocol. -Name: telnet -Version: 0.17 -Release: 12ts -License: BSD -Group: main -Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz -# This comes from OpenBSD CVS -Source1: telnet-client.tar.gz -Patch1: telnet-0.10-escapechar.patch -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libstdc++-devel gcc-c++ ncurses-devel libtermcap-devel - -%description -Telnet is a popular protocol for logging into remote systems over the -Internet. The telnet package provides a command line telnet client. - -Install the telnet package if you want to telnet to remote machines. - -%prep -%setup -q -n netkit-telnet-0.17 -mv telnet telnet-from-netkit -%setup -T -D -q -a 1 -n netkit-telnet-0.17 -%patch1 -p1 - - -%build -CFLAGS="$RPM_OPT_FLAGS" ./configure -make - -%install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/bin -mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/usr/man/man1 -mkdir -p $RPM_BUILD_ROOT/usr/man/man5 -mkdir -p $RPM_BUILD_ROOT/usr/man/man8 -make INSTALLROOT=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/usr/share/man -cp -a $RPM_BUILD_ROOT/usr/man/* $RPM_BUILD_ROOT/usr/share/man - -rm -rf $RPM_BUILD_ROOT/usr/man - -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -/usr/bin/telnet -/usr/share/man/man1/telnet.1* - -%exclude %{_sbindir}/in.telnetd -%exclude %{_mandir}/man5/issue.net.5* -%exclude %{_mandir}/man8/in.telnetd.8* - -%changelog -* Thu Aug 05 2004 tsintegrate 0.17-12ts -- current (0.17-12jh) integrated as 0.17-12ts for release 1.1 - -* Wed May 19 2004 tsintegrate 0.17-11ts -- current (0.17-10ts) integrated as 0.17-11ts for release 1.0-U1 - -* Wed May 12 2004 Omar Kilani 0.17-10ts -- Add BuildRequires gcc-c++-devel, ncurses-devel, libtermcap-devel. - -* Mon Dec 8 2003 Erlend Midttun 0.17-7tr -- Big rebuild - -* Wed Jun 18 2003 Erlend Midttun 0.17-6tr -- Big rebuild - -* Mon Mar 24 2003 Erlend Midttun 0.17-5em -- Rebuilt against glibc 2.3.2. - -* Thu Feb 27 2003 Erlend Midttun 0.17-4em -- Make setup quiet. - -* Wed Jul 24 2002 Daniel Meyer 0.17-3dm -- rebuild for Trustix Secure Linux 2.0 - -* Tue Feb 29 2000 Lars Gaarden -- telnet client only -- moved man page to /usr/share/man, FHS - -* Sat Sep 24 1999 Preston Brown -- red hat .desktop entry - -* Sat Aug 21 1999 Jeff Johnson -- rebuild for 6.1. - -* Wed Aug 18 1999 Bill Nottingham -- don't trust random TERM variables in telnetd (#4560) - -* Wed Jun 2 1999 Jeff Johnson -- fix (#3098). - -* Thu May 27 1999 Antti Andreimann -- fixed the problem with escape character (it could not be disabled) -- changed the spec file to use %setup macro for unpacking telnet-client - -* Thu Apr 15 1999 Jeff Johnson -- use glibc utmp routines. - -* Thu Apr 8 1999 Jeff Johnson -- fix the fix (wrong way memcpy). - -* Wed Apr 7 1999 Jeff Johnson -- fix "telnet localhost" bus error on sparc64 (alpha?). - -* Tue Apr 6 1999 Jeff Johnson -- use OpenBSD telnet client (and fix minor core dump with .telnetrc #247) - -* Thu Mar 25 1999 Erik Troan -- use openpty in telnetd - -* Sun Mar 21 1999 Cristian Gafton -- auto rebuild in the new build environment (release 22) - -* Mon Mar 15 1999 Jeff Johnson -- compile for 6.0. - -* Fri Apr 24 1998 Prospector System -- translations modified for de, fr, tr - -* Fri Apr 24 1998 Cristian Gafton -- compile C++ code using egcs - -* Tue Apr 14 1998 Erik Troan -- built against new ncurses - -* Wed Oct 29 1997 Donnie Barnes -- added wmconfig entry - -* Tue Jul 15 1997 Erik Troan -- initial build Copied: tinysofa/releases/1.1/telnet/releases/1.1/1ts/specs/telnet.spec (from rev 5272, tinysofa/releases/1.1/telnet/current/specs/telnet.spec) =================================================================== --- tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-12-24 09:44:38 UTC (rev 5272) +++ tinysofa/releases/1.1/telnet/releases/1.1/1ts/specs/telnet.spec 2005-01-04 14:14:39 UTC (rev 5531) @@ -0,0 +1,58 @@ +Summary: A client for the telnet remote login protocol. +Name: telnet +Version: 1.1 +Release: 1ts +License: BSD +Group: main +Source: telnet-bsd-%{version}.tar.bz2 +Patch0: telnet-bsd-1.1.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: ncurses-devel + +%description +Telnet is an old protocol for logging into remote systems. Nowadays +it is rarely used, since the transfer is not encrypted (ssh is mostly +used instead). The telnet client is often used for debugging other +network services. + +This package provides a command line telnet client. + + +%prep +%setup -q -n telnet-bsd-%{version} +%patch -p0 + + +%build +CFLAGS="$RPM_OPT_FLAGS -fpie" \ +LDFLAGS="-pie" \ +./configure +%make -C telnet + + +%install +%{__mkdir_p} \ + %{buildroot}%{_bindir} \ + %{buildroot}%{_mandir}/man1 + +install -m 0755 telnet/telnet %{buildroot}%{_bindir}/telnet +install -m 0644 telnet/telnet.1 %{buildroot}%{_mandir}/man1/telnet.1 + + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root) +%doc README ChangeLog THANKS +%{_bindir}/telnet +%{_mandir}/man1/telnet.1* + + +%changelog +* Tue Jan 04 2005 tsintegrate 1.1-1ts +- current (1.1-1jh) integrated as 1.1-1ts for release 1.1-U3 + +* Thu Dec 23 2004 Jaakko Heinonen 1.1-1jh +- initial telnet-bsd spec From svn at tinysofa.org Tue Jan 4 14:15:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:15:06 -0500 (EST) Subject: [tinysofa-svn] r5532 - tinysofa/releases/1.1/telnet Message-ID: <20050104141506.3350C344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:15:01 -0500 (Tue, 04 Jan 2005) New Revision: 5532 Removed: tinysofa/releases/1.1/telnet/pristine/ Log: telnet: * removing pristine (0.17-12ts) From svn at tinysofa.org Tue Jan 4 14:15:16 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:15:16 -0500 (EST) Subject: [tinysofa-svn] r5533 - tinysofa/releases/1.1/telnet Message-ID: <20050104141516.41D49344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:15:10 -0500 (Tue, 04 Jan 2005) New Revision: 5533 Added: tinysofa/releases/1.1/telnet/pristine/ Log: telnet: * retarget pristine (0.17-12ts) to releases/1.1/1ts Copied: tinysofa/releases/1.1/telnet/pristine (from rev 5531, tinysofa/releases/1.1/telnet/releases/1.1/1ts) From svn at tinysofa.org Tue Jan 4 14:15:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:15:33 -0500 (EST) Subject: [tinysofa-svn] r5534 - in tinysofa/releases/1.1/tinysofa-rpm-config: current/specs releases releases/1.1.6 releases/1.1.6/1ts/specs Message-ID: <20050104141533.2F511344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:15:22 -0500 (Tue, 04 Jan 2005) New Revision: 5534 Added: tinysofa/releases/1.1/tinysofa-rpm-config/releases/1.1.6/ tinysofa/releases/1.1/tinysofa-rpm-config/releases/1.1.6/1ts/ Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec tinysofa/releases/1.1/tinysofa-rpm-config/releases/1.1.6/1ts/specs/tinysofa-rpm-config.spec Log: tinysofa-rpm-config: * integrate current (1.1.6-1jh) as releases/1.1.6/1ts Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec =================================================================== --- tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2005-01-04 14:15:10 UTC (rev 5533) +++ tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2005-01-04 14:15:22 UTC (rev 5534) @@ -1,7 +1,7 @@ Summary: tinysofa specific rpm configuration files. Name: tinysofa-rpm-config Version: 1.1.6 -Release: 1jh +Release: 1ts License: GPL Group: development Source: tinysofa-rpm-config-%{version}.tar.bz2 @@ -32,6 +32,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.1.6-1ts +- current (1.1.6-1jh) integrated as 1.1.6-1ts for release 1.1-U3 + * Thu Aug 05 2004 tsintegrate 1.1.3-1ts - current (1.1.3-1jh) integrated as 1.1.3-1ts for release 1.1 Copied: tinysofa/releases/1.1/tinysofa-rpm-config/releases/1.1.6/1ts (from rev 5268, tinysofa/releases/1.1/tinysofa-rpm-config/current) Modified: tinysofa/releases/1.1/tinysofa-rpm-config/releases/1.1.6/1ts/specs/tinysofa-rpm-config.spec =================================================================== --- tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/tinysofa-rpm-config/releases/1.1.6/1ts/specs/tinysofa-rpm-config.spec 2005-01-04 14:15:22 UTC (rev 5534) @@ -1,7 +1,7 @@ Summary: tinysofa specific rpm configuration files. Name: tinysofa-rpm-config Version: 1.1.6 -Release: 1jh +Release: 1ts License: GPL Group: development Source: tinysofa-rpm-config-%{version}.tar.bz2 @@ -32,6 +32,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.1.6-1ts +- current (1.1.6-1jh) integrated as 1.1.6-1ts for release 1.1-U3 + * Thu Aug 05 2004 tsintegrate 1.1.3-1ts - current (1.1.3-1jh) integrated as 1.1.3-1ts for release 1.1 From svn at tinysofa.org Tue Jan 4 14:15:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:15:45 -0500 (EST) Subject: [tinysofa-svn] r5535 - tinysofa/releases/1.1/tinysofa-rpm-config Message-ID: <20050104141545.3B65E344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:15:40 -0500 (Tue, 04 Jan 2005) New Revision: 5535 Removed: tinysofa/releases/1.1/tinysofa-rpm-config/pristine/ Log: tinysofa-rpm-config: * removing pristine (1.1.3-1jh) From svn at tinysofa.org Tue Jan 4 14:15:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:15:55 -0500 (EST) Subject: [tinysofa-svn] r5536 - tinysofa/releases/1.1/tinysofa-rpm-config Message-ID: <20050104141555.3D782344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:15:49 -0500 (Tue, 04 Jan 2005) New Revision: 5536 Added: tinysofa/releases/1.1/tinysofa-rpm-config/pristine/ Log: tinysofa-rpm-config: * retarget pristine (1.1.3-1jh) to releases/1.1.6/1ts Copied: tinysofa/releases/1.1/tinysofa-rpm-config/pristine (from rev 5534, tinysofa/releases/1.1/tinysofa-rpm-config/releases/1.1.6/1ts) From svn at tinysofa.org Tue Jan 4 14:16:19 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:16:19 -0500 (EST) Subject: [tinysofa-svn] r5537 - in tinysofa/releases/1.1/vim: current/specs releases/6.2.532 releases/6.2.532/3ts/specs Message-ID: <20050104141619.1604B344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:16:08 -0500 (Tue, 04 Jan 2005) New Revision: 5537 Added: tinysofa/releases/1.1/vim/releases/6.2.532/3ts/ Modified: tinysofa/releases/1.1/vim/current/specs/vim.spec tinysofa/releases/1.1/vim/releases/6.2.532/3ts/specs/vim.spec Log: vim: * integrate current (6.2.532-3jh) as releases/6.2.532/3ts Modified: tinysofa/releases/1.1/vim/current/specs/vim.spec =================================================================== --- tinysofa/releases/1.1/vim/current/specs/vim.spec 2005-01-04 14:15:49 UTC (rev 5536) +++ tinysofa/releases/1.1/vim/current/specs/vim.spec 2005-01-04 14:16:08 UTC (rev 5537) @@ -4,7 +4,7 @@ %define patchlevel 532 %define shortname vim62 Version: %srcversion.%patchlevel -Release: 3jh +Release: 3ts License: Charityware Group: main Source0: ftp://ftp.nl.vim.org/pub/vim/unix/%{name}-%{srcversion}.tar.bz2 @@ -210,6 +210,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 6.2.532-3ts +- current (6.2.532-3jh) integrated as 6.2.532-3ts for release 1.1-U3 + * Fri Dec 17 2004 Jaakko Heinonen 6.2.532-3jh - fix modelines command execution vulnerabilities (vim-6.2-SA13490.patch) Copied: tinysofa/releases/1.1/vim/releases/6.2.532/3ts (from rev 5268, tinysofa/releases/1.1/vim/current) Modified: tinysofa/releases/1.1/vim/releases/6.2.532/3ts/specs/vim.spec =================================================================== --- tinysofa/releases/1.1/vim/current/specs/vim.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/vim/releases/6.2.532/3ts/specs/vim.spec 2005-01-04 14:16:08 UTC (rev 5537) @@ -4,7 +4,7 @@ %define patchlevel 532 %define shortname vim62 Version: %srcversion.%patchlevel -Release: 3jh +Release: 3ts License: Charityware Group: main Source0: ftp://ftp.nl.vim.org/pub/vim/unix/%{name}-%{srcversion}.tar.bz2 @@ -210,6 +210,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 6.2.532-3ts +- current (6.2.532-3jh) integrated as 6.2.532-3ts for release 1.1-U3 + * Fri Dec 17 2004 Jaakko Heinonen 6.2.532-3jh - fix modelines command execution vulnerabilities (vim-6.2-SA13490.patch) From svn at tinysofa.org Tue Jan 4 14:16:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:16:28 -0500 (EST) Subject: [tinysofa-svn] r5538 - tinysofa/releases/1.1/vim Message-ID: <20050104141628.231A1344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:16:23 -0500 (Tue, 04 Jan 2005) New Revision: 5538 Removed: tinysofa/releases/1.1/vim/pristine/ Log: vim: * removing pristine (6.2.532-2ts) From svn at tinysofa.org Tue Jan 4 14:16:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:16:39 -0500 (EST) Subject: [tinysofa-svn] r5539 - tinysofa/releases/1.1/vim Message-ID: <20050104141639.CF08D344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:16:32 -0500 (Tue, 04 Jan 2005) New Revision: 5539 Added: tinysofa/releases/1.1/vim/pristine/ Log: vim: * retarget pristine (6.2.532-2ts) to releases/6.2.532/3ts Copied: tinysofa/releases/1.1/vim/pristine (from rev 5537, tinysofa/releases/1.1/vim/releases/6.2.532/3ts) From svn at tinysofa.org Tue Jan 4 14:17:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:17:09 -0500 (EST) Subject: [tinysofa-svn] r5540 - in tinysofa/releases/1.1/vsftpd: current/specs releases/2.0.1 releases/2.0.1/3ts/specs Message-ID: <20050104141709.B3296344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:16:56 -0500 (Tue, 04 Jan 2005) New Revision: 5540 Added: tinysofa/releases/1.1/vsftpd/releases/2.0.1/3ts/ Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec tinysofa/releases/1.1/vsftpd/releases/2.0.1/3ts/specs/vsftpd.spec Log: vsftpd: * integrate current (2.0.1-3jh) as releases/2.0.1/3ts Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec =================================================================== --- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2005-01-04 14:16:32 UTC (rev 5539) +++ tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2005-01-04 14:16:56 UTC (rev 5540) @@ -1,7 +1,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.1 -Release: 3jh +Release: 3ts License: GPL Group: main URL: http://vsftpd.beasts.org/ @@ -121,6 +121,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.0.1-3ts +- current (2.0.1-3jh) integrated as 2.0.1-3ts for release 1.1-U3 + * Sun Oct 10 2004 Jaakko Heinonen 2.0.1-3jh - remove xinetd support (it doesn't work) Copied: tinysofa/releases/1.1/vsftpd/releases/2.0.1/3ts (from rev 5268, tinysofa/releases/1.1/vsftpd/current) Modified: tinysofa/releases/1.1/vsftpd/releases/2.0.1/3ts/specs/vsftpd.spec =================================================================== --- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/vsftpd/releases/2.0.1/3ts/specs/vsftpd.spec 2005-01-04 14:16:56 UTC (rev 5540) @@ -1,7 +1,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.1 -Release: 3jh +Release: 3ts License: GPL Group: main URL: http://vsftpd.beasts.org/ @@ -121,6 +121,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.0.1-3ts +- current (2.0.1-3jh) integrated as 2.0.1-3ts for release 1.1-U3 + * Sun Oct 10 2004 Jaakko Heinonen 2.0.1-3jh - remove xinetd support (it doesn't work) From svn at tinysofa.org Tue Jan 4 14:17:19 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:17:19 -0500 (EST) Subject: [tinysofa-svn] r5541 - tinysofa/releases/1.1/vsftpd Message-ID: <20050104141719.A7A5E344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:17:13 -0500 (Tue, 04 Jan 2005) New Revision: 5541 Removed: tinysofa/releases/1.1/vsftpd/pristine/ Log: vsftpd: * removing pristine (2.0.1-2ts) From svn at tinysofa.org Tue Jan 4 14:17:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:17:31 -0500 (EST) Subject: [tinysofa-svn] r5542 - tinysofa/releases/1.1/vsftpd Message-ID: <20050104141731.519D2344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:17:23 -0500 (Tue, 04 Jan 2005) New Revision: 5542 Added: tinysofa/releases/1.1/vsftpd/pristine/ Log: vsftpd: * retarget pristine (2.0.1-2ts) to releases/2.0.1/3ts Copied: tinysofa/releases/1.1/vsftpd/pristine (from rev 5540, tinysofa/releases/1.1/vsftpd/releases/2.0.1/3ts) From svn at tinysofa.org Tue Jan 4 14:18:01 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:18:01 -0500 (EST) Subject: [tinysofa-svn] r5543 - in tinysofa/releases/1.1/wget: current/specs releases/1.9.1 releases/1.9.1/9ts/specs Message-ID: <20050104141801.13C18344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:17:47 -0500 (Tue, 04 Jan 2005) New Revision: 5543 Added: tinysofa/releases/1.1/wget/releases/1.9.1/9ts/ Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec tinysofa/releases/1.1/wget/releases/1.9.1/9ts/specs/wget.spec Log: wget: * integrate current (1.9.1-9jh) as releases/1.9.1/9ts Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec =================================================================== --- tinysofa/releases/1.1/wget/current/specs/wget.spec 2005-01-04 14:17:23 UTC (rev 5542) +++ tinysofa/releases/1.1/wget/current/specs/wget.spec 2005-01-04 14:17:47 UTC (rev 5543) @@ -1,7 +1,7 @@ Summary: A utility for retrieving files using the HTTP or FTP protocols. Name: wget Version: 1.9.1 -Release: 9jh +Release: 9ts License: GPL Group: extra URL: http://wget.sunsite.dk/ @@ -79,6 +79,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.9.1-9ts +- current (1.9.1-9jh) integrated as 1.9.1-9ts for release 1.1-U3 + * Fri Nov 5 2004 Jaakko Heinonen 1.9.1-9jh - add LFS patch Copied: tinysofa/releases/1.1/wget/releases/1.9.1/9ts (from rev 5268, tinysofa/releases/1.1/wget/current) Modified: tinysofa/releases/1.1/wget/releases/1.9.1/9ts/specs/wget.spec =================================================================== --- tinysofa/releases/1.1/wget/current/specs/wget.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/wget/releases/1.9.1/9ts/specs/wget.spec 2005-01-04 14:17:47 UTC (rev 5543) @@ -1,7 +1,7 @@ Summary: A utility for retrieving files using the HTTP or FTP protocols. Name: wget Version: 1.9.1 -Release: 9jh +Release: 9ts License: GPL Group: extra URL: http://wget.sunsite.dk/ @@ -79,6 +79,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.9.1-9ts +- current (1.9.1-9jh) integrated as 1.9.1-9ts for release 1.1-U3 + * Fri Nov 5 2004 Jaakko Heinonen 1.9.1-9jh - add LFS patch From svn at tinysofa.org Tue Jan 4 14:18:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:18:11 -0500 (EST) Subject: [tinysofa-svn] r5544 - tinysofa/releases/1.1/wget Message-ID: <20050104141811.94274344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:18:05 -0500 (Tue, 04 Jan 2005) New Revision: 5544 Removed: tinysofa/releases/1.1/wget/pristine/ Log: wget: * removing pristine (1.9.1-8ts) From svn at tinysofa.org Tue Jan 4 14:18:23 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:18:23 -0500 (EST) Subject: [tinysofa-svn] r5545 - tinysofa/releases/1.1/wget Message-ID: <20050104141823.360C4344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:18:15 -0500 (Tue, 04 Jan 2005) New Revision: 5545 Added: tinysofa/releases/1.1/wget/pristine/ Log: wget: * retarget pristine (1.9.1-8ts) to releases/1.9.1/9ts Copied: tinysofa/releases/1.1/wget/pristine (from rev 5543, tinysofa/releases/1.1/wget/releases/1.9.1/9ts) From svn at tinysofa.org Tue Jan 4 14:18:42 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:18:42 -0500 (EST) Subject: [tinysofa-svn] r5546 - in tinysofa/releases/1.1/ypserv: current/specs releases releases/2.13 releases/2.13/1ts/specs Message-ID: <20050104141842.3F76B344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:18:28 -0500 (Tue, 04 Jan 2005) New Revision: 5546 Added: tinysofa/releases/1.1/ypserv/releases/2.13/ tinysofa/releases/1.1/ypserv/releases/2.13/1ts/ Modified: tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec tinysofa/releases/1.1/ypserv/releases/2.13/1ts/specs/ypserv.spec Log: ypserv: * integrate current (2.13-1jh) as releases/2.13/1ts Modified: tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec =================================================================== --- tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec 2005-01-04 14:18:15 UTC (rev 5545) +++ tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec 2005-01-04 14:18:28 UTC (rev 5546) @@ -1,7 +1,7 @@ Summary: The NIS (Network Information Service) server. Name: ypserv Version: 2.13 -Release: 1jh +Release: 1ts License: GPL Group: extra Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2 @@ -110,6 +110,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.13-1ts +- current (2.13-1jh) integrated as 2.13-1ts for release 1.1-U3 + * Sun Nov 28 2004 Jaakko Heinonen 2.13-1jh - update to 2.13 - use macros Copied: tinysofa/releases/1.1/ypserv/releases/2.13/1ts (from rev 5268, tinysofa/releases/1.1/ypserv/current) Modified: tinysofa/releases/1.1/ypserv/releases/2.13/1ts/specs/ypserv.spec =================================================================== --- tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/ypserv/releases/2.13/1ts/specs/ypserv.spec 2005-01-04 14:18:28 UTC (rev 5546) @@ -1,7 +1,7 @@ Summary: The NIS (Network Information Service) server. Name: ypserv Version: 2.13 -Release: 1jh +Release: 1ts License: GPL Group: extra Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2 @@ -110,6 +110,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.13-1ts +- current (2.13-1jh) integrated as 2.13-1ts for release 1.1-U3 + * Sun Nov 28 2004 Jaakko Heinonen 2.13-1jh - update to 2.13 - use macros From svn at tinysofa.org Tue Jan 4 14:18:52 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:18:52 -0500 (EST) Subject: [tinysofa-svn] r5547 - tinysofa/releases/1.1/ypserv Message-ID: <20050104141852.9F386344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:18:46 -0500 (Tue, 04 Jan 2005) New Revision: 5547 Removed: tinysofa/releases/1.1/ypserv/pristine/ Log: ypserv: * removing pristine (2.12.1-3ts) From svn at tinysofa.org Tue Jan 4 14:19:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:19:04 -0500 (EST) Subject: [tinysofa-svn] r5548 - tinysofa/releases/1.1/ypserv Message-ID: <20050104141904.398B8344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:18:56 -0500 (Tue, 04 Jan 2005) New Revision: 5548 Added: tinysofa/releases/1.1/ypserv/pristine/ Log: ypserv: * retarget pristine (2.12.1-3ts) to releases/2.13/1ts Copied: tinysofa/releases/1.1/ypserv/pristine (from rev 5546, tinysofa/releases/1.1/ypserv/releases/2.13/1ts) From svn at tinysofa.org Tue Jan 4 14:19:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:19:33 -0500 (EST) Subject: [tinysofa-svn] r5549 - in tinysofa/releases/1.1/zip: current/specs releases/2.3 releases/2.3/3ts/specs Message-ID: <20050104141933.16E8C344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:19:19 -0500 (Tue, 04 Jan 2005) New Revision: 5549 Added: tinysofa/releases/1.1/zip/releases/2.3/3ts/ Modified: tinysofa/releases/1.1/zip/current/specs/zip.spec tinysofa/releases/1.1/zip/releases/2.3/3ts/specs/zip.spec Log: zip: * integrate current (2.3-3jh) as releases/2.3/3ts Modified: tinysofa/releases/1.1/zip/current/specs/zip.spec =================================================================== --- tinysofa/releases/1.1/zip/current/specs/zip.spec 2005-01-04 14:18:56 UTC (rev 5548) +++ tinysofa/releases/1.1/zip/current/specs/zip.spec 2005-01-04 14:19:19 UTC (rev 5549) @@ -1,7 +1,7 @@ Summary: A file compression and packaging utility compatible with PKZIP. Name: zip Version: 2.3 -Release: 3jh +Release: 3ts License: distributable Group: extra Source: ftp.uu.net:/pub/archiving/zip/src/zip23.tar.gz @@ -70,6 +70,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.3-3ts +- current (2.3-3jh) integrated as 2.3-3ts for release 1.1-U3 + * Wed Nov 10 2004 Jaakko Heinonen 2.3-3jh - add longname patch to fix buffer overflow (Bug ID: #25) Copied: tinysofa/releases/1.1/zip/releases/2.3/3ts (from rev 5268, tinysofa/releases/1.1/zip/current) Modified: tinysofa/releases/1.1/zip/releases/2.3/3ts/specs/zip.spec =================================================================== --- tinysofa/releases/1.1/zip/current/specs/zip.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/zip/releases/2.3/3ts/specs/zip.spec 2005-01-04 14:19:19 UTC (rev 5549) @@ -1,7 +1,7 @@ Summary: A file compression and packaging utility compatible with PKZIP. Name: zip Version: 2.3 -Release: 3jh +Release: 3ts License: distributable Group: extra Source: ftp.uu.net:/pub/archiving/zip/src/zip23.tar.gz @@ -70,6 +70,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.3-3ts +- current (2.3-3jh) integrated as 2.3-3ts for release 1.1-U3 + * Wed Nov 10 2004 Jaakko Heinonen 2.3-3jh - add longname patch to fix buffer overflow (Bug ID: #25) From svn at tinysofa.org Tue Jan 4 14:19:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:19:43 -0500 (EST) Subject: [tinysofa-svn] r5550 - tinysofa/releases/1.1/zip Message-ID: <20050104141943.8BE85344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:19:37 -0500 (Tue, 04 Jan 2005) New Revision: 5550 Removed: tinysofa/releases/1.1/zip/pristine/ Log: zip: * removing pristine (2.3-2ts) From svn at tinysofa.org Tue Jan 4 14:19:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:19:55 -0500 (EST) Subject: [tinysofa-svn] r5551 - tinysofa/releases/1.1/zip Message-ID: <20050104141955.305B0344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:19:47 -0500 (Tue, 04 Jan 2005) New Revision: 5551 Added: tinysofa/releases/1.1/zip/pristine/ Log: zip: * retarget pristine (2.3-2ts) to releases/2.3/3ts Copied: tinysofa/releases/1.1/zip/pristine (from rev 5549, tinysofa/releases/1.1/zip/releases/2.3/3ts) From svn at tinysofa.org Tue Jan 4 14:20:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:20:14 -0500 (EST) Subject: [tinysofa-svn] r5552 - in tinysofa/releases/1.1/zlib: current/specs releases releases/1.2.1.2 releases/1.2.1.2/1ts/specs Message-ID: <20050104142014.9139C344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:20:01 -0500 (Tue, 04 Jan 2005) New Revision: 5552 Added: tinysofa/releases/1.1/zlib/releases/1.2.1.2/ tinysofa/releases/1.1/zlib/releases/1.2.1.2/1ts/ Modified: tinysofa/releases/1.1/zlib/current/specs/zlib.spec tinysofa/releases/1.1/zlib/releases/1.2.1.2/1ts/specs/zlib.spec Log: zlib: * integrate current (1.2.1.2-1jh) as releases/1.2.1.2/1ts Modified: tinysofa/releases/1.1/zlib/current/specs/zlib.spec =================================================================== --- tinysofa/releases/1.1/zlib/current/specs/zlib.spec 2005-01-04 14:19:47 UTC (rev 5551) +++ tinysofa/releases/1.1/zlib/current/specs/zlib.spec 2005-01-04 14:20:01 UTC (rev 5552) @@ -1,7 +1,7 @@ Summary: The zlib compression and decompression library. Name: zlib Version: 1.2.1.2 -Release: 1jh +Release: 1ts Group: main Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz Patch0: zlib-1.1.4-make-test.patch @@ -82,6 +82,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.2.1.2-1ts +- current (1.2.1.2-1jh) integrated as 1.2.1.2-1ts for release 1.1-U3 + * Sun Sep 19 2004 Jaakko Heinonen 1.2.1.2-1jh - update to 1.2.1.2, which fixes DOS problems Copied: tinysofa/releases/1.1/zlib/releases/1.2.1.2/1ts (from rev 5268, tinysofa/releases/1.1/zlib/current) Modified: tinysofa/releases/1.1/zlib/releases/1.2.1.2/1ts/specs/zlib.spec =================================================================== --- tinysofa/releases/1.1/zlib/current/specs/zlib.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/zlib/releases/1.2.1.2/1ts/specs/zlib.spec 2005-01-04 14:20:01 UTC (rev 5552) @@ -1,7 +1,7 @@ Summary: The zlib compression and decompression library. Name: zlib Version: 1.2.1.2 -Release: 1jh +Release: 1ts Group: main Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz Patch0: zlib-1.1.4-make-test.patch @@ -82,6 +82,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.2.1.2-1ts +- current (1.2.1.2-1jh) integrated as 1.2.1.2-1ts for release 1.1-U3 + * Sun Sep 19 2004 Jaakko Heinonen 1.2.1.2-1jh - update to 1.2.1.2, which fixes DOS problems From svn at tinysofa.org Tue Jan 4 14:20:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:20:24 -0500 (EST) Subject: [tinysofa-svn] r5553 - tinysofa/releases/1.1/zlib Message-ID: <20050104142024.8C2C0344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:20:18 -0500 (Tue, 04 Jan 2005) New Revision: 5553 Removed: tinysofa/releases/1.1/zlib/pristine/ Log: zlib: * removing pristine (1.2.1.1-1ts) From svn at tinysofa.org Tue Jan 4 14:20:36 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 09:20:36 -0500 (EST) Subject: [tinysofa-svn] r5554 - tinysofa/releases/1.1/zlib Message-ID: <20050104142036.291FE344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 09:20:28 -0500 (Tue, 04 Jan 2005) New Revision: 5554 Added: tinysofa/releases/1.1/zlib/pristine/ Log: zlib: * retarget pristine (1.2.1.1-1ts) to releases/1.2.1.2/1ts Copied: tinysofa/releases/1.1/zlib/pristine (from rev 5552, tinysofa/releases/1.1/zlib/releases/1.2.1.2/1ts) From svn at tinysofa.org Tue Jan 4 18:45:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 13:45:08 -0500 (EST) Subject: [tinysofa-svn] r5555 - in tinysofa/releases/1.1: cpio/current/specs findutils/current/specs gdb/current/specs Message-ID: <20050104184508.30774344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 13:44:50 -0500 (Tue, 04 Jan 2005) New Revision: 5555 Modified: tinysofa/releases/1.1/cpio/current/specs/cpio.spec tinysofa/releases/1.1/findutils/current/specs/findutils.spec tinysofa/releases/1.1/gdb/current/specs/gdb.spec Log: - add missing BuildRequires Modified: tinysofa/releases/1.1/cpio/current/specs/cpio.spec =================================================================== --- tinysofa/releases/1.1/cpio/current/specs/cpio.spec 2005-01-04 14:20:28 UTC (rev 5554) +++ tinysofa/releases/1.1/cpio/current/specs/cpio.spec 2005-01-04 18:44:50 UTC (rev 5555) @@ -17,6 +17,7 @@ Patch14: cpio-2.5-lfs.patch Patch15: cpio-2.5-time.patch #info_requires +BuildRequires: texinfo Buildroot: %{_tmppath}/%{name}-%{version}-root %description Modified: tinysofa/releases/1.1/findutils/current/specs/findutils.spec =================================================================== --- tinysofa/releases/1.1/findutils/current/specs/findutils.spec 2005-01-04 14:20:28 UTC (rev 5554) +++ tinysofa/releases/1.1/findutils/current/specs/findutils.spec 2005-01-04 18:44:50 UTC (rev 5555) @@ -13,7 +13,7 @@ Patch4: findutils-4.1.20-i.patch Patch5: findutils-4.1.20-build.patch %info_requires -BuildRequires: autoconf automake gettext gettext-devel libtool +BuildRequires: autoconf automake gettext gettext-devel libtool gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Modified: tinysofa/releases/1.1/gdb/current/specs/gdb.spec =================================================================== --- tinysofa/releases/1.1/gdb/current/specs/gdb.spec 2005-01-04 14:20:28 UTC (rev 5554) +++ tinysofa/releases/1.1/gdb/current/specs/gdb.spec 2005-01-04 18:44:50 UTC (rev 5555) @@ -7,7 +7,7 @@ Source0: ftp://ftp.gnu.org/gdb/gdb/gdb-%{version}/gdb-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: ncurses glibc -BuildRequires: ncurses-devel glibc-devel gcc make gzip gettext +BuildRequires: ncurses-devel glibc-devel gcc make gzip gettext flex %description GDB, the GNU debugger, allows you to debug programs written in C, C++, From svn at tinysofa.org Tue Jan 4 18:48:20 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 13:48:20 -0500 (EST) Subject: [tinysofa-svn] r5556 - tinysofa/releases/1.1/krb5/current/specs Message-ID: <20050104184820.9C8E2344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 13:48:14 -0500 (Tue, 04 Jan 2005) New Revision: 5556 Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec Log: - disable parallel make Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 18:44:50 UTC (rev 5555) +++ tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 18:48:14 UTC (rev 5556) @@ -58,7 +58,7 @@ --with-system-et \ --enable-dns \ --with-netlib=-lresolv -%make +%make -j1 popd From svn at tinysofa.org Tue Jan 4 19:44:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:44:45 -0500 (EST) Subject: [tinysofa-svn] r5557 - in tinysofa/releases/1.1/krb5: current/specs releases releases/1.3.6 releases/1.3.6/1ts/specs Message-ID: <20050104194445.66BE4344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:44:28 -0500 (Tue, 04 Jan 2005) New Revision: 5557 Added: tinysofa/releases/1.1/krb5/releases/1.3.6/ tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/ tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/specs/krb5.spec Removed: tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/specs/krb5.spec Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec Log: krb5: * integrate current (1.3.6-1jh) as releases/1.3.6/1ts Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 18:48:14 UTC (rev 5556) +++ tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 19:44:28 UTC (rev 5557) @@ -1,7 +1,7 @@ Summary: Kerberos is a network authentication protocol. Name: krb5 Version: 1.3.6 -Release: 1jh +Release: 1ts Group: main Source0: krb5-%{version}.tar.gz Patch0: krb5-1.3.6-prof_err.patch @@ -95,6 +95,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.3.6-1ts +- current (1.3.6-1jh) integrated as 1.3.6-1ts for release 1.1-U3 + * Tue Dec 21 2004 Jaakko Heinonen 1.3.6-1jh - 1.3.6, fixes CAN-2004-1189 Copied: tinysofa/releases/1.1/krb5/releases/1.3.6/1ts (from rev 5268, tinysofa/releases/1.1/krb5/current) Deleted: tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/specs/krb5.spec =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/specs/krb5.spec 2005-01-04 19:44:28 UTC (rev 5557) @@ -1,178 +0,0 @@ -Summary: Kerberos is a network authentication protocol. -Name: krb5 -Version: 1.3.6 -Release: 1jh -Group: main -Source0: krb5-%{version}.tar.gz -Patch0: krb5-1.3.6-prof_err.patch -URL: http://web.mit.edu/kerberos -License: Distributable -Requires: libcom_err libtermcap ncurses -BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel -%rename kerberos5 -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%description -(MIT) Kerberos is a network authentication protocol. It is designed to provide -strong authentication for client/server applications by using secret-key -cryptography. A free implementation of this protocol is available from the -Massachusetts Institute of Technology. Kerberos is available in many commercial -products as well. - -%package devel -Group: development -Summary: Development libraries for kerberos 5 -Requires: %{name}-libs = %{version}-%{release} -Requires: libcom_err-devel -%rename kerberos5-devel - -%description devel -The kerberos5-devel package contains the development libraries and header files -for MIT kerberos5. - -%package libs -Group: main -Summary: Kerberos libraries -%rename kerberos5-libs - -%description libs -The kerberos5-libs package contains the kerberos5 libraries. - - -%prep -%setup -q -n krb5-%{version} -%patch0 -p1 -b .prof_err~ - - -%build -pushd src -export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et -fPIC" -export CFLAGS="$CFLAGS -DKRB5_DNS_LOOKUP=1" -%ifarch %{ix86} s390 ppc sparc -export CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" -%endif -export LDFLAGS="$LDFLAGS -pie" -%configure \ - --enable-shared \ - --program-prefix=krb5 \ - --with-system-et \ - --enable-dns \ - --with-netlib=-lresolv -%make -popd - - -%install -pushd src -%makeinstall_std -popd - - -%clean -%clean_buildroot - - -%files -%defattr(-,root,root) -%attr(755,root,root) %{_bindir}/* -%{_sbindir}/* -%exclude %{_sbindir}/krb5-send-pr -%{_datadir}/gnats -%{_mandir}/man8/* -%{_mandir}/man1/* -%exclude %{_mandir}/man1/krb5-send-pr* -%{_mandir}/man5/* -%{_mandir}/man5/.k5login.5* - -%files libs -%attr(755,root,root) %{_libdir}/*.so.* - -%files devel -%defattr(-,root,root) -%{_includedir}/* -%attr(644,root,root) %{_libdir}/*.a -%attr(755,root,root) %{_libdir}/*.so - - -%changelog -* Tue Dec 21 2004 Jaakko Heinonen 1.3.6-1jh -- 1.3.6, fixes CAN-2004-1189 - -* Tue Nov 16 2004 Jaakko Heinonen 1.3.5-2jh -- -devel requires now the same version of the -libs -- rename to krb5 - -* Sun Nov 14 2004 Jaakko Heinonen -- exclude krb5-send-pr script - -* Sun Oct 31 2004 Jaakko Heinonen 1.3.5-1jh -- 1.3.5 -- large file support -- copile with -fPIC and link with -pie - -* Sat Sep 04 2004 tsintegrate 1.3.4-2ts -- current (1.3.4-2jh) integrated as 1.3.4-2ts for release 1.1-U1 - -* Tue Aug 31 2004 Jaakko Heinonen -- MITKRB5-SA-2004-002 and MITKRB5-SA-2004-003 security fixes - -* Thu Aug 19 2004 Jaakko Heinonen -- 1.3.4 -- spec cleanup - -* Thu Aug 05 2004 tsintegrate 1.3.3-5ts -- current (1.3.3-5jh) integrated as 1.3.3-5ts for release 1.1 - -* Fri Jun 18 2004 tsintegrate 1.3.3-4ts -- current (1.3.3-3ts) integrated as 1.3.3-4ts for release 1.0-U2 - -* Fri Jun 18 2004 Omar Kilani -- Update MIT patch to latest version of vuln fix. - -* Wed Jun 02 2004 tsintegrate 1.3.3-3ts -- current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1 - -* Wed Jun 02 2004 Omar Kilani 1.3.3-3ok -- Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln. - -* Mon May 24 2004 tsintegrate 1.3.3-2ts -- current (1.3.3-2jh) integrated as 1.3.3-2ts for release 1.0-U1 - -* Sun May 23 2004 Jaakko Heinonen 1.3.3-2jh -- fix permissions for /usr/bin/krb5ksu and /usr/bin/krb5v4rcp - -* Wed May 19 2004 tsintegrate 1.3.3-1ts -- current (1.3.3-1ok) integrated as 1.3.3-1ts for release 1.0-U1 - -* Thu May 13 2004 Omar Kilani 1.3.3-1ok -- New Upstream. - -* Tue May 11 2004 Omar Kilani -- Add BuildRequires: byacc libtermcap-devel ncurses-devel -- Add Requires: libtermcap ncurses -- Add Requires: libcom_err-devel to devel sub package. - -* Mon May 10 2004 Jaakko Heinonen 1.3.2-4jh -- fixed permissions for library files - -* Mon May 03 2004 Omar Kilani 1.3.2-3ts -- Rebuild - -* Mon May 03 2004 Jaakko Heinonen 1.3.2-2jh -- fixed permissions for manual and include files - -* Wed Apr 07 2004 Omar Kilani 1.3.2-1ts -- New upstream. - -* Tue Feb 11 2004 Tor Hveem 1.3.1-4th -- Fixed stupid error with file wildcards. - -* Tue Feb 10 2004 Tor Hveem 1.3.1-3th -- New package libs. - -* Mon Feb 9 2004 Chr. Toldnes 1.3.1-2tr -- Use system et (libcom_err) - -* Mon Feb 9 2004 Chr. Toldnes 1.3.1-1tr -- Initial release for Trustix -- built shared :) with no stack protection :( Copied: tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/specs/krb5.spec (from rev 5556, tinysofa/releases/1.1/krb5/current/specs/krb5.spec) =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 18:48:14 UTC (rev 5556) +++ tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/specs/krb5.spec 2005-01-04 19:44:28 UTC (rev 5557) @@ -0,0 +1,181 @@ +Summary: Kerberos is a network authentication protocol. +Name: krb5 +Version: 1.3.6 +Release: 1ts +Group: main +Source0: krb5-%{version}.tar.gz +Patch0: krb5-1.3.6-prof_err.patch +URL: http://web.mit.edu/kerberos +License: Distributable +Requires: libcom_err libtermcap ncurses +BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel +%rename kerberos5 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +(MIT) Kerberos is a network authentication protocol. It is designed to provide +strong authentication for client/server applications by using secret-key +cryptography. A free implementation of this protocol is available from the +Massachusetts Institute of Technology. Kerberos is available in many commercial +products as well. + +%package devel +Group: development +Summary: Development libraries for kerberos 5 +Requires: %{name}-libs = %{version}-%{release} +Requires: libcom_err-devel +%rename kerberos5-devel + +%description devel +The kerberos5-devel package contains the development libraries and header files +for MIT kerberos5. + +%package libs +Group: main +Summary: Kerberos libraries +%rename kerberos5-libs + +%description libs +The kerberos5-libs package contains the kerberos5 libraries. + + +%prep +%setup -q -n krb5-%{version} +%patch0 -p1 -b .prof_err~ + + +%build +pushd src +export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et -fPIC" +export CFLAGS="$CFLAGS -DKRB5_DNS_LOOKUP=1" +%ifarch %{ix86} s390 ppc sparc +export CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" +%endif +export LDFLAGS="$LDFLAGS -pie" +%configure \ + --enable-shared \ + --program-prefix=krb5 \ + --with-system-et \ + --enable-dns \ + --with-netlib=-lresolv +%make -j1 +popd + + +%install +pushd src +%makeinstall_std +popd + + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root) +%attr(755,root,root) %{_bindir}/* +%{_sbindir}/* +%exclude %{_sbindir}/krb5-send-pr +%{_datadir}/gnats +%{_mandir}/man8/* +%{_mandir}/man1/* +%exclude %{_mandir}/man1/krb5-send-pr* +%{_mandir}/man5/* +%{_mandir}/man5/.k5login.5* + +%files libs +%attr(755,root,root) %{_libdir}/*.so.* + +%files devel +%defattr(-,root,root) +%{_includedir}/* +%attr(644,root,root) %{_libdir}/*.a +%attr(755,root,root) %{_libdir}/*.so + + +%changelog +* Tue Jan 04 2005 tsintegrate 1.3.6-1ts +- current (1.3.6-1jh) integrated as 1.3.6-1ts for release 1.1-U3 + +* Tue Dec 21 2004 Jaakko Heinonen 1.3.6-1jh +- 1.3.6, fixes CAN-2004-1189 + +* Tue Nov 16 2004 Jaakko Heinonen 1.3.5-2jh +- -devel requires now the same version of the -libs +- rename to krb5 + +* Sun Nov 14 2004 Jaakko Heinonen +- exclude krb5-send-pr script + +* Sun Oct 31 2004 Jaakko Heinonen 1.3.5-1jh +- 1.3.5 +- large file support +- copile with -fPIC and link with -pie + +* Sat Sep 04 2004 tsintegrate 1.3.4-2ts +- current (1.3.4-2jh) integrated as 1.3.4-2ts for release 1.1-U1 + +* Tue Aug 31 2004 Jaakko Heinonen +- MITKRB5-SA-2004-002 and MITKRB5-SA-2004-003 security fixes + +* Thu Aug 19 2004 Jaakko Heinonen +- 1.3.4 +- spec cleanup + +* Thu Aug 05 2004 tsintegrate 1.3.3-5ts +- current (1.3.3-5jh) integrated as 1.3.3-5ts for release 1.1 + +* Fri Jun 18 2004 tsintegrate 1.3.3-4ts +- current (1.3.3-3ts) integrated as 1.3.3-4ts for release 1.0-U2 + +* Fri Jun 18 2004 Omar Kilani +- Update MIT patch to latest version of vuln fix. + +* Wed Jun 02 2004 tsintegrate 1.3.3-3ts +- current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1 + +* Wed Jun 02 2004 Omar Kilani 1.3.3-3ok +- Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln. + +* Mon May 24 2004 tsintegrate 1.3.3-2ts +- current (1.3.3-2jh) integrated as 1.3.3-2ts for release 1.0-U1 + +* Sun May 23 2004 Jaakko Heinonen 1.3.3-2jh +- fix permissions for /usr/bin/krb5ksu and /usr/bin/krb5v4rcp + +* Wed May 19 2004 tsintegrate 1.3.3-1ts +- current (1.3.3-1ok) integrated as 1.3.3-1ts for release 1.0-U1 + +* Thu May 13 2004 Omar Kilani 1.3.3-1ok +- New Upstream. + +* Tue May 11 2004 Omar Kilani +- Add BuildRequires: byacc libtermcap-devel ncurses-devel +- Add Requires: libtermcap ncurses +- Add Requires: libcom_err-devel to devel sub package. + +* Mon May 10 2004 Jaakko Heinonen 1.3.2-4jh +- fixed permissions for library files + +* Mon May 03 2004 Omar Kilani 1.3.2-3ts +- Rebuild + +* Mon May 03 2004 Jaakko Heinonen 1.3.2-2jh +- fixed permissions for manual and include files + +* Wed Apr 07 2004 Omar Kilani 1.3.2-1ts +- New upstream. + +* Tue Feb 11 2004 Tor Hveem 1.3.1-4th +- Fixed stupid error with file wildcards. + +* Tue Feb 10 2004 Tor Hveem 1.3.1-3th +- New package libs. + +* Mon Feb 9 2004 Chr. Toldnes 1.3.1-2tr +- Use system et (libcom_err) + +* Mon Feb 9 2004 Chr. Toldnes 1.3.1-1tr +- Initial release for Trustix +- built shared :) with no stack protection :( From svn at tinysofa.org Tue Jan 4 19:44:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:44:55 -0500 (EST) Subject: [tinysofa-svn] r5558 - tinysofa/releases/1.1/krb5 Message-ID: <20050104194455.B83C0344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:44:49 -0500 (Tue, 04 Jan 2005) New Revision: 5558 Removed: tinysofa/releases/1.1/krb5/pristine/ Log: : * removing pristine (-) From svn at tinysofa.org Tue Jan 4 19:45:07 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:45:07 -0500 (EST) Subject: [tinysofa-svn] r5559 - tinysofa/releases/1.1/krb5 Message-ID: <20050104194507.6A724344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:44:59 -0500 (Tue, 04 Jan 2005) New Revision: 5559 Added: tinysofa/releases/1.1/krb5/pristine/ Log: krb5: * retarget pristine (-) to releases/1.3.6/1ts Copied: tinysofa/releases/1.1/krb5/pristine (from rev 5557, tinysofa/releases/1.1/krb5/releases/1.3.6/1ts) From svn at tinysofa.org Tue Jan 4 19:50:13 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:50:13 -0500 (EST) Subject: [tinysofa-svn] r5561 - tinysofa/releases/1.1/mdadm Message-ID: <20050104195013.8E508344107@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:50:07 -0500 (Tue, 04 Jan 2005) New Revision: 5561 Removed: tinysofa/releases/1.1/mdadm/pristine/ Log: : * removing pristine (-) From svn at tinysofa.org Tue Jan 4 19:50:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:50:03 -0500 (EST) Subject: [tinysofa-svn] r5560 - in tinysofa/releases/1.1/mdadm: current/specs releases releases/1.8.0 releases/1.8.0/1ts/specs Message-ID: <20050104195003.26F37344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:49:49 -0500 (Tue, 04 Jan 2005) New Revision: 5560 Added: tinysofa/releases/1.1/mdadm/releases/1.8.0/ tinysofa/releases/1.1/mdadm/releases/1.8.0/1ts/ Modified: tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec tinysofa/releases/1.1/mdadm/releases/1.8.0/1ts/specs/mdadm.spec Log: mdadm: * integrate current (1.8.0-1jh) as releases/1.8.0/1ts Modified: tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec =================================================================== --- tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec 2005-01-04 19:44:59 UTC (rev 5559) +++ tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec 2005-01-04 19:49:49 UTC (rev 5560) @@ -1,7 +1,7 @@ Summary: mdadm is used for controlling Linux md devices (aka RAID arrays) Name: mdadm Version: 1.8.0 -Release: 1jh +Release: 1ts Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz Source1: mdmonitor.init Patch0: mdadm-1.5.0-email.patch @@ -70,6 +70,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.8.0-1ts +- current (1.8.0-1jh) integrated as 1.8.0-1ts for release 1.1-U3 + * Mon Nov 29 2004 Jaakko Heinonen 1.8.0-1jh - 1.8.0 Copied: tinysofa/releases/1.1/mdadm/releases/1.8.0/1ts (from rev 5268, tinysofa/releases/1.1/mdadm/current) Modified: tinysofa/releases/1.1/mdadm/releases/1.8.0/1ts/specs/mdadm.spec =================================================================== --- tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/mdadm/releases/1.8.0/1ts/specs/mdadm.spec 2005-01-04 19:49:49 UTC (rev 5560) @@ -1,7 +1,7 @@ Summary: mdadm is used for controlling Linux md devices (aka RAID arrays) Name: mdadm Version: 1.8.0 -Release: 1jh +Release: 1ts Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz Source1: mdmonitor.init Patch0: mdadm-1.5.0-email.patch @@ -70,6 +70,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.8.0-1ts +- current (1.8.0-1jh) integrated as 1.8.0-1ts for release 1.1-U3 + * Mon Nov 29 2004 Jaakko Heinonen 1.8.0-1jh - 1.8.0 From svn at tinysofa.org Tue Jan 4 19:54:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:54:06 -0500 (EST) Subject: [tinysofa-svn] r5562 - in tinysofa/releases/1.1/mdadm: . pristine/specs Message-ID: <20050104195406.DF3C3344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:53:55 -0500 (Tue, 04 Jan 2005) New Revision: 5562 Added: tinysofa/releases/1.1/mdadm/pristine/ tinysofa/releases/1.1/mdadm/pristine/specs/mdadm.spec Removed: tinysofa/releases/1.1/mdadm/pristine/specs/mdadm.spec Log: - retarget pristine Copied: tinysofa/releases/1.1/mdadm/pristine (from rev 5268, tinysofa/releases/1.1/mdadm/current) Deleted: tinysofa/releases/1.1/mdadm/pristine/specs/mdadm.spec =================================================================== --- tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/mdadm/pristine/specs/mdadm.spec 2005-01-04 19:53:55 UTC (rev 5562) @@ -1,159 +0,0 @@ -Summary: mdadm is used for controlling Linux md devices (aka RAID arrays) -Name: mdadm -Version: 1.8.0 -Release: 1jh -Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz -Source1: mdmonitor.init -Patch0: mdadm-1.5.0-email.patch -URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/ -License: GPL -Group: main -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Obsoletes: mdctl -BuildRequires: groff -Requires: smtpdaemon -%service_requires - -%description -mdadm is a program that can be used to create, manage, and monitor -Linux MD (Software RAID) devices. -As such is provides similar functionality to the raidtools packages. -The particular differences to raidtools is that mdadm is a single -program, and it can perform (almost) all functions without a -configuration file (that a config file can be used to help with -some common tasks). - - -%prep -%setup -q -%patch0 -p1 -b .email -# we want to install in /sbin, not /usr/sbin... -%define _exec_prefix %{nil} - - -%build -%make \ - CXFLAGS="$RPM_OPT_FLAGS" \ - SYSCONFDIR="%{_sysconfdir}" - - -%install -%makeinstall_std \ - MANDIR=%{_mandir} \ - BINDIR=%{_sbindir} - -install -D -m 600 mdadm.conf-example $RPM_BUILD_ROOT/%{_sysconfdir}/mdadm.conf -install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor - - -%clean -%clean_buildroot - - -%files -%defattr(-,root,root) -%doc TODO ChangeLog mdadm.conf-example COPYING -%{_sbindir}/mdadm -%{_initrddir}/mdmonitor -%config(noreplace,missingok) %attr(600,root,root) %{_sysconfdir}/mdadm.conf -%{_mandir}/man*/md* - - -%post -%service_post mdmonitor - -%preun -%service_preun mdmonitor - -%postun -%service_postun mdmonitor - - -%changelog -* Mon Nov 29 2004 Jaakko Heinonen 1.8.0-1jh -- 1.8.0 - -* Thu Aug 05 2004 tsintegrate 1.5.0-6ts -- current (1.5.0-6jh) integrated as 1.5.0-6ts for release 1.1 - -* Wed May 19 2004 tsintegrate 1.5.0-5ts -- current (1.5.0-5jh) integrated as 1.5.0-5ts for release 1.0-U1 - -* Tue May 18 2004 Jaakko Heinonen 1.5.0-5jh -- add mdmonitor service -- install mdadm.conf again -- require smtpdaemon -- fix sendmail location - -* Tue May 11 2004 Omar Kilani 1.5.0-4ts -- Add BuildRequires groff. - -* Wed Feb 11 2004 Omar Kilani 1.5.0-1ok -- New upstream. - -* Tue Dec 9 2003 Erlend Midttun 1.4.0-1tr -- New upstream. - -* Tue Aug 19 2003 Chr. Toldnes 1.3.0-2tr -- Rebuilt and retagged - -* Mon Aug 18 2003 Omar Kilani 1.3.0-1ok -- new upstream: 1.3.0, allows creation of very large md devices. - -* Wed Jun 18 2003 Erlend Midttun 1.2.0-5tr -- Big rebuild - -* Wed May 28 2003 Tore Olsen mdadm1.2.0-4to -- Removed init script, it's done in rc.sysinit now. - -* Wed May 28 2003 Roland Kruse mdadm-1.2.0-3rk -- Don't provide /etc/sysconfig/md; set up by anaconda - -* Thu May 22 2003 Goetz Bock mdadm-1.2.0-2bg -- moved init scripts to this package -- updated Group - -* Mon May 19 2003 Goetz Bock mdadm-1.2.0-1bg -- new upstream: 1.2.0 -- no longer copy the config example as actual config - -* Mon Mar 24 2003 Erlend Midttun 1.0.1-3em -- Rebuilt against glibc 2.3.2. - -* Sat Feb 01 2003 Tor Hveem 1.0.1-2h -- Fixed package Group - -* Thu Jun 06 2002 Goetz Bock 1.0.1-1bg -- new upstream version: 1.0.1 -- cleaned up %%install, as makefile now has install target - -* Thu Mar 21 2002 Goetz Bock 0.7.2-2bn -- moved mdadm to /sbin, it is required to boot - -* Thu Mar 21 2002 Goetz Bock 0.7.2-1bn -- updated to 0.7.2 -- sanitycheck for %clean and %%install -- fixed type in $RPM_BUILD_ROOT, and some other mixups of % and $ - -* Fri Mar 15 2002 -- beautification -- made mdadm.conf non-replaceable config -- renamed Copyright to License in the header -- added missing license file -- used macros for file paths - -* Fri Mar 15 2002 Luca Berra -- Added Obsoletes: mdctl -- missingok for configfile - -* Wed Mar 12 2002 NeilBrown -- Add md.4 and mdadm.conf.5 man pages - -* Fri Mar 08 2002 Chris Siebenmann -- builds properly as non-root. - -* Fri Mar 08 2002 Derek Vadala -- updated for 0.7, fixed /usr/share/doc and added manpage - -* Tue Aug 07 2001 Danilo Godec -- initial RPM build Copied: tinysofa/releases/1.1/mdadm/pristine/specs/mdadm.spec (from rev 5560, tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec) From svn at tinysofa.org Tue Jan 4 19:54:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:54:32 -0500 (EST) Subject: [tinysofa-svn] r5563 - in tinysofa/releases/1.1/krb5: current/specs releases/1.3.6/1ts releases/1.3.6/1ts/current/specs Message-ID: <20050104195432.BCC37344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:54:15 -0500 (Tue, 04 Jan 2005) New Revision: 5563 Added: tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/current/ tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/current/specs/krb5.spec Removed: tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/current/specs/krb5.spec Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec Log: krb5: * integrate current (1.3.6-1ts) as releases/1.3.6/1ts Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 19:53:55 UTC (rev 5562) +++ tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 19:54:15 UTC (rev 5563) @@ -96,6 +96,9 @@ %changelog * Tue Jan 04 2005 tsintegrate 1.3.6-1ts +- current (1.3.6-1ts) integrated as 1.3.6-1ts for release 1.1-U3 + +* Tue Jan 04 2005 tsintegrate 1.3.6-1ts - current (1.3.6-1jh) integrated as 1.3.6-1ts for release 1.1-U3 * Tue Dec 21 2004 Jaakko Heinonen 1.3.6-1jh Copied: tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/current (from rev 5268, tinysofa/releases/1.1/krb5/current) Deleted: tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/current/specs/krb5.spec =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/current/specs/krb5.spec 2005-01-04 19:54:15 UTC (rev 5563) @@ -1,178 +0,0 @@ -Summary: Kerberos is a network authentication protocol. -Name: krb5 -Version: 1.3.6 -Release: 1jh -Group: main -Source0: krb5-%{version}.tar.gz -Patch0: krb5-1.3.6-prof_err.patch -URL: http://web.mit.edu/kerberos -License: Distributable -Requires: libcom_err libtermcap ncurses -BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel -%rename kerberos5 -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%description -(MIT) Kerberos is a network authentication protocol. It is designed to provide -strong authentication for client/server applications by using secret-key -cryptography. A free implementation of this protocol is available from the -Massachusetts Institute of Technology. Kerberos is available in many commercial -products as well. - -%package devel -Group: development -Summary: Development libraries for kerberos 5 -Requires: %{name}-libs = %{version}-%{release} -Requires: libcom_err-devel -%rename kerberos5-devel - -%description devel -The kerberos5-devel package contains the development libraries and header files -for MIT kerberos5. - -%package libs -Group: main -Summary: Kerberos libraries -%rename kerberos5-libs - -%description libs -The kerberos5-libs package contains the kerberos5 libraries. - - -%prep -%setup -q -n krb5-%{version} -%patch0 -p1 -b .prof_err~ - - -%build -pushd src -export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et -fPIC" -export CFLAGS="$CFLAGS -DKRB5_DNS_LOOKUP=1" -%ifarch %{ix86} s390 ppc sparc -export CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" -%endif -export LDFLAGS="$LDFLAGS -pie" -%configure \ - --enable-shared \ - --program-prefix=krb5 \ - --with-system-et \ - --enable-dns \ - --with-netlib=-lresolv -%make -popd - - -%install -pushd src -%makeinstall_std -popd - - -%clean -%clean_buildroot - - -%files -%defattr(-,root,root) -%attr(755,root,root) %{_bindir}/* -%{_sbindir}/* -%exclude %{_sbindir}/krb5-send-pr -%{_datadir}/gnats -%{_mandir}/man8/* -%{_mandir}/man1/* -%exclude %{_mandir}/man1/krb5-send-pr* -%{_mandir}/man5/* -%{_mandir}/man5/.k5login.5* - -%files libs -%attr(755,root,root) %{_libdir}/*.so.* - -%files devel -%defattr(-,root,root) -%{_includedir}/* -%attr(644,root,root) %{_libdir}/*.a -%attr(755,root,root) %{_libdir}/*.so - - -%changelog -* Tue Dec 21 2004 Jaakko Heinonen 1.3.6-1jh -- 1.3.6, fixes CAN-2004-1189 - -* Tue Nov 16 2004 Jaakko Heinonen 1.3.5-2jh -- -devel requires now the same version of the -libs -- rename to krb5 - -* Sun Nov 14 2004 Jaakko Heinonen -- exclude krb5-send-pr script - -* Sun Oct 31 2004 Jaakko Heinonen 1.3.5-1jh -- 1.3.5 -- large file support -- copile with -fPIC and link with -pie - -* Sat Sep 04 2004 tsintegrate 1.3.4-2ts -- current (1.3.4-2jh) integrated as 1.3.4-2ts for release 1.1-U1 - -* Tue Aug 31 2004 Jaakko Heinonen -- MITKRB5-SA-2004-002 and MITKRB5-SA-2004-003 security fixes - -* Thu Aug 19 2004 Jaakko Heinonen -- 1.3.4 -- spec cleanup - -* Thu Aug 05 2004 tsintegrate 1.3.3-5ts -- current (1.3.3-5jh) integrated as 1.3.3-5ts for release 1.1 - -* Fri Jun 18 2004 tsintegrate 1.3.3-4ts -- current (1.3.3-3ts) integrated as 1.3.3-4ts for release 1.0-U2 - -* Fri Jun 18 2004 Omar Kilani -- Update MIT patch to latest version of vuln fix. - -* Wed Jun 02 2004 tsintegrate 1.3.3-3ts -- current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1 - -* Wed Jun 02 2004 Omar Kilani 1.3.3-3ok -- Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln. - -* Mon May 24 2004 tsintegrate 1.3.3-2ts -- current (1.3.3-2jh) integrated as 1.3.3-2ts for release 1.0-U1 - -* Sun May 23 2004 Jaakko Heinonen 1.3.3-2jh -- fix permissions for /usr/bin/krb5ksu and /usr/bin/krb5v4rcp - -* Wed May 19 2004 tsintegrate 1.3.3-1ts -- current (1.3.3-1ok) integrated as 1.3.3-1ts for release 1.0-U1 - -* Thu May 13 2004 Omar Kilani 1.3.3-1ok -- New Upstream. - -* Tue May 11 2004 Omar Kilani -- Add BuildRequires: byacc libtermcap-devel ncurses-devel -- Add Requires: libtermcap ncurses -- Add Requires: libcom_err-devel to devel sub package. - -* Mon May 10 2004 Jaakko Heinonen 1.3.2-4jh -- fixed permissions for library files - -* Mon May 03 2004 Omar Kilani 1.3.2-3ts -- Rebuild - -* Mon May 03 2004 Jaakko Heinonen 1.3.2-2jh -- fixed permissions for manual and include files - -* Wed Apr 07 2004 Omar Kilani 1.3.2-1ts -- New upstream. - -* Tue Feb 11 2004 Tor Hveem 1.3.1-4th -- Fixed stupid error with file wildcards. - -* Tue Feb 10 2004 Tor Hveem 1.3.1-3th -- New package libs. - -* Mon Feb 9 2004 Chr. Toldnes 1.3.1-2tr -- Use system et (libcom_err) - -* Mon Feb 9 2004 Chr. Toldnes 1.3.1-1tr -- Initial release for Trustix -- built shared :) with no stack protection :( Copied: tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/current/specs/krb5.spec (from rev 5557, tinysofa/releases/1.1/krb5/current/specs/krb5.spec) =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 19:44:28 UTC (rev 5557) +++ tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/current/specs/krb5.spec 2005-01-04 19:54:15 UTC (rev 5563) @@ -0,0 +1,184 @@ +Summary: Kerberos is a network authentication protocol. +Name: krb5 +Version: 1.3.6 +Release: 1ts +Group: main +Source0: krb5-%{version}.tar.gz +Patch0: krb5-1.3.6-prof_err.patch +URL: http://web.mit.edu/kerberos +License: Distributable +Requires: libcom_err libtermcap ncurses +BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel +%rename kerberos5 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +(MIT) Kerberos is a network authentication protocol. It is designed to provide +strong authentication for client/server applications by using secret-key +cryptography. A free implementation of this protocol is available from the +Massachusetts Institute of Technology. Kerberos is available in many commercial +products as well. + +%package devel +Group: development +Summary: Development libraries for kerberos 5 +Requires: %{name}-libs = %{version}-%{release} +Requires: libcom_err-devel +%rename kerberos5-devel + +%description devel +The kerberos5-devel package contains the development libraries and header files +for MIT kerberos5. + +%package libs +Group: main +Summary: Kerberos libraries +%rename kerberos5-libs + +%description libs +The kerberos5-libs package contains the kerberos5 libraries. + + +%prep +%setup -q -n krb5-%{version} +%patch0 -p1 -b .prof_err~ + + +%build +pushd src +export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et -fPIC" +export CFLAGS="$CFLAGS -DKRB5_DNS_LOOKUP=1" +%ifarch %{ix86} s390 ppc sparc +export CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" +%endif +export LDFLAGS="$LDFLAGS -pie" +%configure \ + --enable-shared \ + --program-prefix=krb5 \ + --with-system-et \ + --enable-dns \ + --with-netlib=-lresolv +%make -j1 +popd + + +%install +pushd src +%makeinstall_std +popd + + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root) +%attr(755,root,root) %{_bindir}/* +%{_sbindir}/* +%exclude %{_sbindir}/krb5-send-pr +%{_datadir}/gnats +%{_mandir}/man8/* +%{_mandir}/man1/* +%exclude %{_mandir}/man1/krb5-send-pr* +%{_mandir}/man5/* +%{_mandir}/man5/.k5login.5* + +%files libs +%attr(755,root,root) %{_libdir}/*.so.* + +%files devel +%defattr(-,root,root) +%{_includedir}/* +%attr(644,root,root) %{_libdir}/*.a +%attr(755,root,root) %{_libdir}/*.so + + +%changelog +* Tue Jan 04 2005 tsintegrate 1.3.6-1ts +- current (1.3.6-1ts) integrated as 1.3.6-1ts for release 1.1-U3 + +* Tue Jan 04 2005 tsintegrate 1.3.6-1ts +- current (1.3.6-1jh) integrated as 1.3.6-1ts for release 1.1-U3 + +* Tue Dec 21 2004 Jaakko Heinonen 1.3.6-1jh +- 1.3.6, fixes CAN-2004-1189 + +* Tue Nov 16 2004 Jaakko Heinonen 1.3.5-2jh +- -devel requires now the same version of the -libs +- rename to krb5 + +* Sun Nov 14 2004 Jaakko Heinonen +- exclude krb5-send-pr script + +* Sun Oct 31 2004 Jaakko Heinonen 1.3.5-1jh +- 1.3.5 +- large file support +- copile with -fPIC and link with -pie + +* Sat Sep 04 2004 tsintegrate 1.3.4-2ts +- current (1.3.4-2jh) integrated as 1.3.4-2ts for release 1.1-U1 + +* Tue Aug 31 2004 Jaakko Heinonen +- MITKRB5-SA-2004-002 and MITKRB5-SA-2004-003 security fixes + +* Thu Aug 19 2004 Jaakko Heinonen +- 1.3.4 +- spec cleanup + +* Thu Aug 05 2004 tsintegrate 1.3.3-5ts +- current (1.3.3-5jh) integrated as 1.3.3-5ts for release 1.1 + +* Fri Jun 18 2004 tsintegrate 1.3.3-4ts +- current (1.3.3-3ts) integrated as 1.3.3-4ts for release 1.0-U2 + +* Fri Jun 18 2004 Omar Kilani +- Update MIT patch to latest version of vuln fix. + +* Wed Jun 02 2004 tsintegrate 1.3.3-3ts +- current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1 + +* Wed Jun 02 2004 Omar Kilani 1.3.3-3ok +- Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln. + +* Mon May 24 2004 tsintegrate 1.3.3-2ts +- current (1.3.3-2jh) integrated as 1.3.3-2ts for release 1.0-U1 + +* Sun May 23 2004 Jaakko Heinonen 1.3.3-2jh +- fix permissions for /usr/bin/krb5ksu and /usr/bin/krb5v4rcp + +* Wed May 19 2004 tsintegrate 1.3.3-1ts +- current (1.3.3-1ok) integrated as 1.3.3-1ts for release 1.0-U1 + +* Thu May 13 2004 Omar Kilani 1.3.3-1ok +- New Upstream. + +* Tue May 11 2004 Omar Kilani +- Add BuildRequires: byacc libtermcap-devel ncurses-devel +- Add Requires: libtermcap ncurses +- Add Requires: libcom_err-devel to devel sub package. + +* Mon May 10 2004 Jaakko Heinonen 1.3.2-4jh +- fixed permissions for library files + +* Mon May 03 2004 Omar Kilani 1.3.2-3ts +- Rebuild + +* Mon May 03 2004 Jaakko Heinonen 1.3.2-2jh +- fixed permissions for manual and include files + +* Wed Apr 07 2004 Omar Kilani 1.3.2-1ts +- New upstream. + +* Tue Feb 11 2004 Tor Hveem 1.3.1-4th +- Fixed stupid error with file wildcards. + +* Tue Feb 10 2004 Tor Hveem 1.3.1-3th +- New package libs. + +* Mon Feb 9 2004 Chr. Toldnes 1.3.1-2tr +- Use system et (libcom_err) + +* Mon Feb 9 2004 Chr. Toldnes 1.3.1-1tr +- Initial release for Trustix +- built shared :) with no stack protection :( From svn at tinysofa.org Tue Jan 4 19:54:42 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:54:42 -0500 (EST) Subject: [tinysofa-svn] r5564 - tinysofa/releases/1.1/krb5 Message-ID: <20050104195442.83932344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:54:36 -0500 (Tue, 04 Jan 2005) New Revision: 5564 Removed: tinysofa/releases/1.1/krb5/pristine/ Log: krb5: * removing pristine (1.3.6-1ts) From svn at tinysofa.org Tue Jan 4 19:54:56 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:54:56 -0500 (EST) Subject: [tinysofa-svn] r5565 - in tinysofa/releases/1.1/krb5: . pristine Message-ID: <20050104195456.B9749344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:54:46 -0500 (Tue, 04 Jan 2005) New Revision: 5565 Added: tinysofa/releases/1.1/krb5/pristine/ tinysofa/releases/1.1/krb5/pristine/current/ Log: krb5: * retarget pristine (1.3.6-1ts) to releases/1.3.6/1ts Copied: tinysofa/releases/1.1/krb5/pristine (from rev 5557, tinysofa/releases/1.1/krb5/releases/1.3.6/1ts) Copied: tinysofa/releases/1.1/krb5/pristine/current (from rev 5563, tinysofa/releases/1.1/krb5/releases/1.3.6/1ts/current) From svn at tinysofa.org Tue Jan 4 19:55:29 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:55:29 -0500 (EST) Subject: [tinysofa-svn] r5566 - tinysofa/releases/1.1/krb5/current/specs Message-ID: <20050104195529.097C4344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:55:22 -0500 (Tue, 04 Jan 2005) New Revision: 5566 Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec Log: - fix changelog Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 19:54:46 UTC (rev 5565) +++ tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-04 19:55:22 UTC (rev 5566) @@ -96,9 +96,6 @@ %changelog * Tue Jan 04 2005 tsintegrate 1.3.6-1ts -- current (1.3.6-1ts) integrated as 1.3.6-1ts for release 1.1-U3 - -* Tue Jan 04 2005 tsintegrate 1.3.6-1ts - current (1.3.6-1jh) integrated as 1.3.6-1ts for release 1.1-U3 * Tue Dec 21 2004 Jaakko Heinonen 1.3.6-1jh From svn at tinysofa.org Tue Jan 4 19:56:35 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:56:35 -0500 (EST) Subject: [tinysofa-svn] r5567 - in tinysofa/releases/1.1/bridge-utils: current/specs releases releases/1.0.4 releases/1.0.4/1ts/specs Message-ID: <20050104195635.305A6344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:56:21 -0500 (Tue, 04 Jan 2005) New Revision: 5567 Added: tinysofa/releases/1.1/bridge-utils/releases/1.0.4/ tinysofa/releases/1.1/bridge-utils/releases/1.0.4/1ts/ Modified: tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec tinysofa/releases/1.1/bridge-utils/releases/1.0.4/1ts/specs/bridge-utils.spec Log: bridge-utils: * integrate current (1.0.4-1jh) as releases/1.0.4/1ts Modified: tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec =================================================================== --- tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec 2005-01-04 19:55:22 UTC (rev 5566) +++ tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec 2005-01-04 19:56:21 UTC (rev 5567) @@ -3,7 +3,7 @@ Summary: Utilities for configuring the linux ethernet bridge. Name: bridge-utils Version: 1.0.4 -Release: 1jh +Release: 1ts License: GPL URL: http://bridge.sourceforge.net/ Group: main @@ -72,6 +72,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.0.4-1ts +- current (1.0.4-1jh) integrated as 1.0.4-1ts for release 1.1-U3 + * Wed Dec 15 2004 Jaakko Heinonen 1.0.4-1jh - tinysofa Copied: tinysofa/releases/1.1/bridge-utils/releases/1.0.4/1ts (from rev 5268, tinysofa/releases/1.1/bridge-utils/current) Modified: tinysofa/releases/1.1/bridge-utils/releases/1.0.4/1ts/specs/bridge-utils.spec =================================================================== --- tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/bridge-utils/releases/1.0.4/1ts/specs/bridge-utils.spec 2005-01-04 19:56:21 UTC (rev 5567) @@ -3,7 +3,7 @@ Summary: Utilities for configuring the linux ethernet bridge. Name: bridge-utils Version: 1.0.4 -Release: 1jh +Release: 1ts License: GPL URL: http://bridge.sourceforge.net/ Group: main @@ -72,6 +72,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 1.0.4-1ts +- current (1.0.4-1jh) integrated as 1.0.4-1ts for release 1.1-U3 + * Wed Dec 15 2004 Jaakko Heinonen 1.0.4-1jh - tinysofa From svn at tinysofa.org Tue Jan 4 19:56:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:56:45 -0500 (EST) Subject: [tinysofa-svn] r5568 - tinysofa/releases/1.1/bridge-utils Message-ID: <20050104195645.89B81344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:56:39 -0500 (Tue, 04 Jan 2005) New Revision: 5568 Removed: tinysofa/releases/1.1/bridge-utils/pristine/ Log: : * removing pristine (-) From svn at tinysofa.org Tue Jan 4 19:56:57 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:56:57 -0500 (EST) Subject: [tinysofa-svn] r5569 - tinysofa/releases/1.1/bridge-utils Message-ID: <20050104195657.25BDF344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:56:49 -0500 (Tue, 04 Jan 2005) New Revision: 5569 Added: tinysofa/releases/1.1/bridge-utils/pristine/ Log: bridge-utils: * retarget pristine to releases/1.0.4/1ts Copied: tinysofa/releases/1.1/bridge-utils/pristine (from rev 5567, tinysofa/releases/1.1/bridge-utils/releases/1.0.4/1ts) From svn at tinysofa.org Tue Jan 4 19:57:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:57:21 -0500 (EST) Subject: [tinysofa-svn] r5570 - in tinysofa/releases/1.1/elinks: current/specs releases releases/0.9.3 releases/0.9.3/2ts/specs Message-ID: <20050104195721.60BE0344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:57:07 -0500 (Tue, 04 Jan 2005) New Revision: 5570 Added: tinysofa/releases/1.1/elinks/releases/0.9.3/ tinysofa/releases/1.1/elinks/releases/0.9.3/2ts/ Modified: tinysofa/releases/1.1/elinks/current/specs/elinks.spec tinysofa/releases/1.1/elinks/releases/0.9.3/2ts/specs/elinks.spec Log: elinks: * integrate current (0.9.3-2jh) as releases/0.9.3/2ts Modified: tinysofa/releases/1.1/elinks/current/specs/elinks.spec =================================================================== --- tinysofa/releases/1.1/elinks/current/specs/elinks.spec 2005-01-04 19:56:49 UTC (rev 5569) +++ tinysofa/releases/1.1/elinks/current/specs/elinks.spec 2005-01-04 19:57:07 UTC (rev 5570) @@ -1,7 +1,7 @@ Name: elinks Summary: A text-mode Web browser. Version: 0.9.3 -Release: 2jh +Release: 2ts Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2 Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2 Patch0: elinks-noegd.patch @@ -95,6 +95,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.9.3-2ts +- current (0.9.3-2jh) integrated as 0.9.3-2ts for release 1.1-U3 + * Thu Dec 2 2004 Jaakko Heinonen 0.9.3-2jh - change iso-8859-1 to default terminal charset (elinks-0.9.3-latin1-term.patch) Copied: tinysofa/releases/1.1/elinks/releases/0.9.3/2ts (from rev 5268, tinysofa/releases/1.1/elinks/current) Modified: tinysofa/releases/1.1/elinks/releases/0.9.3/2ts/specs/elinks.spec =================================================================== --- tinysofa/releases/1.1/elinks/current/specs/elinks.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/elinks/releases/0.9.3/2ts/specs/elinks.spec 2005-01-04 19:57:07 UTC (rev 5570) @@ -1,7 +1,7 @@ Name: elinks Summary: A text-mode Web browser. Version: 0.9.3 -Release: 2jh +Release: 2ts Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2 Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2 Patch0: elinks-noegd.patch @@ -95,6 +95,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 0.9.3-2ts +- current (0.9.3-2jh) integrated as 0.9.3-2ts for release 1.1-U3 + * Thu Dec 2 2004 Jaakko Heinonen 0.9.3-2jh - change iso-8859-1 to default terminal charset (elinks-0.9.3-latin1-term.patch) From svn at tinysofa.org Tue Jan 4 19:57:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:57:31 -0500 (EST) Subject: [tinysofa-svn] r5571 - tinysofa/releases/1.1/elinks Message-ID: <20050104195731.85569344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:57:25 -0500 (Tue, 04 Jan 2005) New Revision: 5571 Removed: tinysofa/releases/1.1/elinks/pristine/ Log: : * removing pristine (-) From svn at tinysofa.org Tue Jan 4 19:57:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:57:43 -0500 (EST) Subject: [tinysofa-svn] r5572 - tinysofa/releases/1.1/elinks Message-ID: <20050104195743.3F32F344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:57:35 -0500 (Tue, 04 Jan 2005) New Revision: 5572 Added: tinysofa/releases/1.1/elinks/pristine/ Log: elinks: * retarget pristine to releases/0.9.3/2ts Copied: tinysofa/releases/1.1/elinks/pristine (from rev 5570, tinysofa/releases/1.1/elinks/releases/0.9.3/2ts) From svn at tinysofa.org Tue Jan 4 19:59:07 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:59:07 -0500 (EST) Subject: [tinysofa-svn] r5573 - in tinysofa/releases/1.1/linux-libc-headers: current/specs releases releases/2.4 releases/2.4/1ts/specs Message-ID: <20050104195907.DDC56344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:58:54 -0500 (Tue, 04 Jan 2005) New Revision: 5573 Added: tinysofa/releases/1.1/linux-libc-headers/releases/2.4/ tinysofa/releases/1.1/linux-libc-headers/releases/2.4/1ts/ Modified: tinysofa/releases/1.1/linux-libc-headers/current/specs/linux-libc-headers.spec tinysofa/releases/1.1/linux-libc-headers/releases/2.4/1ts/specs/linux-libc-headers.spec Log: linux-libc-headers: * integrate current (2.4-1jh) as releases/2.4/1ts Modified: tinysofa/releases/1.1/linux-libc-headers/current/specs/linux-libc-headers.spec =================================================================== --- tinysofa/releases/1.1/linux-libc-headers/current/specs/linux-libc-headers.spec 2005-01-04 19:57:35 UTC (rev 5572) +++ tinysofa/releases/1.1/linux-libc-headers/current/specs/linux-libc-headers.spec 2005-01-04 19:58:54 UTC (rev 5573) @@ -1,7 +1,7 @@ Summary: Header files for the Linux kernel for use by glibc Name: linux-libc-headers Version: 2.4 -Release: 1jh +Release: 1ts License: GPL Group: development ExclusiveOS: Linux @@ -121,6 +121,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.4-1ts +- current (2.4-1jh) integrated as 2.4-1ts for release 1.1-U3 + * Thu Sep 16 2004 Jaakko Heinonen 2.4-1jh - change package name to linux-libc-headers - update glibc-kernheaders.tar.bz2 from Fedora Copied: tinysofa/releases/1.1/linux-libc-headers/releases/2.4/1ts (from rev 5268, tinysofa/releases/1.1/linux-libc-headers/current) Modified: tinysofa/releases/1.1/linux-libc-headers/releases/2.4/1ts/specs/linux-libc-headers.spec =================================================================== --- tinysofa/releases/1.1/linux-libc-headers/current/specs/linux-libc-headers.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/linux-libc-headers/releases/2.4/1ts/specs/linux-libc-headers.spec 2005-01-04 19:58:54 UTC (rev 5573) @@ -1,7 +1,7 @@ Summary: Header files for the Linux kernel for use by glibc Name: linux-libc-headers Version: 2.4 -Release: 1jh +Release: 1ts License: GPL Group: development ExclusiveOS: Linux @@ -121,6 +121,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.4-1ts +- current (2.4-1jh) integrated as 2.4-1ts for release 1.1-U3 + * Thu Sep 16 2004 Jaakko Heinonen 2.4-1jh - change package name to linux-libc-headers - update glibc-kernheaders.tar.bz2 from Fedora From svn at tinysofa.org Tue Jan 4 19:59:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:59:17 -0500 (EST) Subject: [tinysofa-svn] r5574 - tinysofa/releases/1.1/linux-libc-headers Message-ID: <20050104195917.8F27A344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:59:11 -0500 (Tue, 04 Jan 2005) New Revision: 5574 Removed: tinysofa/releases/1.1/linux-libc-headers/pristine/ Log: : * removing pristine (-) From svn at tinysofa.org Tue Jan 4 19:59:29 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 14:59:29 -0500 (EST) Subject: [tinysofa-svn] r5575 - tinysofa/releases/1.1/linux-libc-headers Message-ID: <20050104195929.3E397344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 14:59:21 -0500 (Tue, 04 Jan 2005) New Revision: 5575 Added: tinysofa/releases/1.1/linux-libc-headers/pristine/ Log: linux-libc-headers: * retarget pristine to releases/2.4/1ts Copied: tinysofa/releases/1.1/linux-libc-headers/pristine (from rev 5573, tinysofa/releases/1.1/linux-libc-headers/releases/2.4/1ts) From svn at tinysofa.org Tue Jan 4 20:00:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 15:00:28 -0500 (EST) Subject: [tinysofa-svn] r5576 - in tinysofa/releases/1.1/modutils: current/specs releases/2.4.27 releases/2.4.27/5ts/specs Message-ID: <20050104200028.48D72344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 15:00:14 -0500 (Tue, 04 Jan 2005) New Revision: 5576 Added: tinysofa/releases/1.1/modutils/releases/2.4.27/5ts/ Modified: tinysofa/releases/1.1/modutils/current/specs/modutils.spec tinysofa/releases/1.1/modutils/releases/2.4.27/5ts/specs/modutils.spec Log: modutils: * integrate current (2.4.27-5jh) as releases/2.4.27/5ts Modified: tinysofa/releases/1.1/modutils/current/specs/modutils.spec =================================================================== --- tinysofa/releases/1.1/modutils/current/specs/modutils.spec 2005-01-04 19:59:21 UTC (rev 5575) +++ tinysofa/releases/1.1/modutils/current/specs/modutils.spec 2005-01-04 20:00:14 UTC (rev 5576) @@ -1,7 +1,7 @@ Summary: The kernel module utilities. Name: modutils Version: 2.4.27 -Release: 5jh +Release: 5ts License: GPL Group: main Source: http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-%{version}.tar.bz2 @@ -81,6 +81,9 @@ %{_libdir}/*.a %changelog +* Tue Jan 04 2005 tsintegrate 2.4.27-5ts +- current (2.4.27-5jh) integrated as 2.4.27-5ts for release 1.1-U3 + * Mon Nov 1 2004 Jaakko Heinonen 2.4.27-5jh - add devel package - disable 2.0 compatibility Copied: tinysofa/releases/1.1/modutils/releases/2.4.27/5ts (from rev 5268, tinysofa/releases/1.1/modutils/current) Modified: tinysofa/releases/1.1/modutils/releases/2.4.27/5ts/specs/modutils.spec =================================================================== --- tinysofa/releases/1.1/modutils/current/specs/modutils.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/modutils/releases/2.4.27/5ts/specs/modutils.spec 2005-01-04 20:00:14 UTC (rev 5576) @@ -1,7 +1,7 @@ Summary: The kernel module utilities. Name: modutils Version: 2.4.27 -Release: 5jh +Release: 5ts License: GPL Group: main Source: http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-%{version}.tar.bz2 @@ -81,6 +81,9 @@ %{_libdir}/*.a %changelog +* Tue Jan 04 2005 tsintegrate 2.4.27-5ts +- current (2.4.27-5jh) integrated as 2.4.27-5ts for release 1.1-U3 + * Mon Nov 1 2004 Jaakko Heinonen 2.4.27-5jh - add devel package - disable 2.0 compatibility From svn at tinysofa.org Tue Jan 4 20:00:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 15:00:38 -0500 (EST) Subject: [tinysofa-svn] r5577 - tinysofa/releases/1.1/modutils Message-ID: <20050104200038.A774B344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 15:00:32 -0500 (Tue, 04 Jan 2005) New Revision: 5577 Removed: tinysofa/releases/1.1/modutils/pristine/ Log: : * removing pristine (-) From svn at tinysofa.org Tue Jan 4 20:00:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 15:00:50 -0500 (EST) Subject: [tinysofa-svn] r5578 - tinysofa/releases/1.1/modutils Message-ID: <20050104200050.361B2344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 15:00:42 -0500 (Tue, 04 Jan 2005) New Revision: 5578 Added: tinysofa/releases/1.1/modutils/pristine/ Log: modutils: * retarget pristine to releases/2.4.27/5ts Copied: tinysofa/releases/1.1/modutils/pristine (from rev 5576, tinysofa/releases/1.1/modutils/releases/2.4.27/5ts) From svn at tinysofa.org Tue Jan 4 20:01:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 15:01:40 -0500 (EST) Subject: [tinysofa-svn] r5580 - tinysofa/releases/1.1/perl Message-ID: <20050104200140.C97F1344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 15:01:34 -0500 (Tue, 04 Jan 2005) New Revision: 5580 Removed: tinysofa/releases/1.1/perl/pristine/ Log: : * removing pristine (-) From svn at tinysofa.org Tue Jan 4 20:01:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 15:01:54 -0500 (EST) Subject: [tinysofa-svn] r5581 - tinysofa/releases/1.1/perl Message-ID: <20050104200154.24643344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 15:01:46 -0500 (Tue, 04 Jan 2005) New Revision: 5581 Added: tinysofa/releases/1.1/perl/pristine/ Log: perl: * retarget pristine to releases/5.8.5/4ts Copied: tinysofa/releases/1.1/perl/pristine (from rev 5579, tinysofa/releases/1.1/perl/releases/5.8.5/4ts) From svn at tinysofa.org Tue Jan 4 20:02:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 15:02:14 -0500 (EST) Subject: [tinysofa-svn] r5582 - in tinysofa/releases/1.1/postfix: current/specs releases releases/2.0.20 releases/2.0.20/3ts/specs Message-ID: <20050104200214.E5A49344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 15:02:01 -0500 (Tue, 04 Jan 2005) New Revision: 5582 Added: tinysofa/releases/1.1/postfix/releases/2.0.20/ tinysofa/releases/1.1/postfix/releases/2.0.20/3ts/ Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec tinysofa/releases/1.1/postfix/releases/2.0.20/3ts/specs/postfix.spec Log: postfix: * integrate current (2.0.20-3jh) as releases/2.0.20/3ts Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec =================================================================== --- tinysofa/releases/1.1/postfix/current/specs/postfix.spec 2005-01-04 20:01:46 UTC (rev 5581) +++ tinysofa/releases/1.1/postfix/current/specs/postfix.spec 2005-01-04 20:02:01 UTC (rev 5582) @@ -1,7 +1,7 @@ Summary: The Postfix mailer daemon Name: postfix Version: 2.0.20 -Release: 3jh +Release: 3ts License: IBM Public Licence Group: main Source: ftp://ftp.sunet.se/pub/unix/mail/postfix/official/postfix-%{version}.tar.gz @@ -479,6 +479,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.0.20-3ts +- current (2.0.20-3jh) integrated as 2.0.20-3ts for release 1.1-U3 + * Thu Nov 25 2004 Jaakko Heinonen 2.0.20-3jh - multilib fixes Copied: tinysofa/releases/1.1/postfix/releases/2.0.20/3ts (from rev 5268, tinysofa/releases/1.1/postfix/current) Modified: tinysofa/releases/1.1/postfix/releases/2.0.20/3ts/specs/postfix.spec =================================================================== --- tinysofa/releases/1.1/postfix/current/specs/postfix.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/postfix/releases/2.0.20/3ts/specs/postfix.spec 2005-01-04 20:02:01 UTC (rev 5582) @@ -1,7 +1,7 @@ Summary: The Postfix mailer daemon Name: postfix Version: 2.0.20 -Release: 3jh +Release: 3ts License: IBM Public Licence Group: main Source: ftp://ftp.sunet.se/pub/unix/mail/postfix/official/postfix-%{version}.tar.gz @@ -479,6 +479,9 @@ %changelog +* Tue Jan 04 2005 tsintegrate 2.0.20-3ts +- current (2.0.20-3jh) integrated as 2.0.20-3ts for release 1.1-U3 + * Thu Nov 25 2004 Jaakko Heinonen 2.0.20-3jh - multilib fixes From svn at tinysofa.org Tue Jan 4 20:02:25 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 15:02:25 -0500 (EST) Subject: [tinysofa-svn] r5583 - tinysofa/releases/1.1/postfix Message-ID: <20050104200225.DB29B344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 15:02:19 -0500 (Tue, 04 Jan 2005) New Revision: 5583 Removed: tinysofa/releases/1.1/postfix/pristine/ Log: : * removing pristine (-) From svn at tinysofa.org Tue Jan 4 20:02:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 15:02:37 -0500 (EST) Subject: [tinysofa-svn] r5584 - tinysofa/releases/1.1/postfix Message-ID: <20050104200237.80970344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 15:02:29 -0500 (Tue, 04 Jan 2005) New Revision: 5584 Added: tinysofa/releases/1.1/postfix/pristine/ Log: postfix: * retarget pristine to releases/2.0.20/3ts Copied: tinysofa/releases/1.1/postfix/pristine (from rev 5582, tinysofa/releases/1.1/postfix/releases/2.0.20/3ts) From svn at tinysofa.org Tue Jan 4 20:02:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 15:02:54 -0500 (EST) Subject: [tinysofa-svn] r5585 - tinysofa/releases/1.1/dev86/current/specs Message-ID: <20050104200254.B18F0344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 15:02:48 -0500 (Tue, 04 Jan 2005) New Revision: 5585 Modified: tinysofa/releases/1.1/dev86/current/specs/dev86.spec Log: - disable parallel make Modified: tinysofa/releases/1.1/dev86/current/specs/dev86.spec =================================================================== --- tinysofa/releases/1.1/dev86/current/specs/dev86.spec 2005-01-04 20:02:29 UTC (rev 5584) +++ tinysofa/releases/1.1/dev86/current/specs/dev86.spec 2005-01-04 20:02:48 UTC (rev 5585) @@ -31,7 +31,7 @@ quit __EOF__ -%make GCCFLAG="$RPM_OPT_FLAGS" +%make -j1 GCCFLAG="$RPM_OPT_FLAGS" %install From svn at tinysofa.org Tue Jan 4 21:28:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 16:28:04 -0500 (EST) Subject: [tinysofa-svn] r5586 - tinysofa/releases/1.1/ncurses/current/specs Message-ID: <20050104212804.35A2F344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 16:27:57 -0500 (Tue, 04 Jan 2005) New Revision: 5586 Modified: tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec Log: - disable parallel make Modified: tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec =================================================================== --- tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec 2005-01-04 20:02:48 UTC (rev 5585) +++ tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec 2005-01-04 21:27:57 UTC (rev 5586) @@ -71,7 +71,7 @@ --with-install-prefix=${RPM_BUILD_ROOT} \ --libdir=/%{_lib} -%make +%make -j1 cd ../widec ln -s ../configure . From svn at tinysofa.org Tue Jan 4 22:28:48 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 4 Jan 2005 17:28:48 -0500 (EST) Subject: [tinysofa-svn] r5587 - in contrib/1.1/mach/current: sources specs Message-ID: <20050104222848.CCDAF344105@minbar.tinysofa.org> Author: jh Date: 2005-01-04 17:28:37 -0500 (Tue, 04 Jan 2005) New Revision: 5587 Modified: contrib/1.1/mach/current/sources/tinysofa-1.1 contrib/1.1/mach/current/specs/mach.spec Log: - add tcp_wrappers to tinysofa-1.1 base installation Modified: contrib/1.1/mach/current/sources/tinysofa-1.1 =================================================================== --- contrib/1.1/mach/current/sources/tinysofa-1.1 2005-01-04 21:27:57 UTC (rev 5586) +++ contrib/1.1/mach/current/sources/tinysofa-1.1 2005-01-04 22:28:37 UTC (rev 5587) @@ -17,7 +17,8 @@ 'dir': 'tinysofa-1.1', 'minimal': 'bash glibc', 'base': 'coreutils findutils openssh-server openssh initscripts pam ' + - 'fcron openssl zlib dev glibc-locales glibc-i18n-en_US', + 'fcron openssl zlib dev glibc-locales glibc-i18n-en_US ', + + 'tcp_wrappers' 'build': 'dev rpm-devel rpm-build make gcc tar gzip patch ' + 'unzip bzip2 diffutils cpio elfutils', } Modified: contrib/1.1/mach/current/specs/mach.spec =================================================================== --- contrib/1.1/mach/current/specs/mach.spec 2005-01-04 21:27:57 UTC (rev 5586) +++ contrib/1.1/mach/current/specs/mach.spec 2005-01-04 22:28:37 UTC (rev 5587) @@ -2,7 +2,7 @@ Name: mach Version: 0.4.6 -Release: 10jh +Release: 11jh Summary: make a chroot buildsystem Group: contrib License: GPL @@ -115,6 +115,9 @@ %changelog +* Wed Dec 15 2004 Jaakko Heinonen 0.4.6-11jh +- add tcp_wrappers to tinysofa-1.1 base installation + * Fri Oct 15 2004 Jaakko Heinonen 0.4.6-10jh - update tinysofa patch not to remove +x from source files From svn at tinysofa.org Wed Jan 5 05:24:42 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 00:24:42 -0500 (EST) Subject: [tinysofa-svn] r5589 - tinysofa/releases/1.1/patch/current/specs Message-ID: <20050105052442.DB57E344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 00:24:35 -0500 (Wed, 05 Jan 2005) New Revision: 5589 Modified: tinysofa/releases/1.1/patch/current/specs/patch.spec Log: - don't apply the suffix patch Modified: tinysofa/releases/1.1/patch/current/specs/patch.spec =================================================================== --- tinysofa/releases/1.1/patch/current/specs/patch.spec 2005-01-05 05:23:13 UTC (rev 5588) +++ tinysofa/releases/1.1/patch/current/specs/patch.spec 2005-01-05 05:24:35 UTC (rev 5589) @@ -27,7 +27,7 @@ %prep %setup -q %patch1 -p1 -b .stderr -%patch2 -p1 -b .suffix +#%patch2 -p1 -b .suffix %patch3 -p1 -b .sigsegv %patch4 -p1 -b .ifdef %patch5 -p1 -b .program_name From svn at tinysofa.org Wed Jan 5 06:32:51 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 01:32:51 -0500 (EST) Subject: [tinysofa-svn] r5590 - tinysofa/releases/1.1/quota/current/specs Message-ID: <20050105063251.5C623344107@minbar.tinysofa.org> Author: jh Date: 2005-01-05 01:32:44 -0500 (Wed, 05 Jan 2005) New Revision: 5590 Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec Log: - fix stripping Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec =================================================================== --- tinysofa/releases/1.1/quota/current/specs/quota.spec 2005-01-05 05:24:35 UTC (rev 5589) +++ tinysofa/releases/1.1/quota/current/specs/quota.spec 2005-01-05 06:32:44 UTC (rev 5590) @@ -43,7 +43,10 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_mandir}/{man1,man2,man3,man8} -make install ROOTDIR=%{buildroot} +make install \ + ROOTDIR=%{buildroot} \ + DEF_BIN_MODE=755 \ + DEF_SBIN_MODE=755 install -m 644 warnquota.conf %{buildroot}%{_sysconfdir} %find_lang %{name} From svn at tinysofa.org Wed Jan 5 08:37:27 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 03:37:27 -0500 (EST) Subject: [tinysofa-svn] r5591 - in tinysofa/releases/1.1: cdrtools/current/specs db4/current/specs e2fsprogs/current/specs libtiff/current/specs pam/current/specs passwd/current/specs perl-dbi/current/specs ppp/current/specs procps/current/specs rdate/current/specs sysvinit/current/specs traceroute/current/specs yp-tools/current/specs ypbind-mt/current/specs Message-ID: <20050105083727.55E2E344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 03:36:24 -0500 (Wed, 05 Jan 2005) New Revision: 5591 Modified: tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec tinysofa/releases/1.1/db4/current/specs/db4.spec tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec tinysofa/releases/1.1/pam/current/specs/pam.spec tinysofa/releases/1.1/passwd/current/specs/passwd.spec tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec tinysofa/releases/1.1/ppp/current/specs/ppp.spec tinysofa/releases/1.1/procps/current/specs/procps.spec tinysofa/releases/1.1/rdate/current/specs/rdate.spec tinysofa/releases/1.1/sysvinit/current/specs/sysvinit.spec tinysofa/releases/1.1/traceroute/current/specs/traceroute.spec tinysofa/releases/1.1/yp-tools/current/specs/yp-tools.spec tinysofa/releases/1.1/ypbind-mt/current/specs/ypbind-mt.spec Log: - fix permissions/stripping problems Modified: tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec =================================================================== --- tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -169,7 +169,10 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/cdrecord.conf +# for stripping +chmod u+w -R %{buildroot} + %clean %clean_buildroot Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec =================================================================== --- tinysofa/releases/1.1/db4/current/specs/db4.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/db4/current/specs/db4.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -251,6 +251,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/{libdb.a,libdb_cxx.a} chmod +x $RPM_BUILD_ROOT/%{_libdir}/*.so* +chmod 755 $RPM_BUILD_ROOT/%{_bindir}/* # Move the main shared library to lib directory, but leave the unversioned .so # symlink in the usual place to link against. Modified: tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec =================================================================== --- tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -86,6 +86,8 @@ done popd +chmod 644 %{buildroot}%{_libdir}/*.a + %find_lang %{name} Modified: tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec =================================================================== --- tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -89,6 +89,7 @@ %install mkdir -p $RPM_BUILD_ROOT/{%{_bindir},%{_includedir},%{_mandir}} make install +chmod 644 %{buildroot}%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/libtiff.so* install -m755 libtiff/libtiff.so.%{LIBVER} $RPM_BUILD_ROOT%{_libdir} ln -sf libtiff.so.%{LIBVER} $RPM_BUILD_ROOT%{_libdir}/libtiff.so Modified: tinysofa/releases/1.1/pam/current/specs/pam.spec =================================================================== --- tinysofa/releases/1.1/pam/current/specs/pam.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/pam/current/specs/pam.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -258,7 +258,9 @@ /sbin/ldconfig -n %{buildroot}/%{_lib} +chmod -R u+w %{buildroot} + %clean %clean_buildroot Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec =================================================================== --- tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -29,22 +29,24 @@ %install -make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} -strip $RPM_BUILD_ROOT%{_bindir}/passwd -install -m 755 -d $RPM_BUILD_ROOT/etc/pam.d/ -install -m 644 passwd.pamd $RPM_BUILD_ROOT/etc/pam.d/passwd +make install DESTDIR=%{buildroot} bindir=%{_bindir} mandir=%{_mandir} +strip %{buildroot}%{_bindir}/passwd +install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d/ +install -m 644 passwd.pamd %{buildroot}%{_sysconfdir}/pam.d/passwd -rm -f $RPM_BUILD_ROOT/%{_bindir}/{chfn,chsh} -rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/{chfn,chsh}.* +chmod -R u+w %{buildroot} +rm -f %{buildroot}%{_bindir}/{chfn,chsh} +rm -f %{buildroot}%{_mandir}/man1/{chfn,chsh}.* + %clean %clean_buildroot %files %defattr(-,root,root) -%config /etc/pam.d/passwd +%config %{_sysconfdir}/pam.d/passwd %attr(4511,root,root) %{_bindir}/passwd %{_mandir}/man1/passwd.1* Modified: tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec =================================================================== --- tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -35,10 +35,12 @@ %install -%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} -install 755 -d $RPM_BUILD_ROOT/%{perl_sitearch}/auto/DBD +%makeinstall PREFIX=%{buildroot}%{_prefix} +install 755 -d %{buildroot}%{perl_sitearch}/auto/DBD +chmod -R u+w %{buildroot} + %clean %clean_buildroot Modified: tinysofa/releases/1.1/ppp/current/specs/ppp.spec =================================================================== --- tinysofa/releases/1.1/ppp/current/specs/ppp.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/ppp/current/specs/ppp.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -63,9 +63,10 @@ chmod go+r scripts/* chmod ugo-x scripts/autopppd -chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/pppd/%{version}/*.so -mkdir -p $RPM_BUILD_ROOT/etc/pam.d -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/ppp +chmod 0755 %{buildroot}%{_libdir}/pppd/%{version}/*.so \ + %{buildroot}%{_sbindir}/* +mkdir -p %{buildroot}/etc/pam.d +install -m 644 %{SOURCE1} %{buildroot}/etc/pam.d/ppp # Provide pointers for people who expect stuff in old places ln -s ../../var/log/ppp/connect-errors $RPM_BUILD_ROOT/etc/ppp/connect-errors Modified: tinysofa/releases/1.1/procps/current/specs/procps.spec =================================================================== --- tinysofa/releases/1.1/procps/current/specs/procps.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/procps/current/specs/procps.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -54,7 +54,9 @@ %install make ldconfig=true DESTDIR=%{buildroot} lib64=%{_lib} install="install -D" SKIP="/bin/kill /usr/share/man/man1/kill.1" install +chmod -R u+w %{buildroot} + %clean %clean_buildroot Modified: tinysofa/releases/1.1/rdate/current/specs/rdate.spec =================================================================== --- tinysofa/releases/1.1/rdate/current/specs/rdate.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/rdate/current/specs/rdate.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -26,7 +26,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} %makeinstall +chmod 755 %{buildroot}%{_bindir}/* + %clean %clean_buildroot Modified: tinysofa/releases/1.1/sysvinit/current/specs/sysvinit.spec =================================================================== --- tinysofa/releases/1.1/sysvinit/current/specs/sysvinit.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/sysvinit/current/specs/sysvinit.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -44,7 +44,9 @@ # If this already exists, just do nothing (the ||: part) mknod --mode=0600 $RPM_BUILD_ROOT/dev/initctl p ||: +chmod u+w %{buildroot}%{_bindir}/* + %post [ -e /var/run/initrunlvl ] && ln -s ../var/run/initrunlvl /etc/initrunlvl exit 0 Modified: tinysofa/releases/1.1/traceroute/current/specs/traceroute.spec =================================================================== --- tinysofa/releases/1.1/traceroute/current/specs/traceroute.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/traceroute/current/specs/traceroute.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -37,7 +37,9 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man8/ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8/ +chmod 755 %{buildroot}%{_sbindir}/* + %clean %clean_buildroot Modified: tinysofa/releases/1.1/yp-tools/current/specs/yp-tools.spec =================================================================== --- tinysofa/releases/1.1/yp-tools/current/specs/yp-tools.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/yp-tools/current/specs/yp-tools.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -45,6 +45,9 @@ %find_lang %{name} +chmod -R u+w %{buildroot} + + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT Modified: tinysofa/releases/1.1/ypbind-mt/current/specs/ypbind-mt.spec =================================================================== --- tinysofa/releases/1.1/ypbind-mt/current/specs/ypbind-mt.spec 2005-01-05 06:32:44 UTC (rev 5590) +++ tinysofa/releases/1.1/ypbind-mt/current/specs/ypbind-mt.spec 2005-01-05 08:36:24 UTC (rev 5591) @@ -42,8 +42,6 @@ #make install DESTDIR=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT/usr/share/man make install DESTDIR=$RPM_BUILD_ROOT -strip $RPM_BUILD_ROOT/sbin/ypbind - mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/ypbind install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/yp.conf @@ -51,6 +49,8 @@ %find_lang %{name} +chmod -R u+w %{buildroot} + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT From svn at tinysofa.org Wed Jan 5 09:21:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 04:21:31 -0500 (EST) Subject: [tinysofa-svn] r5592 - tinysofa/releases/1.1/sysstat/current/specs Message-ID: <20050105092131.1A326344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 04:21:23 -0500 (Wed, 05 Jan 2005) New Revision: 5592 Modified: tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec Log: - rationalize requirements Modified: tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec =================================================================== --- tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2005-01-05 08:36:24 UTC (rev 5591) +++ tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2005-01-05 09:21:23 UTC (rev 5592) @@ -16,11 +16,10 @@ Patch4: sysstat-5.0.5-overrun.patch Patch5: sysstat-5.0.5-lib64init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: kernel >= 2.2.16-21 /sbin/chkconfig -Prereq: coreutils grep %{_sysconfdir}/cron.daily +Prereq: /sbin/chkconfig %{_sysconfdir}/cron.daily +Requires: coreutils BuildRequires: perl %{_includedir}/linux/if.h BuildRequires: gettext -Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id %description This package provides the sar and iostat commands for Linux. Sar and From svn at tinysofa.org Wed Jan 5 09:23:12 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 04:23:12 -0500 (EST) Subject: [tinysofa-svn] r5593 - tinysofa/misc/comps/releases/1.1 Message-ID: <20050105092312.2A58F344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 04:23:05 -0500 (Wed, 05 Jan 2005) New Revision: 5593 Modified: tinysofa/misc/comps/releases/1.1/comps Log: - update for U3 Modified: tinysofa/misc/comps/releases/1.1/comps =================================================================== --- tinysofa/misc/comps/releases/1.1/comps 2005-01-05 09:21:23 UTC (rev 5592) +++ tinysofa/misc/comps/releases/1.1/comps 2005-01-05 09:23:05 UTC (rev 5593) @@ -34,6 +34,7 @@ libgcc glib glibc + glibc-common glibc-i18n-common glibc-i18n-en_US tzdata @@ -154,7 +155,7 @@ finger gdbm jwhois - links + elinks mailx mutt nc @@ -201,6 +202,7 @@ perl postfix-pcre procmail + make } 0 Web proxy server { @@ -238,7 +240,7 @@ gdbm ghostscript ghostscript-cups - kerberos5-libs + krb5-libs libcom_err libjpeg libpng @@ -318,7 +320,6 @@ man-pages coreutils-doc gawk-doc - gzip-doc vim-doc } @@ -340,6 +341,7 @@ glibc-devel glibc-headers libtool + libtool-libs linux-libc-headers m4 make From svn at tinysofa.org Wed Jan 5 13:09:13 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 08:09:13 -0500 (EST) Subject: [tinysofa-svn] r5594 - contrib/1.1/amavisd-new/current/sources Message-ID: <20050105130913.B6B68344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 08:09:06 -0500 (Wed, 05 Jan 2005) New Revision: 5594 Modified: contrib/1.1/amavisd-new/current/sources/amavisd.conf Log: - fix quotation Modified: contrib/1.1/amavisd-new/current/sources/amavisd.conf =================================================================== --- contrib/1.1/amavisd-new/current/sources/amavisd.conf 2005-01-05 09:23:05 UTC (rev 5593) +++ contrib/1.1/amavisd-new/current/sources/amavisd.conf 2005-01-05 13:09:06 UTC (rev 5594) @@ -536,7 +536,7 @@ # or a directory (no trailing slash) # (the default value is undef, meaning no quarantine) # -$QUARANTINEDIR = '$MYHOME/virusmails'; +$QUARANTINEDIR = "$MYHOME/virusmails"; #$virus_quarantine_method = 'local:virus-%i-%n'; # default #$spam_quarantine_method = 'local:spam-%b-%i-%n'; # default From svn at tinysofa.org Wed Jan 5 16:30:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 11:30:59 -0500 (EST) Subject: [tinysofa-svn] r5595 - in tinysofa/releases/1.1/rpm/current: sources specs Message-ID: <20050105163059.70296344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 11:23:00 -0500 (Wed, 05 Jan 2005) New Revision: 5595 Added: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.3-msglvl.patch Modified: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.3.tar.gz tinysofa/releases/1.1/rpm/current/specs/rpm.spec Log: - add msglvl patch to avoid debug messages in anaconda - update tarball Added: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.3-msglvl.patch =================================================================== --- tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.3-msglvl.patch 2005-01-05 13:09:06 UTC (rev 5594) +++ tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.3-msglvl.patch 2005-01-05 16:23:00 UTC (rev 5595) @@ -0,0 +1,13 @@ +--- rpm-4.3.3/lib/depends.c.msglvl 2005-01-05 18:03:11.692083860 +0200 ++++ rpm-4.3.3/lib/depends.c 2005-01-05 18:09:56.145032991 +0200 +@@ -833,8 +833,8 @@ + if (!badDepsInitialized) { + char * s = rpmExpand("%{?_dependency_whiteout}", NULL); + const char ** av = NULL; +- int anaconda = rpmtsFlags(ts) & RPMTRANS_FLAG_ANACONDA; +- int msglvl = (anaconda || (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS)) ++ //int anaconda = rpmtsFlags(ts) & RPMTRANS_FLAG_ANACONDA; ++ int msglvl = (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS) + ? RPMMESS_WARNING : RPMMESS_DEBUG; + int ac = 0; + int i; Modified: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.3.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2005-01-05 13:09:06 UTC (rev 5594) +++ tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2005-01-05 16:23:00 UTC (rev 5595) @@ -21,7 +21,7 @@ %define version 4.3.3 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 1ts +Release: 2jh Group: main Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Source1: GROUPS @@ -29,6 +29,7 @@ Patch1: rpm-4.3.2-noselinux.patch Patch2: rpm-4.3.2-canonarch.patch Patch3: rpm-4.3.2-aptctrlc.patch +Patch4: rpm-4.3.3-msglvl.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -134,7 +135,8 @@ %patch1 -p1 %endif %patch2 -p1 -%patch3 -p1 -b .aptctrlc +%patch3 -p1 -b .aptctrlc~ +%patch4 -p1 -b .msglvl~ cp -f %{SOURCE1} . @@ -433,6 +435,7 @@ %rpmattr %{__prefix}/lib/rpm/perldeps.pl %rpmattr %{__prefix}/lib/rpm/perl.prov %rpmattr %{__prefix}/lib/rpm/perl.req +%rpmattr %{__prefix}/lib/rpm/pythondeps.sh %rpmattr %{__prefix}/lib/rpm/rpm[bt] %rpmattr %{__prefix}/lib/rpm/rpmdeps @@ -515,6 +518,10 @@ %{__includedir}/popt.h %changelog +* Wed Jan 5 2005 Jaakko Heinonen 4.3.3-2jh +- add msglvl patch to avoid debug messages in anaconda +- update tarball + * Tue Jan 04 2005 tsintegrate 4.3.3-1ts - current (4.3.3-1jh) integrated as 4.3.3-1ts for release 1.1-U3 From svn at tinysofa.org Wed Jan 5 16:45:58 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 11:45:58 -0500 (EST) Subject: [tinysofa-svn] r5596 - in tinysofa/releases/1.1/grub/current: sources specs Message-ID: <20050105164558.E3E08344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 11:45:46 -0500 (Wed, 05 Jan 2005) New Revision: 5596 Added: tinysofa/releases/1.1/grub/current/sources/grub-0.95-md-rework.patch tinysofa/releases/1.1/grub/current/sources/grub-0.95-md.patch Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec Log: - add RAID1 patches Added: tinysofa/releases/1.1/grub/current/sources/grub-0.95-md-rework.patch =================================================================== --- tinysofa/releases/1.1/grub/current/sources/grub-0.95-md-rework.patch 2005-01-05 16:23:00 UTC (rev 5595) +++ tinysofa/releases/1.1/grub/current/sources/grub-0.95-md-rework.patch 2005-01-05 16:45:46 UTC (rev 5596) @@ -0,0 +1,183 @@ +--- grub-0.95/util/grub-install.in.md2 2005-01-03 14:49:18.133866107 -0500 ++++ grub-0.95/util/grub-install.in 2005-01-03 16:35:44.923732271 -0500 +@@ -35,6 +35,7 @@ + rootdir= + grub_prefix=/boot/grub + ++install_drives= + install_device= + no_floppy= + force_lba= +@@ -272,6 +273,30 @@ + done + } + ++ ++dump_boot_block () { ++ sync ++ $grub_shell --batch $no_floppy --device-map=$device_map <$log_file ++dump ${root_drive}${tmp} ${img_file} ++quit ++EOF ++} ++ ++ ++install_boot_block () { ++ # Before all invocations of the grub shell, call sync to make sure ++ # the raw device is in sync with any bufferring in filesystems. ++ sync ++ ++ # Now perform the installation. ++ $grub_shell --batch $no_floppy --device-map=$device_map <>$log_file ++root $1 ++setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $2 ++quit ++EOF ++} ++ ++ + # Check the arguments. + for option in "$@"; do + case "$option" in +@@ -416,28 +441,32 @@ + # Check for INSTALL_DEVICE. + case "$install_device" in + /dev/*) +- # If we are running md on a Linux box, just use the first physical device +- # at this point. + install_device=`resolve_symlink "$install_device"` +- install_device=`find_real_devs $install_device | awk '{print $1}'` +- +- install_drive=`convert "$install_device"` +- # I don't know why, but some shells wouldn't die if exit is +- # called in a function. +- if test "x$install_drive" = x; then ++ for install_drive in `find_real_devs $install_device` ; do ++ install_drive=`convert $install_drive` ++ if [ "x$install_drive" = "x" ]; then ++ exit 1 ++ fi ++ install_drives="${install_drives} ${install_drive}" ++ done ++ unset install_drive ++ ++ if test "x$install_drives" = x ; then + exit 1 + fi ;; + \([hf]d[0-9]*\)) +- install_drive="$install_device" ;; ++ install_drives="$install_device" ;; + [hf]d[0-9]*) + # The GRUB format with no parenthesis. +- install_drive="($install_device)" ;; ++ install_drives="($install_device)" ;; + *) + echo "Format of install_device not recognized." 1>&2 + usage + exit 1 ;; + esac + ++unset install_device ++ + # Get the root drive. + root_device=`find_device ${rootdir}` + bootdir_device=`find_device ${bootdir}` +@@ -465,41 +494,39 @@ + test -n "$mkimg" && img_file=`$mkimg` + test -n "$mklog" && log_file=`$mklog` + +-for real_device in `find_real_devs $root_device`; do +- # Convert the root deviceto a GRUB drive. +- root_drive=`convert "$real_device"` +- if [ "x$root_drive" = x ]; then +- exit 1 +- fi ++# There's not a real root device, so just pick the first ++if is_raid1_device $root_device ; then ++ root_device=`find_real_devs $root_device | awk '{print $1}'` ++fi + +- for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do +- count=5 +- tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"` +- while test $count -gt 0; do +- sync +- $grub_shell --batch $no_floppy --device-map=$device_map \ +- <$log_file +-dump ${root_drive}${tmp} ${img_file} +-quit +-EOF +- if grep "Error [0-9]*: " $log_file >/dev/null; then +- : +- elif cmp $file $img_file >/dev/null; then +- break +- fi +- sleep 1 +- count=`expr $count - 1` +- done +- if test $count -eq 0; then +- echo "The file $file not read correctly." 1>&2 +- exit 1 +- fi +- done ++# Convert the root deviceto a GRUB drive. ++root_drive=`convert "$root_device"` ++if [ "x$root_drive" = x ]; then ++ exit 1 ++fi + +- rm -f $img_file +- rm -f $log_file ++for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do ++ count=5 ++ tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"` ++ while test $count -gt 0; do ++ dump_boot_block $root_drive $img_file ++ if grep "Error [0-9]*: " $log_file >/dev/null; then ++ : ++ elif cmp $file $img_file >/dev/null; then ++ break ++ fi ++ sleep 1 ++ count=`expr $count - 1` ++ done ++ if test $count -eq 0; then ++ echo "The file $file not read correctly." 1>&2 ++ exit 1 ++ fi + done + ++rm -f $img_file ++rm -f $log_file ++ + if ! test -e ${grubdir}/grub.conf ; then + test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf + fi +@@ -507,24 +534,13 @@ + # Create a safe temporary file. + test -n "$mklog" && log_file=`$mklog` + +-for real_device in `find_real_devs $root_device`; do ++for install_drive in $install_drives; do + # Convert the root deviceto a GRUB drive. +- root_drive=`convert "$real_device"` ++ root_drive=`convert "$root_device"` + if [ "x$root_drive" = x ]; then + exit 1 + fi +- +- # Before all invocations of the grub shell, call sync to make sure +- # the raw device is in sync with any bufferring in filesystems. +- sync +- +- # Now perform the installation. +- $grub_shell --batch $no_floppy --device-map=$device_map <>$log_file +-root $root_drive +-setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $root_drive +-quit +-EOF +- ++ install_boot_block $root_drive $install_drive + done + + if grep "Error [0-9]*: " $log_file >/dev/null ; then Added: tinysofa/releases/1.1/grub/current/sources/grub-0.95-md.patch =================================================================== --- tinysofa/releases/1.1/grub/current/sources/grub-0.95-md.patch 2005-01-05 16:23:00 UTC (rev 5595) +++ tinysofa/releases/1.1/grub/current/sources/grub-0.95-md.patch 2005-01-05 16:45:46 UTC (rev 5596) @@ -0,0 +1,183 @@ +--- grub-0.95/util/grub-install.in.support_md 2004-12-17 17:50:45.000000000 -0500 ++++ grub-0.95/util/grub-install.in 2004-12-19 19:19:20.509409160 -0500 +@@ -207,6 +207,43 @@ + echo "$tmp_fname" + } + ++# Usage: is_raid1_device devicename ++# Returns 0 if devicename is a raid1 md device, 1 if it is not. ++is_raid1_device () { ++ case "$host_os" in ++ linux*) ++ level=`mdadm --query --detail $1 2>/dev/null | \ ++ awk '/Raid Level :/ {print $4}'` ++ if [ "$level" = "raid1" ]; then ++ return 0 ++ fi ++ ;; ++ esac ++ return 1 ++} ++ ++# Usage: find_real_devs device ++# Returns space separated list of devices for linux if device is ++# a raid1 device. In all other cases, the provided value is returned. ++find_real_devs () { ++ source_device=$1 ++ case "$host_os" in ++ linux*) ++ if is_raid1_device $source_device ; then ++ list="" ++ for device in `mdadm --query --detail "${source_device}" | \ ++ awk '/\/dev\/[^(md)]/ {print $7}'` ; do ++ list="$list $device" ++ done ++ echo $list ++ return 0 ++ fi ++ ;; ++ esac ++ echo $source_device ++ return 0 ++} ++ + # Usage: find_device file + # Find block device on which the file resides. + find_device () { +@@ -219,7 +256,7 @@ + exit 1 + fi + +- tmp_fname=`resolve_symlink $tmp_fname` ++ tmp_fname=`resolve_symlink $tmp_fname` + + echo "$tmp_fname" + } +@@ -379,7 +416,11 @@ + # Check for INSTALL_DEVICE. + case "$install_device" in + /dev/*) ++ # If we are running md on a Linux box, just use the first physical device ++ # at this point. + install_device=`resolve_symlink "$install_device"` ++ install_device=`find_real_devs $install_device | awk '{print $1}'` ++ + install_drive=`convert "$install_device"` + # I don't know why, but some shells wouldn't die if exit is + # called in a function. +@@ -408,14 +449,7 @@ + grub_prefix="/grub" + fi + +-# Convert the root device to a GRUB drive. +-root_drive=`convert "$root_device"` +-if test "x$root_drive" = x; then +- exit 1 +-fi +- +-# Check if the root directory exists in the same device as the grub +-# directory. ++# Check if the root directory exists in the same device as the grub directory. + grubdir_device=`find_device ${grubdir}` + + if test "x$grubdir_device" != "x$root_device"; then +@@ -431,30 +465,40 @@ + test -n "$mkimg" && img_file=`$mkimg` + test -n "$mklog" && log_file=`$mklog` + +-for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do +- count=5 +- tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"` +- while test $count -gt 0; do +- $grub_shell --batch $no_floppy --device-map=$device_map <$log_file ++for real_device in `find_real_devs $root_device`; do ++ # Convert the root deviceto a GRUB drive. ++ root_drive=`convert "$real_device"` ++ if [ "x$root_drive" = x ]; then ++ exit 1 ++ fi ++ ++ for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do ++ count=5 ++ tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"` ++ while test $count -gt 0; do ++ sync ++ $grub_shell --batch $no_floppy --device-map=$device_map \ ++ <$log_file + dump ${root_drive}${tmp} ${img_file} + quit + EOF +- if grep "Error [0-9]*: " $log_file >/dev/null; then +- : +- elif cmp $file $img_file >/dev/null; then +- break ++ if grep "Error [0-9]*: " $log_file >/dev/null; then ++ : ++ elif cmp $file $img_file >/dev/null; then ++ break ++ fi ++ sleep 1 ++ count=`expr $count - 1` ++ done ++ if test $count -eq 0; then ++ echo "The file $file not read correctly." 1>&2 ++ exit 1 + fi +- sleep 1 +- count=`expr $count - 1` + done +- if test $count -eq 0; then +- echo "The file $file not read correctly." 1>&2 +- exit 1 +- fi +-done + +-rm -f $img_file +-rm -f $log_file ++ rm -f $img_file ++ rm -f $log_file ++done + + if ! test -e ${grubdir}/grub.conf ; then + test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf +@@ -463,21 +507,33 @@ + # Create a safe temporary file. + test -n "$mklog" && log_file=`$mklog` + +-# Before all invocations of the grub shell, call sync to make sure +-# the raw device is in sync with any bufferring in filesystems. +-sync ++for real_device in `find_real_devs $root_device`; do ++ # Convert the root deviceto a GRUB drive. ++ root_drive=`convert "$real_device"` ++ if [ "x$root_drive" = x ]; then ++ exit 1 ++ fi ++ ++ # Before all invocations of the grub shell, call sync to make sure ++ # the raw device is in sync with any bufferring in filesystems. ++ sync + +-# Now perform the installation. +-$grub_shell --batch $no_floppy --device-map=$device_map <$log_file ++ # Now perform the installation. ++ $grub_shell --batch $no_floppy --device-map=$device_map <>$log_file + root $root_drive +-setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $install_drive ++setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $root_drive + quit + EOF + +-if grep "Error [0-9]*: " $log_file >/dev/null || test $debug = yes; then ++done ++ ++if grep "Error [0-9]*: " $log_file >/dev/null ; then + cat $log_file 1>&2 + exit 1 + fi ++if test $debug = yes; then ++ cat $log_file 1>&2 ++fi + + rm -f $log_file + Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec =================================================================== --- tinysofa/releases/1.1/grub/current/specs/grub.spec 2005-01-05 16:23:00 UTC (rev 5595) +++ tinysofa/releases/1.1/grub/current/specs/grub.spec 2005-01-05 16:45:46 UTC (rev 5596) @@ -1,6 +1,6 @@ Name: grub Version: 0.95 -Release: 2ts +Release: 3jh Summary: GRUB - the Grand Unified Boot Loader. Group: main License: GPL @@ -16,6 +16,8 @@ Patch20: grub-0.90-install.in.patch Patch21: grub-0.94-installcopyonly.patch Patch22: grub-0.94-addsyncs.patch +Patch23: grub-0.95-md.patch +Patch24: grub-0.95-md-rework.patch # patches 40-59 are for miscellaneous build related patches # link against curses statically @@ -80,6 +82,8 @@ %patch20 -p1 -b .install %patch21 -p1 -b .copyonly %patch22 -p1 -b .addsync +%patch23 -p1 -b .md +%patch24 -p1 -b .md-rework %patch40 -p1 -b .static @@ -140,6 +144,9 @@ %changelog +* Wed Jan 5 2005 Jaakko Heinonen 0.95-3jh +- add RAID1 patches + * Tue Jan 04 2005 tsintegrate 0.95-2ts - current (0.95-2jh) integrated as 0.95-2ts for release 1.1-U3 From svn at tinysofa.org Wed Jan 5 20:21:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 15:21:59 -0500 (EST) Subject: [tinysofa-svn] r5597 - tinysofa/releases/1.1/anaconda/current/specs Message-ID: <20050105202159.EC76D344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 15:21:53 -0500 (Wed, 05 Jan 2005) New Revision: 5597 Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - bump up the year Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2005-01-05 16:45:46 UTC (rev 5596) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2005-01-05 20:21:53 UTC (rev 5597) @@ -67,10 +67,10 @@ I_NAME="classic server" fi if [ -z "$I_COPY" ]; then - I_COPY="(C) 2004 tinysofa development team." + I_COPY="(C) 2004-2005 tinysofa development team." fi if [ -z "$I_URI" ]; then - I_URI="http://www.tinysofa.org" + I_URI="http://www.tinysofa.org/" fi if [ -z "$I_BUGSURI" ]; then I_BUGSURI="http://www.tinysofa.org/bugs/" From svn at tinysofa.org Wed Jan 5 20:49:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 15:49:28 -0500 (EST) Subject: [tinysofa-svn] r5598 - tinysofa/releases/1.1/libuser/current/specs Message-ID: <20050105204928.A12B4344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 15:49:21 -0500 (Wed, 05 Jan 2005) New Revision: 5598 Modified: tinysofa/releases/1.1/libuser/current/specs/libuser.spec Log: - split python module to it's own subpackage Modified: tinysofa/releases/1.1/libuser/current/specs/libuser.spec =================================================================== --- tinysofa/releases/1.1/libuser/current/specs/libuser.spec 2005-01-05 20:21:53 UTC (rev 5597) +++ tinysofa/releases/1.1/libuser/current/specs/libuser.spec 2005-01-05 20:49:21 UTC (rev 5598) @@ -1,6 +1,6 @@ Name: libuser Version: 0.51.7 -Release: 1ts +Release: 2jh Group: main License: LGPL Source: libuser-%{version}.tar.gz @@ -11,7 +11,6 @@ BuildPrereq: pam-devel, popt, autoconf, libtool, pkgconfig BuildPrereq: cyrus-sasl-devel, openldap-devel, glib-devel, openssl-devel BuildPrereq: gettext -%py_requires -d Summary: A user and group account administration library. %description @@ -22,6 +21,15 @@ Sample applications modeled after those included with the shadow password suite are included. +%package python +Group: extra +Summary: Python bindings for libuser library. +%py_requires -d +Requires: %{name} = %{version}-%{release} + +%description python +This package provides the libuser python module. + %package devel Group: development Summary: Files needed for developing applications which use libuser. @@ -82,16 +90,19 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS COPYING NEWS README TODO docs/*.txt python/modules.txt +%doc AUTHORS COPYING NEWS README TODO docs/*.txt %config(noreplace) %{_sysconfdir}/libuser.conf %attr(0755,root,root) %{_bindir}/* -%attr(0755,root,root) %{py_sitedir}/* %attr(0755,root,root) %{_libdir}/*.so.*.* %dir %attr(0755,root,root) %{_libdir}/%{name} %attr(0755,root,root) %{_libdir}/%{name}/*.so %attr(0755,root,root) %{_sbindir}/* +%files python +%doc python/modules.txt +%attr(0755,root,root) %{py_sitedir}/* + %files devel %defattr(-,root,root) %attr(0755,root,root) %dir %{_includedir}/libuser @@ -107,6 +118,9 @@ %changelog +* Wed Jan 5 2005 Jaakko Heinonen 0.51.7-2jh +- split python module to it's own subpackage + * Thu Aug 05 2004 tsintegrate 0.51.7-1ts - current (0.51.7-1jh) integrated as 0.51.7-1ts for release 1.1 From svn at tinysofa.org Wed Jan 5 21:25:01 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 16:25:01 -0500 (EST) Subject: [tinysofa-svn] r5599 - tinysofa/releases/1.1/gzip/current/specs Message-ID: <20050105212501.151E7344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 16:24:54 -0500 (Wed, 05 Jan 2005) New Revision: 5599 Modified: tinysofa/releases/1.1/gzip/current/specs/gzip.spec Log: - obsolete gzip-doc Modified: tinysofa/releases/1.1/gzip/current/specs/gzip.spec =================================================================== --- tinysofa/releases/1.1/gzip/current/specs/gzip.spec 2005-01-05 20:49:21 UTC (rev 5598) +++ tinysofa/releases/1.1/gzip/current/specs/gzip.spec 2005-01-05 21:24:54 UTC (rev 5599) @@ -14,6 +14,7 @@ Patch6: gzip-1.3.3-window-size.patch URL: http://www.gzip.org/ Requires: mktemp less +Obsoletes: gzip-doc Buildroot: %{_tmppath}/%{name}-%{version}-root %description From svn at tinysofa.org Wed Jan 5 21:45:13 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 16:45:13 -0500 (EST) Subject: [tinysofa-svn] r5600 - tinysofa/releases/1.1/krb5/current/specs Message-ID: <20050105214513.816B4344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 16:45:06 -0500 (Wed, 05 Jan 2005) New Revision: 5600 Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec Log: - bump release Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-05 21:24:54 UTC (rev 5599) +++ tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2005-01-05 21:45:06 UTC (rev 5600) @@ -1,7 +1,7 @@ Summary: Kerberos is a network authentication protocol. Name: krb5 Version: 1.3.6 -Release: 1ts +Release: 2jh Group: main Source0: krb5-%{version}.tar.gz Patch0: krb5-1.3.6-prof_err.patch From svn at tinysofa.org Wed Jan 5 21:56:29 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 5 Jan 2005 16:56:29 -0500 (EST) Subject: [tinysofa-svn] r5601 - tinysofa/releases/1.1/gdb/current/specs Message-ID: <20050105215629.6ADC0344105@minbar.tinysofa.org> Author: jh Date: 2005-01-05 16:56:22 -0500 (Wed, 05 Jan 2005) New Revision: 5601 Modified: tinysofa/releases/1.1/gdb/current/specs/gdb.spec Log: - fix gdbserver installation Modified: tinysofa/releases/1.1/gdb/current/specs/gdb.spec =================================================================== --- tinysofa/releases/1.1/gdb/current/specs/gdb.spec 2005-01-05 21:45:06 UTC (rev 5600) +++ tinysofa/releases/1.1/gdb/current/specs/gdb.spec 2005-01-05 21:56:22 UTC (rev 5601) @@ -34,7 +34,7 @@ %install -%makeinstall +%makeinstall_std %nuke_info rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib{bfd*,opcodes*,iberty*,mmalloc*} @@ -48,6 +48,7 @@ %files %defattr(-,root,root) %{_bindir}/gdb +%{_bindir}/gdbserver %{_bindir}/gdbtui %{_mandir}/man1/gdb*.1* %exclude /usr/share/locale From svn at tinysofa.org Fri Jan 7 08:17:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 7 Jan 2005 03:17:38 -0500 (EST) Subject: [tinysofa-svn] r5602 - in tinysofa/releases/1.1/libtiff/current: sources specs Message-ID: <20050107081738.EE7DD34410F@minbar.tinysofa.org> Author: jh Date: 2005-01-07 03:17:27 -0500 (Fri, 07 Jan 2005) New Revision: 5602 Added: tinysofa/releases/1.1/libtiff/current/sources/libtiff-3.5.7-dump.patch Modified: tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec Log: - fix an integer overflow in tiffdump Added: tinysofa/releases/1.1/libtiff/current/sources/libtiff-3.5.7-dump.patch =================================================================== --- tinysofa/releases/1.1/libtiff/current/sources/libtiff-3.5.7-dump.patch 2005-01-05 21:56:22 UTC (rev 5601) +++ tinysofa/releases/1.1/libtiff/current/sources/libtiff-3.5.7-dump.patch 2005-01-07 08:17:27 UTC (rev 5602) @@ -0,0 +1,11 @@ +--- tiff-3.7.1/tools/tiffdump.c.orig 2004-09-03 12:16:01 +0400 ++++ tiff-3.7.1/tools/tiffdump.c 2004-12-22 01:57:51 +0300 +@@ -307,7 +307,7 @@ ReadDirectory(int fd, unsigned ix, off_t + continue; + } + space = dp->tdir_count * datawidth[dp->tdir_type]; +- if (space <= 4) { ++ if (space >= 0 && space <= 4) { + switch (dp->tdir_type) { + case TIFF_FLOAT: + case TIFF_UNDEFINED: Modified: tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec =================================================================== --- tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2005-01-05 21:56:22 UTC (rev 5601) +++ tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2005-01-07 08:17:27 UTC (rev 5602) @@ -1,7 +1,7 @@ Summary: A library of functions for manipulating TIFF format image files. Name: libtiff Version: 3.6.1 -Release: 2ts +Release: 3jh License: distributable Group: extra Source0: http://www.libtiff.org/tiff-v%{version}.tar.gz @@ -17,6 +17,7 @@ Patch11: libtiff-3.6.1-alt-bound.patch Patch12: libtiff-3.6.1-alt-bound-fix2.patch Patch13: libtiff-3.5.5-nmemb.patch +Patch14: libtiff-3.5.7-dump.patch URL: http://www.libtiff.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -63,6 +64,7 @@ %patch11 -p1 %patch12 -p0 %patch13 -p1 +%patch14 -p1 %build @@ -122,6 +124,9 @@ %changelog +* Fri Jan 7 2005 Jaakko Heinonen 3.6.1-3jh +- fix an integer overflow in tiffdump + * Tue Jan 04 2005 tsintegrate 3.6.1-2ts - current (3.6.1-2jh) integrated as 3.6.1-2ts for release 1.1-U3 From svn at tinysofa.org Fri Jan 7 11:31:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 7 Jan 2005 06:31:47 -0500 (EST) Subject: [tinysofa-svn] r5603 - in tinysofa/releases/1.1/cyrus-imapd/current: sources specs Message-ID: <20050107113147.AC17634410F@minbar.tinysofa.org> Author: jh Date: 2005-01-07 06:31:35 -0500 (Fri, 07 Jan 2005) New Revision: 5603 Added: tinysofa/releases/1.1/cyrus-imapd/current/sources/imapcreate.pl Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - add imapcreate.pl script Added: tinysofa/releases/1.1/cyrus-imapd/current/sources/imapcreate.pl =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/sources/imapcreate.pl 2005-01-07 08:17:27 UTC (rev 5602) +++ tinysofa/releases/1.1/cyrus-imapd/current/sources/imapcreate.pl 2005-01-07 11:31:35 UTC (rev 5603) @@ -0,0 +1,159 @@ +#!/usr/bin/perl -w +# +# imapcreate: create IMAP mailboxes with quotas +# Reads user names from standard input. +# launch without argument for a short help. +# +# originally found on http://cyrus-utils.sourceforge.net +# (could not find any copyright info, thought) +# +# enhanced by Cl?ment "nodens" Hermann +# +# I'd like to consider this as GPL'd (cf www.gnu.org), but won't add any copyright without the original author's consent. +# + +use Getopt::Long; +use Cyrus::IMAP::Admin; +use strict; + + +my $debug; +my $user; +my $pass; +my $quota; +my @part; +my $useunixhierarchy; +my @mailboxes; +my $delete; +my $cyrus; + +sub usage { + print <]] + [-q quota] [-t partition:list] [-s] [-v] + +Options: + -t : the partition to use. Default to the \"default\" partition + -q ; the quota, if a quota is needed. It is normally in KiloBytes, but you can use m,M,g or G suffix to use MB or GB instead, e.g 10k, 2048M or 100g + -m : a comma-separated mailbox list + -u : your cyrus admin user (usually cyrus or cyradm) + -p : your cyrus admin password (if not provided, it will be asked for) + -s : use the unix hierarchy separator (see imapd.conf(1)) + -d : delete mailboxes instead of creating them + -v : run in debug mode, and print information on stdout + +If no password is submitted with -p, we'll prompt for one. +if no mailbox name is specified with -m, read user names from standard input + + examples: + imapcreate -u cyradm -m foo,bar,joe -q 50000 -t p1:p2 mail.testing.umanitoba.ca + cat list.txt | imapcreate -u cyradm -p 'cyruspass' -q 50M mail.testing.umanitoba.ca +EOU + exit 1; +} + +# Create a mailbox... usage : &CreateMailBox(user,partition[,quota]). +# You have to be authentified already. We use "$cyrus" as the connection name. +# partition can be 'default' +sub CreateMailBox { + my $mbuser = $_[0]; + my $mbpart = $_[1]; + my $mbquota = $_[2]; + + print "Creating $mbuser on $mbpart\n" if $debug; + if ($mbpart eq 'default') { + $cyrus->createmailbox($mbuser); + } + else { + $cyrus->createmailbox($mbuser, $mbpart); + } + warn $cyrus->error if $cyrus->error; + + # Set the quota + if ($mbquota) { + print "Setting quota for $mbuser to $mbquota\n" if $debug; + $cyrus->setquota($mbuser, 'STORAGE', $mbquota); + warn $cyrus->error if $cyrus->error; + } +} + +# Delete a mailbox. Usage: $DeleteMailBox($user) +# Assuming we use $user as the admin. +sub DeleteMailBox { + my $mbuser = $_[0]; + my $delacl = "c"; + + print "Deleting $mbuser\n" if $debug; + $cyrus->setaclmailbox($mbuser, $user, $delacl); + $cyrus->deletemailbox($mbuser); + warn $cyrus->error if $cyrus->error; +} + +GetOptions("d|delete" => \$delete, "u|user=s" => \$user, "p|pass=s" => \$pass, "m|mailboxes=s" => \@mailboxes, "q|quota=s" => \$quota, + "t|part=s" => \@part, "s|UnixHierarchy" => \$useunixhierarchy, "v|verbose" => \$debug ); + at part = split(/:/, join(':', @part)); +push @part, 'default' unless @part; +my $pn = 0; + at mailboxes = split(/,/, join(',', @mailboxes)); + +my $server = shift(@ARGV) if (@ARGV); +usage unless $server; + +# quotas formatting: +if ($quota) { + if ($quota =~ /^(\d+)([mk]?)$/i) { + my $numb = $1; + my $letter = $2; + if ($letter =~ /^m$/i) { + $quota = $numb * 1024; + print "debug: quota=$quota\n" if $debug; + } elsif ($letter =~ /^k$/i) { + $quota = $numb; + print "debug: quota=$quota\n" if $debug; + } else { + die "malformed quota: $quota (must be at least one digit eventually followed by m, M, k or K\n"; +# $quota = $numb; +# print "debug: quota=$quota\n" if $debug; + } + } else { + die "malformed quota: $quota (must be at least one digit eventually followed by m, M, k or K\n"; + } +} + +# Authenticate +$cyrus = Cyrus::IMAP::Admin->new($server); +$cyrus->authenticate(-mechanism => 'login', -user => $user, + -password => $pass); +die $cyrus->error if $cyrus->error; + +# if there isn't any mailbox defined yet, get them from standard input +if (! (defined $mailboxes[0])) { + # For all users + while (<>) { + chomp; + my $mbox = $_; + push @mailboxes, $mbox; + } +} + +# create/delete mailboxes for each user +foreach my $mailbox (@mailboxes) { + if ($useunixhierarchy) { + $mailbox = 'user/' . $mailbox; + } else { + $mailbox = 'user.' . $mailbox; + } + + if ($delete) { + &DeleteMailBox($mailbox) + } else { + # Select the partition + my $pt = $part[$pn]; + $pn += 1; + $pn = 0 unless $pn < @part; + &CreateMailBox($mailbox,$pt,$quota) + } +} + Property changes on: tinysofa/releases/1.1/cyrus-imapd/current/sources/imapcreate.pl ___________________________________________________________________ Name: svn:executable + * Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-07 08:17:27 UTC (rev 5602) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-07 11:31:35 UTC (rev 5603) @@ -14,6 +14,7 @@ Source11: cyrus-imapd.cron Source13: cyrus-imapd-master.conf Source14: cyrus-imapd-rc +Source15: imapcreate.pl Patch1: cyrus-imapd-2.0.5-pollute.patch Patch2: cyrus-imapd-2.2.9-imap_err.patch @@ -129,7 +130,9 @@ # Install the /etc/cyrus.conf file that controls master process install -m 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/%{name}/cyrus.conf # Install rc script -install -m 755 %{SOURCE14} %{buildroot}/%{_initrddir}/cyrus +install -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/cyrus +# Install imapcreate.pl +install -m 755 %{SOURCE15} %{buildroot}%{_libdir}/%{name}/bin # fix libdir perl -pi -e 's|/usr/lib|%{_libdir}|g' \ %{buildroot}%{_initrddir}/cyrus \ From svn at tinysofa.org Fri Jan 7 11:54:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 7 Jan 2005 06:54:38 -0500 (EST) Subject: [tinysofa-svn] r5604 - tinysofa/releases/1.1/courier-imap/current/specs Message-ID: <20050107115438.1661D34410F@minbar.tinysofa.org> Author: jh Date: 2005-01-07 06:54:31 -0500 (Fri, 07 Jan 2005) New Revision: 5604 Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec Log: - rationalize subpackage requirements - compile with pie Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec =================================================================== --- tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2005-01-07 11:31:35 UTC (rev 5603) +++ tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2005-01-07 11:54:31 UTC (rev 5604) @@ -19,7 +19,7 @@ Source13: courier-imap-authpgsqlrc Patch0: courier-imap-mksslcert.patch URL: http://www.courier-mta.org -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %service_requires Requires: coreutils, sed Requires: db4, openssl, imapd-pam @@ -43,7 +43,7 @@ %package ldap Summary: Courier-IMAP LDAP authentication driver. Group: extra -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: openldap-libs %description ldap @@ -54,7 +54,7 @@ %package mysql Summary: Courier-IMAP MySQL authentication driver. Group: extra -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: mysql-libs %description mysql @@ -65,7 +65,7 @@ %package pgsql Summary: Courier-IMAP PostgreSQL authentication driver. Group: extra -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: postgresql-libs %description pgsql @@ -79,10 +79,11 @@ %patch0 -p1 %build -CFLAGS="`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g'` -fexceptions" \ +CFLAGS="`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g'` -fexceptions -fpie" \ 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" \ + LDFLAGS="-pie" \ ./configure --prefix=%{_prefix} \ --mandir=%{_mandir} \ --localstatedir=%{_localstatedir} \ @@ -95,8 +96,9 @@ --datadir=%{_datadir}/%{name} \ --with-piddir=/var/run -make +%make + %install mkdir -p $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} @@ -216,20 +218,17 @@ %{_mandir}/man7/* %{_mandir}/man8/* - %files ldap %defattr(-,root,root) %{_prefix}/%{_lib}/%{name}/authlib/authdaemond.ldap %config(noreplace) /etc/openldap/schema/courier.schema %config(noreplace) %{_sysconfdir}/%{name}/authldaprc - %files mysql %defattr(-,root,root) %{_prefix}/%{_lib}/%{name}/authlib/authdaemond.mysql %config(noreplace) %{_sysconfdir}/%{name}/authmysqlrc - %files pgsql %defattr(-,root,root) %{_prefix}/%{_lib}/%{name}/authlib/authdaemond.pgsql @@ -237,6 +236,10 @@ %changelog +* Fri Jan 7 2005 Jaakko Heinonen +- rationalize subpackage requirements +- compile with pie + * Sat Sep 04 2004 tsintegrate 3.0.7-1ts - current (3.0.7-1gd) integrated as 3.0.7-1ts for release 1.1-U1 From svn at tinysofa.org Fri Jan 7 20:29:12 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 7 Jan 2005 15:29:12 -0500 (EST) Subject: [tinysofa-svn] r5606 - tinysofa/releases/1.1/cyrus-imapd/current/specs Message-ID: <20050107202912.E080734410F@minbar.tinysofa.org> Author: jh Date: 2005-01-07 15:29:06 -0500 (Fri, 07 Jan 2005) New Revision: 5606 Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - add make clean Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-07 17:44:21 UTC (rev 5605) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-07 20:29:06 UTC (rev 5606) @@ -98,6 +98,7 @@ --with-cyrus-prefix=%{_libdir}/%{name} \ --sysconfdir=%{_sysconfdir}/%{name} +make clean %make -j1 gcc $RPM_OPT_FLAGS -o deliver-wrapper $RPM_SOURCE_DIR/cyrus-deliver-wrapper.c From svn at tinysofa.org Sat Jan 8 18:12:07 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 8 Jan 2005 13:12:07 -0500 (EST) Subject: [tinysofa-svn] r5607 - tinysofa/releases/1.1/cyrus-imapd/current/specs Message-ID: <20050108181207.1254A344122@minbar.tinysofa.org> Author: jh Date: 2005-01-08 13:12:00 -0500 (Sat, 08 Jan 2005) New Revision: 5607 Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - create symlink for imapcreate - remove some useless files from bindir Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-07 20:29:06 UTC (rev 5606) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-08 18:12:00 UTC (rev 5607) @@ -142,7 +142,8 @@ # Install rc script install -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/cyrus # Install imapcreate.pl -install -m 755 %{SOURCE15} %{buildroot}%{_libdir}/%{name}/bin +install -m 755 %{SOURCE15} %{buildroot}%{_libdir}/%{name}/bin/imapcreate.pl +ln -s ../%{_lib}/imapcreate.pl %{buildroot}/usr/bin/imapcreate # fix libdir perl -pi -e 's|/usr/lib|%{_libdir}|g' \ %{buildroot}%{_initrddir}/cyrus \ @@ -165,6 +166,7 @@ for tool in tools/* ; do test -f ${tool} && install -m755 ${tool} %{buildroot}%{_bindir} done +rm -f %{buildroot}%{_bindir}/{config2header,config2man} # We need to rename the internal man pages of cyrus to avoid conflicts with # other programs. From svn at tinysofa.org Sat Jan 8 18:18:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 8 Jan 2005 13:18:55 -0500 (EST) Subject: [tinysofa-svn] r5608 - tinysofa/releases/1.1/cyrus-imapd/current/specs Message-ID: <20050108181855.4CE43344122@minbar.tinysofa.org> Author: jh Date: 2005-01-08 13:18:48 -0500 (Sat, 08 Jan 2005) New Revision: 5608 Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - install only useful tools Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-08 18:12:00 UTC (rev 5607) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-08 18:18:48 UTC (rev 5608) @@ -163,10 +163,12 @@ mkdir "$ENV{IMAP_DIR}/sieve/$_",0755; }' # Install the tools -for tool in tools/* ; do - test -f ${tool} && install -m755 ${tool} %{buildroot}%{_bindir} +cd tools +for tool in arbitronsort.pl dohash masssievec mkimap mknewsgroups rehash \ + translatesieve undohash upgradesieve ;do + install -m755 ${tool} %{buildroot}%{_bindir} done -rm -f %{buildroot}%{_bindir}/{config2header,config2man} +cd - # We need to rename the internal man pages of cyrus to avoid conflicts with # other programs. From svn at tinysofa.org Sat Jan 8 18:24:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 8 Jan 2005 13:24:08 -0500 (EST) Subject: [tinysofa-svn] r5609 - tinysofa/releases/1.1/cyrus-imapd/current/specs Message-ID: <20050108182408.C4C8E344122@minbar.tinysofa.org> Author: jh Date: 2005-01-08 13:24:02 -0500 (Sat, 08 Jan 2005) New Revision: 5609 Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - fix imapcreate link Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-08 18:18:48 UTC (rev 5608) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-08 18:24:02 UTC (rev 5609) @@ -143,7 +143,7 @@ install -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/cyrus # Install imapcreate.pl install -m 755 %{SOURCE15} %{buildroot}%{_libdir}/%{name}/bin/imapcreate.pl -ln -s ../%{_lib}/imapcreate.pl %{buildroot}/usr/bin/imapcreate +ln -s ../%{_lib}/%{name}/imapcreate.pl %{buildroot}/usr/bin/imapcreate # fix libdir perl -pi -e 's|/usr/lib|%{_libdir}|g' \ %{buildroot}%{_initrddir}/cyrus \ From svn at tinysofa.org Sat Jan 8 18:27:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 8 Jan 2005 13:27:40 -0500 (EST) Subject: [tinysofa-svn] r5610 - tinysofa/releases/1.1/cyrus-imapd/current/specs Message-ID: <20050108182740.2E7BB344122@minbar.tinysofa.org> Author: jh Date: 2005-01-08 13:27:33 -0500 (Sat, 08 Jan 2005) New Revision: 5610 Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - 3rd attempt to get the link right Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-08 18:24:02 UTC (rev 5609) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-01-08 18:27:33 UTC (rev 5610) @@ -143,7 +143,7 @@ install -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/cyrus # Install imapcreate.pl install -m 755 %{SOURCE15} %{buildroot}%{_libdir}/%{name}/bin/imapcreate.pl -ln -s ../%{_lib}/%{name}/imapcreate.pl %{buildroot}/usr/bin/imapcreate +ln -s ../%{_lib}/%{name}/bin/imapcreate.pl %{buildroot}/usr/bin/imapcreate # fix libdir perl -pi -e 's|/usr/lib|%{_libdir}|g' \ %{buildroot}%{_initrddir}/cyrus \ From svn at tinysofa.org Sun Jan 9 08:50:56 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 03:50:56 -0500 (EST) Subject: [tinysofa-svn] r5611 - tinysofa/tags Message-ID: <20050109085056.58EAE344122@minbar.tinysofa.org> Author: jh Date: 2005-01-09 03:50:45 -0500 (Sun, 09 Jan 2005) New Revision: 5611 Added: tinysofa/tags/1.1_U3/ Log: - tag U3 Copied: tinysofa/tags/1.1_U3 (from rev 5610, tinysofa/releases/1.1) From svn at tinysofa.org Sun Jan 9 09:03:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 04:03:08 -0500 (EST) Subject: [tinysofa-svn] r5612 - tinysofa/releases Message-ID: <20050109090308.56956344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 04:02:58 -0500 (Sun, 09 Jan 2005) New Revision: 5612 Added: tinysofa/releases/1.2/ Removed: tinysofa/releases/1.1/ Log: - move to 1.2 Copied: tinysofa/releases/1.2 (from rev 5611, tinysofa/releases/1.1) From svn at tinysofa.org Sun Jan 9 09:13:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 04:13:18 -0500 (EST) Subject: [tinysofa-svn] r5613 - tinysofa/releases Message-ID: <20050109091318.E1698344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 04:13:11 -0500 (Sun, 09 Jan 2005) New Revision: 5613 Added: tinysofa/releases/1.1/ Log: - create 1.1 release From svn at tinysofa.org Sun Jan 9 11:40:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 06:40:59 -0500 (EST) Subject: [tinysofa-svn] r5616 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050109114059.2BA65344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 06:40:44 -0500 (Sun, 09 Jan 2005) New Revision: 5616 Added: tinysofa/releases/1.1/swup/ Removed: tinysofa/releases/1.2/swup/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/swup (from rev 5615, tinysofa/releases/1.2/swup) From svn at tinysofa.org Sun Jan 9 11:40:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 06:40:11 -0500 (EST) Subject: [tinysofa-svn] r5615 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050109114011.E8920344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 06:39:57 -0500 (Sun, 09 Jan 2005) New Revision: 5615 Added: tinysofa/releases/1.1/libsmbpw/ Removed: tinysofa/releases/1.2/libsmbpw/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/libsmbpw (from rev 5614, tinysofa/releases/1.2/libsmbpw) From svn at tinysofa.org Sun Jan 9 11:39:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 06:39:28 -0500 (EST) Subject: [tinysofa-svn] r5614 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050109113928.DCB3B344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 06:39:14 -0500 (Sun, 09 Jan 2005) New Revision: 5614 Added: tinysofa/releases/1.1/ostat/ Removed: tinysofa/releases/1.2/ostat/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/ostat (from rev 5613, tinysofa/releases/1.2/ostat) From svn at tinysofa.org Sun Jan 9 11:41:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 06:41:39 -0500 (EST) Subject: [tinysofa-svn] r5617 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050109114139.440C8344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 06:41:25 -0500 (Sun, 09 Jan 2005) New Revision: 5617 Added: tinysofa/releases/1.1/swupconf/ Removed: tinysofa/releases/1.2/swupconf/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/swupconf (from rev 5616, tinysofa/releases/1.2/swupconf) From svn at tinysofa.org Sun Jan 9 11:44:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 06:44:00 -0500 (EST) Subject: [tinysofa-svn] r5619 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050109114400.66349344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 06:43:46 -0500 (Sun, 09 Jan 2005) New Revision: 5619 Added: tinysofa/releases/1.1/tar/ Removed: tinysofa/releases/1.2/tar/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/tar (from rev 5618, tinysofa/releases/1.2/tar) From svn at tinysofa.org Sun Jan 9 11:45:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 06:45:55 -0500 (EST) Subject: [tinysofa-svn] r5620 - tinysofa/releases/1.2 Message-ID: <20050109114555.5A8CA344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 06:45:40 -0500 (Sun, 09 Jan 2005) New Revision: 5620 Added: tinysofa/releases/1.2/tar/ Log: - get bsdtar from contrib Copied: tinysofa/releases/1.2/tar (from rev 5619, contrib/1.1/bsdtar) From svn at tinysofa.org Sun Jan 9 11:42:26 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 06:42:26 -0500 (EST) Subject: [tinysofa-svn] r5618 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050109114226.564E3344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 06:42:12 -0500 (Sun, 09 Jan 2005) New Revision: 5618 Added: tinysofa/releases/1.1/anaconda/ Removed: tinysofa/releases/1.2/anaconda/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/anaconda (from rev 5617, tinysofa/releases/1.2/anaconda) From svn at tinysofa.org Sun Jan 9 11:49:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 06:49:06 -0500 (EST) Subject: [tinysofa-svn] r5622 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050109114906.C98A6344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 06:48:52 -0500 (Sun, 09 Jan 2005) New Revision: 5622 Added: tinysofa/releases/1.1/parted/ Removed: tinysofa/releases/1.2/parted/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/parted (from rev 5621, tinysofa/releases/1.2/parted) From svn at tinysofa.org Sun Jan 9 11:46:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 06:46:37 -0500 (EST) Subject: [tinysofa-svn] r5621 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050109114637.91A3F344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 06:46:23 -0500 (Sun, 09 Jan 2005) New Revision: 5621 Added: tinysofa/releases/1.1/mysql/ Removed: tinysofa/releases/1.2/mysql/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/mysql (from rev 5620, tinysofa/releases/1.2/mysql) From svn at tinysofa.org Sun Jan 9 12:03:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 07:03:14 -0500 (EST) Subject: [tinysofa-svn] r5623 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050109120314.C40C4344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 07:02:39 -0500 (Sun, 09 Jan 2005) New Revision: 5623 Added: tinysofa/releases/1.1/gcc/ Removed: tinysofa/releases/1.2/gcc/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/gcc (from rev 5622, tinysofa/releases/1.2/gcc) From svn at tinysofa.org Sun Jan 9 19:07:20 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 14:07:20 -0500 (EST) Subject: [tinysofa-svn] r5624 - tinysofa/releases/1.1 Message-ID: <20050109190720.E3A95344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 14:06:42 -0500 (Sun, 09 Jan 2005) New Revision: 5624 Added: tinysofa/releases/1.1/release/ Log: - copy release to 1.1 Copied: tinysofa/releases/1.1/release (from rev 5623, tinysofa/releases/1.2/release) From svn at tinysofa.org Sun Jan 9 19:54:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 14:54:09 -0500 (EST) Subject: [tinysofa-svn] r5626 - tinysofa/releases/1.2/release/current/specs Message-ID: <20050109195409.1FCCB344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 14:54:02 -0500 (Sun, 09 Jan 2005) New Revision: 5626 Modified: tinysofa/releases/1.2/release/current/specs/release.spec Log: - prepare for 1.2 Modified: tinysofa/releases/1.2/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.2/release/current/specs/release.spec 2005-01-09 19:03:23 UTC (rev 5625) +++ tinysofa/releases/1.2/release/current/specs/release.spec 2005-01-09 19:54:02 UTC (rev 5626) @@ -1,11 +1,11 @@ -%define release_name Rio update 3 +%define release_name development %define vendor tinysofa %define product classic server Summary: tinysofa release file Name: release -Version: 1.1 -Release: 3ts +Version: 1.90 +Release: 0jh Epoch: 2 License: GPL Group: main @@ -16,27 +16,32 @@ %description A package just to identify the release of the distribution. + %prep # satisfy rpm + %install -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir} echo "%{vendor} %{product} release %{version} (%{release_name})" \ - > $RPM_BUILD_ROOT/%{_sysconfdir}/release -cat <<__EOF__ > $RPM_BUILD_ROOT/%{_sysconfdir}/issue + > %{buildroot}%{_sysconfdir}/release + +cat <<__EOF__ > %{buildroot}%{_sysconfdir}/issue %{vendor} %{product} release %{version} (%{release_name}) Kernel \r on an \m __EOF__ -pushd $RPM_BUILD_ROOT/%{_sysconfdir} +pushd %{buildroot}%{_sysconfdir} ln -s release tinysofa-release ln issue issue.net popd + %clean %clean_buildroot + %files %defattr(-,root,root) %attr(0644,root,root) %{_sysconfdir}/release @@ -44,7 +49,11 @@ %attr(0644,root,root) %{_sysconfdir}/issue.net %{_sysconfdir}/tinysofa-release + %changelog +* Sun Jan 9 2005 Jaakko Heinonen +- prepare for 1.2 + * Tue Jan 04 2005 tsintegrate 1.1-3ts - current (1.1-3jh) integrated as 1.1-3ts for release 1.1-U3 From svn at tinysofa.org Sun Jan 9 20:11:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 9 Jan 2005 15:11:17 -0500 (EST) Subject: [tinysofa-svn] r5627 - in tinysofa/releases/1.2/tar/current: sources specs Message-ID: <20050109201117.726D9344130@minbar.tinysofa.org> Author: jh Date: 2005-01-09 15:10:53 -0500 (Sun, 09 Jan 2005) New Revision: 5627 Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz tinysofa/releases/1.2/tar/current/sources/libarchive-1.01.022.tar.gz tinysofa/releases/1.2/tar/current/specs/tar.spec Removed: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.020.tar.gz tinysofa/releases/1.2/tar/current/sources/libarchive-1.01.020.tar.gz tinysofa/releases/1.2/tar/current/specs/bsdtar.spec Log: - new upstream - change package name to tar - provide bsdtar - add epoch to replace GNU tar Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.020.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.01.020.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.01.022.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/tar/current/sources/libarchive-1.01.022.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.2/tar/current/specs/bsdtar.spec =================================================================== --- tinysofa/releases/1.2/tar/current/specs/bsdtar.spec 2005-01-09 19:54:02 UTC (rev 5626) +++ tinysofa/releases/1.2/tar/current/specs/bsdtar.spec 2005-01-09 20:10:53 UTC (rev 5627) @@ -1,55 +0,0 @@ -Summary: A FreeBSD file archiving program -Name: bsdtar -Version: 1.01.020 -Release: 1jh -License: BSD -Group: main -Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz -Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz -BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-root - - -%description -The tar program saves many files together in one archive and can -restore individual files (or all of the files) from that archive. Tar -can also be used to add supplemental files to an archive and to update -or list files in the archive. Bsdtar supports natively gzip and bzip2 -compressions, POSIX-standard formats, including ustar, pax interchange -format and the POSIX cpio format. It can also store ACLs using a standard -method for incorporating vendor-specific extensions for POSIX pax format. - - -%prep -%setup -q -a 1 - - -%build -pushd libarchive-%{version} -%configure --prefix=$PWD -%make -popd - -export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{version}" -export LDFLAGS="$LDFLAGS -Llibarchive-%{version}" -%configure -%make - - -%install -%makeinstall - - -%clean -%clean_buildroot - - -%files -%defattr(-,root,root) -%{_bindir}/bsdtar -%{_mandir}/man1/bsdtar.1* - - -%changelog -* Thu Nov 25 2004 Jaakko Heinonen 1.01.020-1jh -- intial spec file Copied: tinysofa/releases/1.2/tar/current/specs/tar.spec (from rev 5626, tinysofa/releases/1.2/tar/current/specs/bsdtar.spec) =================================================================== --- tinysofa/releases/1.2/tar/current/specs/bsdtar.spec 2005-01-09 19:54:02 UTC (rev 5626) +++ tinysofa/releases/1.2/tar/current/specs/tar.spec 2005-01-09 20:10:53 UTC (rev 5627) @@ -0,0 +1,62 @@ +Summary: A BSD file archiving program +Name: tar +Epoch: 1 +Version: 1.01.022 +Release: 1jh +License: BSD +Group: main +Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz +Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz +BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel +Provides: bsdtar = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The tar program saves many files together in one archive and can +restore individual files (or all of the files) from that archive. Tar +can also be used to add supplemental files to an archive and to update +or list files in the archive. Bsdtar supports natively gzip and bzip2 +compressions, POSIX-standard formats, including ustar, pax interchange +format and the POSIX cpio format. It can also store ACLs using a standard +method for incorporating vendor-specific extensions for POSIX pax format. + + +%prep +%setup -q -n bsdtar-%{version} -a 1 + + +%build +pushd libarchive-%{version} +%configure --prefix=$PWD +%make +popd + +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{version}" +export LDFLAGS="$LDFLAGS -Llibarchive-%{version}" +%configure +%make + + +%install +%makeinstall + + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root) +%{_bindir}/bsdtar +%{_mandir}/man1/bsdtar.1* + + +%changelog +* Sun Jan 9 2005 Jaakko Heinonen 1.01.022 +- new upstream +- change package name to tar +- provide bsdtar +- add epoch to replace GNU tar + +* Thu Nov 25 2004 Jaakko Heinonen 1.01.020-1jh +- intial spec file From svn at tinysofa.org Mon Jan 10 09:10:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 04:10:40 -0500 (EST) Subject: [tinysofa-svn] r5628 - in tinysofa/releases/1.2/dovecot/current: sources specs Message-ID: <20050110091040.4405E344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 04:09:35 -0500 (Mon, 10 Jan 2005) New Revision: 5628 Added: tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.13.tar.gz Removed: tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.12.1.tar.gz Modified: tinysofa/releases/1.2/dovecot/current/sources/dovecot-conf.patch tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec Log: - 0.99.13 Deleted: tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.12.1.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.13.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.13.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/dovecot/current/sources/dovecot-conf.patch =================================================================== --- tinysofa/releases/1.2/dovecot/current/sources/dovecot-conf.patch 2005-01-09 20:10:53 UTC (rev 5627) +++ tinysofa/releases/1.2/dovecot/current/sources/dovecot-conf.patch 2005-01-10 09:09:35 UTC (rev 5628) @@ -1,5 +1,5 @@ ---- dovecot-0.99.10.7/dovecot-example.conf.config 2004-07-13 13:56:55.000000000 +0300 -+++ dovecot-0.99.10.7/dovecot-example.conf 2004-07-14 19:26:26.000000000 +0300 +--- dovecot-0.99.13/dovecot-example.conf.config 2004-12-29 20:00:24.000000000 +0200 ++++ dovecot-0.99.13/dovecot-example.conf 2005-01-10 11:03:49.304612815 +0200 @@ -4,7 +4,7 @@ # any of the lines. Exception to this are paths, they're just examples # with real defaults being based on configure options. The paths listed here @@ -20,7 +20,7 @@ # SSL parameter file. Master process generates this file for login processes. # It contains Diffie Hellman and RSA parameters. -@@ -68,7 +68,7 @@ +@@ -70,7 +70,7 @@ # which login needs to be able to connect to. The sockets are created when # running as root, so you don't have to worry about permissions. Note that # everything in this directory is deleted when Dovecot is started. @@ -29,7 +29,7 @@ # chroot login process to the login_dir. Only reason not to do this is if you # wish to run the whole Dovecot without roots. -@@ -192,7 +192,7 @@ +@@ -197,7 +197,7 @@ # default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u # default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n # @@ -38,7 +38,7 @@ # Space-separated list of fields to cache for all mails. Currently these # fields are allowed followed by a list of commands they speed up: -@@ -303,7 +303,7 @@ +@@ -308,7 +308,7 @@ # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl # and flock. Some operating systems don't allow using both of them # simultaneously, eg. BSDs. If dotlock is used, it's always created first. @@ -47,21 +47,11 @@ # Should we create dotlock file even when we want only a read-lock? Setting # this to yes hurts the performance when the mailbox is accessed simultaneously -@@ -397,6 +397,7 @@ +@@ -428,6 +428,7 @@ # ldap : LDAP, see doc/dovecot-ldap.conf # pgsql : a PostgreSQL database, see doc/dovecot-pgsql.conf auth_userdb = passwd +# auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf - # Where password database is kept: - # passwd: /etc/passwd or similiar, using getpwnam() -@@ -406,7 +407,8 @@ - # vpopmail: vpopmail authentication - # ldap : LDAP, see doc/dovecot-ldap.conf - # pgsql : a PostgreSQL database, see doc/dovecot-pgsql.conf --auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf -+# auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf -+auth_passdb = pam - - #auth_executable = /usr/libexec/dovecot/dovecot-auth - + # Password database specifies only the passwords for users. + # http://wiki.dovecot.org/Authentication Modified: tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec =================================================================== --- tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec 2005-01-09 20:10:53 UTC (rev 5627) +++ tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec 2005-01-10 09:09:35 UTC (rev 5628) @@ -1,9 +1,9 @@ Summary: Dovecot Secure imap server Name: dovecot -Version: 0.99.12.1 +Version: 0.99.13 Release: 1ts License: GPL -Group: extra +Group: main Source: %{name}-%{version}.tar.gz Source1: dovecot.init Source2: dovecot.pam @@ -30,7 +30,7 @@ %prep -%setup -q -n %{name}-0.99.12 +%setup -q -n %{name}-%{version} %patch100 -p1 -b .config @@ -127,6 +127,9 @@ %changelog +* Mon Jan 10 2005 Jaakko Heinonen 0.99.13-1jh +- 0.99.13 + * Tue Jan 04 2005 tsintegrate 0.99.12.1-1ts - current (0.99.12.1-1jh) integrated as 0.99.12.1-1ts for release 1.1-U3 From svn at tinysofa.org Mon Jan 10 10:10:29 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 05:10:29 -0500 (EST) Subject: [tinysofa-svn] r5629 - tinysofa/releases/1.1 Message-ID: <20050110101029.757B4344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 05:09:56 -0500 (Mon, 10 Jan 2005) New Revision: 5629 Added: tinysofa/releases/1.1/python/ Log: - copy to 1.1 Copied: tinysofa/releases/1.1/python (from rev 5628, tinysofa/releases/1.2/python) From svn at tinysofa.org Mon Jan 10 11:50:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 06:50:03 -0500 (EST) Subject: [tinysofa-svn] r5630 - in tinysofa/releases/1.2/cups/current: sources specs Message-ID: <20050110115003.D8234344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 06:45:58 -0500 (Mon, 10 Jan 2005) New Revision: 5630 Added: tinysofa/releases/1.2/cups/current/sources/cups-1.1.23-source.tar.bz2 Removed: tinysofa/releases/1.2/cups/current/sources/cups-1.1.22-source.tar.bz2 tinysofa/releases/1.2/cups/current/sources/cups-idefense.patch tinysofa/releases/1.2/cups/current/sources/cups-str1023.patch tinysofa/releases/1.2/cups/current/sources/cups-str1024.patch Modified: tinysofa/releases/1.2/cups/current/specs/cups.spec Log: - 1.1.23 with STR866 Deleted: tinysofa/releases/1.2/cups/current/sources/cups-1.1.22-source.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/cups/current/sources/cups-1.1.23-source.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/cups/current/sources/cups-1.1.23-source.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.2/cups/current/sources/cups-idefense.patch =================================================================== --- tinysofa/releases/1.2/cups/current/sources/cups-idefense.patch 2005-01-10 10:09:56 UTC (rev 5629) +++ tinysofa/releases/1.2/cups/current/sources/cups-idefense.patch 2005-01-10 11:45:58 UTC (rev 5630) @@ -1,39 +0,0 @@ ---- cups-1.1.22rc1/pdftops/Gfx.cxx 2004-04-09 21:18:31.000000000 +0100 -+++ ../devel/cups-1.1.23rc1/pdftops/Gfx.cxx 2004-12-16 18:46:14.000000000 +0000 -@@ -2655,7 +2655,9 @@ - haveMask = gFalse; - dict->lookup("Mask", &maskObj); - if (maskObj.isArray()) { -- for (i = 0; i < maskObj.arrayGetLength(); ++i) { -+ for (i = 0; -+ i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; -+ ++i) { - maskObj.arrayGet(i, &obj1); - maskColors[i] = obj1.getInt(); - obj1.free(); ---- cups-1.1.22rc1/pdftops/GfxState.cxx 2004-12-21 17:08:22.758022237 +0000 -+++ ../devel/cups-1.1.23rc1/pdftops/GfxState.cxx 2004-12-21 17:00:15.000000000 +0000 -@@ -709,6 +709,11 @@ - } - nCompsA = obj2.getInt(); - obj2.free(); -+ if (nCompsA > gfxColorMaxComps) { -+ error(-1, "ICCBased color space with too many (%d > %d) components", -+ nCompsA, gfxColorMaxComps); -+ nCompsA = gfxColorMaxComps; -+ } - if (dict->lookup("Alternate", &obj2)->isNull() || - !(altA = GfxColorSpace::parse(&obj2))) { - switch (nCompsA) { -@@ -1049,6 +1054,11 @@ - goto err2; - } - nCompsA = obj1.arrayGetLength(); -+ if (nCompsA > gfxColorMaxComps) { -+ error(-1, "DeviceN color space with too many (%d > %d) components", -+ nCompsA, gfxColorMaxComps); -+ nCompsA = gfxColorMaxComps; -+ } - for (i = 0; i < nCompsA; ++i) { - if (!obj1.arrayGet(i, &obj2)->isName()) { - error(-1, "Bad DeviceN color space (names)"); Deleted: tinysofa/releases/1.2/cups/current/sources/cups-str1023.patch =================================================================== --- tinysofa/releases/1.2/cups/current/sources/cups-str1023.patch 2005-01-10 10:09:56 UTC (rev 5629) +++ tinysofa/releases/1.2/cups/current/sources/cups-str1023.patch 2005-01-10 11:45:58 UTC (rev 5630) @@ -1,236 +0,0 @@ ---- cups-1.1.22/systemv/lppasswd.c.str1023 2004-02-25 20:14:54.000000000 +0000 -+++ cups-1.1.22/systemv/lppasswd.c 2004-12-17 10:00:27.549475422 +0000 -@@ -44,6 +44,11 @@ - #include - #include - -+#ifndef WIN32 -+# include -+# include -+#endif /* !WIN32 */ -+ - - /* - * Operations... -@@ -90,7 +95,27 @@ - *oldpass; /* old password */ - int flag; /* Password check flags... */ - int fd; /* Password file descriptor */ -+ int error; /* Write error */ -+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) -+ struct sigaction action; /* Signal action */ -+#endif /* HAVE_SIGACTION && !HAVE_SIGSET*/ -+ -+ -+ /* -+ * Check to see if stdin, stdout, and stderr are still open... -+ */ -+ -+ if (fcntl(0, F_GETFD, &i) || -+ fcntl(1, F_GETFD, &i) || -+ fcntl(2, F_GETFD, &i)) -+ { -+ /* -+ * No, return exit status 2 and don't try to send any output since -+ * someone is trying to bypass the security on the server. -+ */ - -+ return (2); -+ } - - /* - * Find the server directory... -@@ -253,6 +278,40 @@ - } - - /* -+ * Ignore SIGHUP, SIGINT, SIGTERM, and SIGXFSZ (if defined) for the -+ * remainder of the time so that we won't end up with bogus password -+ * files... -+ */ -+ -+#ifndef WIN32 -+# if defined(HAVE_SIGSET) -+ sigset(SIGHUP, SIG_IGN); -+ sigset(SIGINT, SIG_IGN); -+ sigset(SIGTERM, SIG_IGN); -+# ifdef SIGXFSZ -+ sigset(SIGXFSZ, SIG_IGN); -+# endif /* SIGXFSZ */ -+# elif defined(HAVE_SIGACTION) -+ memset(&action, 0, sizeof(action)); -+ action.sa_handler = SIG_IGN; -+ -+ sigaction(SIGHUP, &action, NULL); -+ sigaction(SIGINT, &action, NULL); -+ sigaction(SIGTERM, &action, NULL); -+# ifdef SIGXFSZ -+ sigaction(SIGXFSZ, &action, NULL); -+# endif /* SIGXFSZ */ -+# else -+ signal(SIGHUP, SIG_IGN); -+ signal(SIGINT, SIG_IGN); -+ signal(SIGTERM, SIG_IGN); -+# ifdef SIGXFSZ -+ signal(SIGXFSZ, SIG_IGN); -+# endif /* SIGXFSZ */ -+# endif -+#endif /* !WIN32 */ -+ -+ /* - * Open the output file. - */ - -@@ -275,6 +334,8 @@ - return (1); - } - -+ setbuf(outfile, NULL); -+ - /* - * Open the existing password file and create a new one... - */ -@@ -282,7 +343,7 @@ - infile = fopen(passwdmd5, "r"); - if (infile == NULL && errno != ENOENT && op != ADD) - { -- fputs("lppasswd: No password file to change or delete from!\n", stderr); -+ perror("lppasswd: Unable to open password file"); - - fclose(outfile); - -@@ -297,6 +358,11 @@ - * username:group:MD5-sum - */ - -+ error = 0; -+ userline[0] = '\0'; -+ groupline[0] = '\0'; -+ md5line[0] = '\0'; -+ - if (infile) - { - while (fgets(line, sizeof(line), infile) != NULL) -@@ -308,60 +374,87 @@ - strcmp(groupname, groupline) == 0) - break; - -- fputs(line, outfile); -+ if (fputs(line, outfile) == EOF) -+ { -+ perror("lppasswd: Unable to write to password file"); -+ error = 1; -+ break; -+ } - } - -- while (fgets(line, sizeof(line), infile) != NULL) -- fputs(line, outfile); -- } -- else -- { -- userline[0] = '\0'; -- groupline[0] = '\0'; -- md5line[0] = '\0'; -+ if (!error) -+ { -+ while (fgets(line, sizeof(line), infile) != NULL) -+ if (fputs(line, outfile) == EOF) -+ { -+ perror("lppasswd: Unable to write to password file"); -+ error = 1; -+ break; -+ } -+ } - } - - if (op == CHANGE && -- (strcmp(username, userline) != 0 || -- strcmp(groupname, groupline) != 0)) -+ (strcmp(username, userline) || strcmp(groupname, groupline))) -+ { - fprintf(stderr, "lppasswd: user \"%s\" and group \"%s\" do not exist.\n", - username, groupname); -+ error = 1; -+ } - else if (op != DELETE) - { - if (oldpass && - strcmp(httpMD5(username, "CUPS", oldpass, md5new), md5line) != 0) - { - fputs("lppasswd: Sorry, password doesn't match!\n", stderr); -- -- if (infile) -- fclose(infile); -- -- fclose(outfile); -- -- unlink(passwdnew); -- -- return (1); -+ error = 1; -+ } -+ else -+ { -+ snprintf(line, sizeof(line), "%s:%s:%s\n", username, groupname, -+ httpMD5(username, "CUPS", newpass, md5new)); -+ if (fputs(line, outfile) == EOF) -+ { -+ perror("lppasswd: Unable to write to password file"); -+ error = 1; -+ } - } -- -- fprintf(outfile, "%s:%s:%s\n", username, groupname, -- httpMD5(username, "CUPS", newpass, md5new)); - } - - /* -- * Close the files and remove the old password file... -+ * Close the files... - */ - - if (infile) - fclose(infile); - -- fclose(outfile); -+ if (fclose(outfile) == EOF) -+ error = 1; -+ -+ /* -+ * Error out gracefully as needed... -+ */ -+ -+ if (error) -+ { -+ fputs("lppasswd: Password file not updated!\n", stderr); -+ -+ unlink(passwdnew); -+ -+ return (1); -+ } - - /* - * Save old passwd file - */ - - unlink(passwdold); -- link(passwdmd5, passwdold); -+ if (link(passwdmd5, passwdold)) -+ { -+ perror("lppasswd: failed to backup old password file"); -+ unlink(passwdnew); -+ return (1); -+ } - - /* - * Install new password file -@@ -369,7 +462,7 @@ - - if (rename(passwdnew, passwdmd5) < 0) - { -- perror("lppasswd: failed to rename passwd file"); -+ perror("lppasswd: failed to rename password file"); - unlink(passwdnew); - return (1); - } Deleted: tinysofa/releases/1.2/cups/current/sources/cups-str1024.patch =================================================================== --- tinysofa/releases/1.2/cups/current/sources/cups-str1024.patch 2005-01-10 10:09:56 UTC (rev 5629) +++ tinysofa/releases/1.2/cups/current/sources/cups-str1024.patch 2005-01-10 11:45:58 UTC (rev 5630) @@ -1,45 +0,0 @@ ---- cups-1.1.22/filter/hpgl-input.c.str1024 2004-02-25 20:14:52.000000000 +0000 -+++ cups-1.1.22/filter/hpgl-input.c 2004-12-17 10:01:10.219284636 +0000 -@@ -54,7 +54,8 @@ - ch, /* Current char */ - done, /* Non-zero when the current command is read */ - i; /* Looping var */ -- char buf[262144]; /* String buffer */ -+ char buf[262144], /* String buffer */ -+ *bufptr; /* Pointer into buffer */ - static param_t p[MAX_PARAMS]; /* Parameter buffer */ - - -@@ -128,9 +129,12 @@ - - if (strcasecmp(name, "LB") == 0) - { -- for (i = 0; (ch = getc(fp)) != StringTerminator; i ++) -- buf[i] = ch; -- buf[i] = '\0'; -+ bufptr = buf; -+ while ((ch = getc(fp)) != StringTerminator) -+ if (bufptr < (buf + sizeof(buf) - 1)) -+ *bufptr++ = ch; -+ *bufptr = '\0'; -+ - p[num_params].type = PARAM_STRING; - p[num_params].value.string = strdup(buf); - num_params ++; -@@ -155,11 +159,12 @@ - } - else if (strcasecmp(name, "PE") == 0) - { -- for (i = 0; i < (sizeof(buf) - 1); i ++) -- if ((buf[i] = getc(fp)) == ';') -- break; -+ bufptr = buf; -+ while ((ch = getc(fp)) != ';') -+ if (bufptr < (buf + sizeof(buf) - 1)) -+ *bufptr++ = ch; -+ *bufptr = '\0'; - -- buf[i] = '\0'; - p[num_params].type = PARAM_STRING; - p[num_params].value.string = strdup(buf); - num_params ++; Modified: tinysofa/releases/1.2/cups/current/specs/cups.spec =================================================================== --- tinysofa/releases/1.2/cups/current/specs/cups.spec 2005-01-10 10:09:56 UTC (rev 5629) +++ tinysofa/releases/1.2/cups/current/specs/cups.spec 2005-01-10 11:45:58 UTC (rev 5630) @@ -1,7 +1,7 @@ Summary: Common Unix Printing System Name: cups -Version: 1.1.22 -Release: 2ts +Version: 1.1.23 +Release: 1gd License: GPL Group: main Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2 @@ -17,9 +17,6 @@ Patch6: cups-1.1.17-pdftops.patch Patch9: cups-1.1.19-ppdsdat.patch Patch10: cups-pie.patch -Patch11: cups-str1023.patch -Patch12: cups-str1024.patch -Patch13: cups-idefense.patch Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root %service_requires @@ -73,10 +70,6 @@ %patch9 -p1 -b .ppdsdat %patch10 -p1 -b .pie -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 - perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in autoconf @@ -219,8 +212,8 @@ %changelog -* Tue Jan 04 2005 tsintegrate 1.1.22-2ts -- current (1.1.22-2jh) integrated as 1.1.22-2ts for release 1.1-U3 +* Mon Jan 10 2005 Gerald Dachs 1.1.23-1gd +- 1.1.23 with 'STR866 fix introduces DoS' fix * Wed Dec 29 2004 Jaakko Heinonen 1.1.22-2jh - iDefense security fix for CAN-2004-1125 From svn at tinysofa.org Mon Jan 10 11:52:25 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 06:52:25 -0500 (EST) Subject: [tinysofa-svn] r5631 - in tinysofa/releases/1.2/initscripts/current: sources specs Message-ID: <20050110115225.59FD4344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 06:52:03 -0500 (Mon, 10 Jan 2005) New Revision: 5631 Added: tinysofa/releases/1.2/initscripts/current/sources/initscripts-7.31.9-usbfs.patch Modified: tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec Log: - change usbdevfs -> usbfs (gda) Added: tinysofa/releases/1.2/initscripts/current/sources/initscripts-7.31.9-usbfs.patch =================================================================== --- tinysofa/releases/1.2/initscripts/current/sources/initscripts-7.31.9-usbfs.patch 2005-01-10 11:45:58 UTC (rev 5630) +++ tinysofa/releases/1.2/initscripts/current/sources/initscripts-7.31.9-usbfs.patch 2005-01-10 11:52:03 UTC (rev 5631) @@ -0,0 +1,20 @@ +--- initscripts-7.31.9/rc.d/rc.sysinit.orig 2005-01-10 09:48:36.320251448 +0100 ++++ initscripts-7.31.9/rc.d/rc.sysinit 2005-01-10 09:48:59.111786608 +0100 +@@ -186,7 +186,7 @@ + fi + + if [ $usb = 1 -a ! -f /proc/bus/usb/devices ]; then +- action $"Mounting USB filesystem: " mount -t usbdevfs usbdevfs /proc/bus/usb ++ action $"Mounting USB filesystem: " mount -t usbfs usbfs /proc/bus/usb + fi + + needusbstorage= +@@ -360,7 +360,7 @@ + # Enter root, /proc and (potentially) /proc/bus/usb and devfs into mtab. + mount -f / + mount -f /proc +-[ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb ++[ -f /proc/bus/usb/devices ] && mount -f -t usbfs usbfs /proc/bus/usb + [ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev + + Modified: tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-01-10 11:45:58 UTC (rev 5630) +++ tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-01-10 11:52:03 UTC (rev 5631) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: main -Release: 9ts +Release: 10jh Source: initscripts-%{version}.tar.bz2 URL: http://rhlinux.redhat.com/initscripts/ Patch0: initscripts-s390.patch @@ -13,6 +13,7 @@ Patch4: initscripts-7.31.9-tinysofa-kernel-2.6.patch Patch5: initscripts-7.31.9-alsa.patch Patch6: initscripts-7.31.9-dovecot.patch +Patch7: initscripts-7.31.9-usbfs.patch BuildRoot: %{_tmppath}/%{name}-root Requires: agetty, gawk, sed, mktemp, e2fsprogs >= 1.15 Requires: procps, sysklogd >= 1.3.31 @@ -46,6 +47,7 @@ %patch4 -p1 -b .kernel-2.6~ %patch5 -p1 -b .alsa~ %patch6 -p1 -b .dovecot~ +%patch7 -p1 -b .usbfs~ find . -name '*~'|xargs rm -f @@ -210,6 +212,9 @@ %changelog +* Mon Jan 10 2005 Jaakko Heinonen 7.31.9-10jh +- change usbdevfs -> usbfs (gda) + * Tue Jan 04 2005 tsintegrate 7.31.9-9ts - current (7.31.9-9jh) integrated as 7.31.9-9ts for release 1.1-U3 From svn at tinysofa.org Mon Jan 10 14:13:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 09:13:44 -0500 (EST) Subject: [tinysofa-svn] r5632 - in tinysofa/releases/1.2/tzdata/current: sources specs Message-ID: <20050110141344.58A92344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 09:13:28 -0500 (Mon, 10 Jan 2005) New Revision: 5632 Added: tinysofa/releases/1.2/tzdata/current/sources/tzdata2005a.tar.gz Removed: tinysofa/releases/1.2/tzdata/current/sources/tzdata2003d.tar.gz Modified: tinysofa/releases/1.2/tzdata/current/specs/tzdata.spec Log: - 2005a Deleted: tinysofa/releases/1.2/tzdata/current/sources/tzdata2003d.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/tzdata/current/sources/tzdata2005a.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/tzdata/current/sources/tzdata2005a.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/tzdata/current/specs/tzdata.spec =================================================================== --- tinysofa/releases/1.2/tzdata/current/specs/tzdata.spec 2005-01-10 11:52:03 UTC (rev 5631) +++ tinysofa/releases/1.2/tzdata/current/specs/tzdata.spec 2005-01-10 14:13:28 UTC (rev 5632) @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2003d -Release: 1ts -Copyright: GPL +Version: 2005a +Release: 1jh +License: GPL Group: main Source0: %{name}.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz @@ -15,11 +15,13 @@ This package contains data files with rules for various timezones around the world. + %prep %setup -n tzdata mkdir %{name}%{version} tar xzf %{SOURCE1} -C %{name}%{version} + %build sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ @@ -27,20 +29,27 @@ Makeconfig.in > Makeconfig %make + %install make install echo ====================TESTING========================= make check echo ====================TESTING END===================== + %clean %clean_buildroot + %files %defattr(-,root,root) %{_datadir}/zoneinfo + %changelog +* Mon Jan 10 2005 Jaakko Heinonen 2005a-1jh +- 2005a + * Thu Aug 05 2004 tsintegrate 2003d-1ts - current (2003d-1jh) integrated as 2003d-1ts for release 1.1 From svn at tinysofa.org Mon Jan 10 14:26:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 09:26:37 -0500 (EST) Subject: [tinysofa-svn] r5633 - tinysofa/releases/1.2/tar/current/specs Message-ID: <20050110142637.A816F344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 09:26:30 -0500 (Mon, 10 Jan 2005) New Revision: 5633 Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec Log: - create tar symlinks Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec =================================================================== --- tinysofa/releases/1.2/tar/current/specs/tar.spec 2005-01-10 14:13:28 UTC (rev 5632) +++ tinysofa/releases/1.2/tar/current/specs/tar.spec 2005-01-10 14:26:30 UTC (rev 5633) @@ -40,7 +40,10 @@ %install %makeinstall +ln -sf bsdtar %{buildroot}%{_bindir}/tar +ln -sf bsdtar.1 %{buildroot}%{_mandir}/man1/tar.1 + %clean %clean_buildroot @@ -48,7 +51,9 @@ %files %defattr(-,root,root) %{_bindir}/bsdtar +%{_bindir}/tar %{_mandir}/man1/bsdtar.1* +%{_mandir}/man1/tar.1* %changelog @@ -57,6 +62,7 @@ - change package name to tar - provide bsdtar - add epoch to replace GNU tar +- create tar symlinks * Thu Nov 25 2004 Jaakko Heinonen 1.01.020-1jh - intial spec file From svn at tinysofa.org Mon Jan 10 18:39:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 13:39:03 -0500 (EST) Subject: [tinysofa-svn] r5634 - tinysofa/releases/1.1 Message-ID: <20050110183903.D76AE344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 13:38:53 -0500 (Mon, 10 Jan 2005) New Revision: 5634 Added: tinysofa/releases/1.1/glibc/ Log: - copy glibc to 1.1 Copied: tinysofa/releases/1.1/glibc (from rev 5633, tinysofa/releases/1.2/glibc) From svn at tinysofa.org Mon Jan 10 19:59:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 14:59:18 -0500 (EST) Subject: [tinysofa-svn] r5636 - in tinysofa/releases/1.2/python/current: sources specs Message-ID: <20050110195918.83A8E344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 14:59:07 -0500 (Mon, 10 Jan 2005) New Revision: 5636 Added: tinysofa/releases/1.2/python/current/sources/python-2.4-gdbm.patch Modified: tinysofa/releases/1.2/python/current/specs/python.spec Log: - fix dbm module Added: tinysofa/releases/1.2/python/current/sources/python-2.4-gdbm.patch =================================================================== --- tinysofa/releases/1.2/python/current/sources/python-2.4-gdbm.patch 2005-01-10 19:02:19 UTC (rev 5635) +++ tinysofa/releases/1.2/python/current/sources/python-2.4-gdbm.patch 2005-01-10 19:59:07 UTC (rev 5636) @@ -0,0 +1,17 @@ +--- Python-2.4/setup.py.gdbm 2005-01-10 21:48:51.585372218 +0200 ++++ Python-2.4/setup.py 2005-01-10 21:50:01.730008709 +0200 +@@ -606,12 +606,12 @@ + if self.compiler.find_library_file(lib_dirs, 'ndbm'): + ndbm_libs = ['ndbm'] + else: +- ndbm_libs = [] ++ ndbm_libs = ['gdbm', 'gdbm_compat'] + exts.append( Extension('dbm', ['dbmmodule.c'], + define_macros=[('HAVE_NDBM_H',None)], + libraries = ndbm_libs ) ) + elif (self.compiler.find_library_file(lib_dirs, 'gdbm') +- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None): ++ and find_file("ndbm.h", inc_dirs, []) is not None): + exts.append( Extension('dbm', ['dbmmodule.c'], + define_macros=[('HAVE_GDBM_NDBM_H',None)], + libraries = ['gdbm'] ) ) Modified: tinysofa/releases/1.2/python/current/specs/python.spec =================================================================== --- tinysofa/releases/1.2/python/current/specs/python.spec 2005-01-10 19:02:19 UTC (rev 5635) +++ tinysofa/releases/1.2/python/current/specs/python.spec 2005-01-10 19:59:07 UTC (rev 5636) @@ -34,6 +34,7 @@ Patch13: python-2.4-tinysofa-distutils.patch Patch14: python-2.3.4-pydocnodoc.patch Patch16: python-2.4-db43.patch +Patch17: python-2.4-gdbm.patch Obsoletes: Distutils Provides: Distutils @@ -140,6 +141,7 @@ %patch13 -p1 -b .bdist-rpm %patch14 -p1 -b .no-doc %patch16 -p1 -b .db43 +%patch17 -p1 -b .gdbm # This shouldn't be necesarry, but is right now (2.2a3) find -name "*~" |xargs rm -f @@ -333,6 +335,7 @@ %changelog * Mon Jan 10 2005 Jaakko Heinonen 2.4-1jh - 2.4 +- fix dbm module * Fri Aug 20 2004 tsintegrate 2.3.4-3ts - current (2.3.4-3jh) integrated as 2.3.4-3ts for release 1.1 From svn at tinysofa.org Mon Jan 10 21:07:05 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 16:07:05 -0500 (EST) Subject: [tinysofa-svn] r5637 - tinysofa/releases/1.1 Message-ID: <20050110210705.4D155344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 16:06:54 -0500 (Mon, 10 Jan 2005) New Revision: 5637 Added: tinysofa/releases/1.1/bash/ Log: - copy to 1.1 Copied: tinysofa/releases/1.1/bash (from rev 5636, tinysofa/releases/1.2/bash) From svn at tinysofa.org Mon Jan 10 21:33:19 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 16:33:19 -0500 (EST) Subject: [tinysofa-svn] r5639 - tinysofa/releases/1.2 Message-ID: <20050110213319.42BF8344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 16:33:03 -0500 (Mon, 10 Jan 2005) New Revision: 5639 Added: tinysofa/releases/1.2/ucarp/ Log: - get ucarp from contrib Copied: tinysofa/releases/1.2/ucarp (from rev 5638, contrib/1.1/ucarp) From svn at tinysofa.org Mon Jan 10 21:48:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 16:48:37 -0500 (EST) Subject: [tinysofa-svn] r5640 - tinysofa/releases/1.2/ucarp/current/specs Message-ID: <20050110214837.58F9C344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 16:48:02 -0500 (Mon, 10 Jan 2005) New Revision: 5640 Modified: tinysofa/releases/1.2/ucarp/current/specs/ucarp.spec Log: - change group Modified: tinysofa/releases/1.2/ucarp/current/specs/ucarp.spec =================================================================== --- tinysofa/releases/1.2/ucarp/current/specs/ucarp.spec 2005-01-10 21:33:03 UTC (rev 5639) +++ tinysofa/releases/1.2/ucarp/current/specs/ucarp.spec 2005-01-10 21:48:02 UTC (rev 5640) @@ -3,7 +3,7 @@ Version: 1.1 Release: 1jh License: BSD -Group: contrib +Group: main URL: http://www.ucarp.org/ Source: http://www.pureftpd.org/ucarp/ucarp-%{version}.tar.bz2 Source1: carp.init @@ -12,7 +12,6 @@ %service_requires BuildRequires: libpcap, gettext - %description UCARP allows a couple of hosts to share common virtual IP addresses in order to provide automatic failover. It is a portable userland implementation of the @@ -87,6 +86,9 @@ %changelog +* Mon Jan 10 2005 Jaakko Heinonen 1.1-1jh +- include to tinysofa + * Fri Jul 9 2004 Matthias Saou 1.0-1 - Initial RPM release. From svn at tinysofa.org Mon Jan 10 22:26:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 17:26:00 -0500 (EST) Subject: [tinysofa-svn] r5642 - in tinysofa/releases/1.2/bind/current: sources specs Message-ID: <20050110222600.E673E344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 17:24:16 -0500 (Mon, 10 Jan 2005) New Revision: 5642 Added: tinysofa/releases/1.2/bind/current/sources/bind-9.3.0-missing-dnssec-tools.patch tinysofa/releases/1.2/bind/current/sources/bind-9.3.0.tar.gz Removed: tinysofa/releases/1.2/bind/current/sources/bind-9.2.4.tar.gz Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec Log: - 9.3.0 - run ldconfig on -libs postun Deleted: tinysofa/releases/1.2/bind/current/sources/bind-9.2.4.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/bind/current/sources/bind-9.3.0-missing-dnssec-tools.patch =================================================================== --- tinysofa/releases/1.2/bind/current/sources/bind-9.3.0-missing-dnssec-tools.patch 2005-01-10 21:45:36 UTC (rev 5641) +++ tinysofa/releases/1.2/bind/current/sources/bind-9.3.0-missing-dnssec-tools.patch 2005-01-10 22:24:16 UTC (rev 5642) @@ -0,0 +1,35 @@ +--- bind-9.3.0/bin/dnssec/Makefile.in.missing-dnssec-tools 2004-07-20 03:01:48.000000000 -0400 ++++ bind-9.3.0/bin/dnssec/Makefile.in 2004-11-12 10:00:30.283922000 -0500 +@@ -39,15 +39,15 @@ + LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ + + # Alphabetically +-TARGETS = dnssec-keygen at EXEEXT@ dnssec-signzone at EXEEXT@ ++TARGETS = dnssec-keygen at EXEEXT@ dnssec-signzone at EXEEXT@ dnssec-makekeyset at EXEEXT@ dnssec-signkey at EXEEXT@ + + OBJS = dnssectool. at O@ + +-SRCS = dnssec-keygen.c dnssec-signzone.c dnssectool.c ++SRCS = dnssec-keygen.c dnssec-makekeyset.c dnssec-signkey.c dnssec-signzone.c dnssectool.c + +-MANPAGES = dnssec-keygen.8 dnssec-signzone.8 ++MANPAGES = dnssec-keygen.8 dnssec-signzone.8 dnssec-makekeyset.8 dnssec-signkey.8 + +-HTMLPAGES = dnssec-keygen.html dnssec-signzone.html ++HTMLPAGES = dnssec-keygen.html dnssec-signzone.html dnssec-makekeyset.html dnssec-signkey.html + + MANOBJS = ${MANPAGES} ${HTMLPAGES} + +@@ -64,6 +64,12 @@ + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ + dnssec-signzone. at O@ ${OBJS} ${LIBS} + ++dnssec-makekeyset at EXEEXT@: dnssec-makekeyset. at O@ ${OBJS} ${DEPLIBS} ++ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ dnssec-makekeyset. at O@ ${OBJS} ${LIBS} ++ ++dnssec-signkey at EXEEXT@: dnssec-signkey. at O@ ${OBJS} ${DEPLIBS} ++ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ dnssec-signkey. at O@ ${OBJS} ${LIBS} ++ + doc man:: ${MANOBJS} + + docclean manclean maintainer-clean:: Added: tinysofa/releases/1.2/bind/current/sources/bind-9.3.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/bind/current/sources/bind-9.3.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.2/bind/current/specs/bind.spec 2005-01-10 21:45:36 UTC (rev 5641) +++ tinysofa/releases/1.2/bind/current/specs/bind.spec 2005-01-10 22:24:16 UTC (rev 5642) @@ -1,8 +1,8 @@ %define jail /var/lib/named Name: bind -Version: 9.2.4 -Release: 1ts +Version: 9.3.0 +Release: 1jh Epoch: 0 Summary: A chrooted DNS (Domain Name System) server Summary(pt_BR): BIND - Servidor de nomes DNS chrooted @@ -24,6 +24,7 @@ Patch1: %{name}-9.2.0.varrun.patch Patch2: bind-9.2.3-SO_BSDCOMPAT.patch Patch3: bind-9.2.4rc7-pie.patch +Patch4: bind-9.3.0-missing-dnssec-tools.patch #Requires: glibc-iconv # this requirement if because of the /etc/sysconfig/syslog file # which should have a ADD_SOCKET entry @@ -172,7 +173,9 @@ %patch1 -p1 -b .varrun %patch2 -p1 -b .SO_BSDCOMPAT %patch3 -p1 -b .pie +%patch4 -p1 -b .missing-dnssec-tools + %build libtoolize --copy --force aclocal @@ -198,7 +201,7 @@ install -m 644 bin/*/*.8 %{buildroot}%{_mandir}/man8/ install -m 644 lib/lwres/man/*.3 %{buildroot}%{_mandir}/man3/ -# 9.2.4 installs named.conf.5 to wrong location +# 9.2.4 and 9.3.0 installs named.conf.5 to wrong location mv %{buildroot}%{_mandir}/man8/named.conf.5 %{buildroot}%{_mandir}/man5 # - compress some documentation, do not fail if there are @@ -364,6 +367,8 @@ %post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + %triggerpostun -- bind = 9.2.3-12ts [ $2 = 0 ] && exit 0 @@ -474,7 +479,6 @@ %{_includedir}/lwres %{_mandir}/man3/* - %files doc %defattr(-,root,root) %doc doc/arm doc/draft doc/misc doc/rfc @@ -482,6 +486,10 @@ %changelog +* Mon Jan 10 2005 Jaakko Heinonen 9.3.0-1jh +- 9.3.0 +- run ldconfig on -libs postun + * Tue Jan 04 2005 tsintegrate 9.2.4-1ts - current (9.2.4-1jh) integrated as 9.2.4-1ts for release 1.1-U3 From svn at tinysofa.org Mon Jan 10 22:27:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 17:27:38 -0500 (EST) Subject: [tinysofa-svn] r5643 - tinysofa/releases/1.2/bash/current/specs Message-ID: <20050110222738.A0A1D344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 17:27:31 -0500 (Mon, 10 Jan 2005) New Revision: 5643 Modified: tinysofa/releases/1.2/bash/current/specs/bash.spec Log: - nls cleanup Modified: tinysofa/releases/1.2/bash/current/specs/bash.spec =================================================================== --- tinysofa/releases/1.2/bash/current/specs/bash.spec 2005-01-10 22:24:16 UTC (rev 5642) +++ tinysofa/releases/1.2/bash/current/specs/bash.spec 2005-01-10 22:27:31 UTC (rev 5643) @@ -136,7 +136,10 @@ ln -s /bin/true autoconf export PATH=.:$PATH fi -%configure --with-bash-malloc=no --with-afs +%configure \ + --with-bash-malloc=no \ + --with-afs \ + --disable-nls %make CPPFLAGS=`getconf LFS_CFLAGS` -j1 #make check @@ -200,7 +203,6 @@ install -D -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/bashrc %nuke_info -rm -fr %{buildroot}%{_datadir}/locale %clean From svn at tinysofa.org Mon Jan 10 22:31:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 10 Jan 2005 17:31:28 -0500 (EST) Subject: [tinysofa-svn] r5644 - tinysofa/releases/1.2/bash/current/specs Message-ID: <20050110223128.5E0A5344130@minbar.tinysofa.org> Author: jh Date: 2005-01-10 17:31:21 -0500 (Mon, 10 Jan 2005) New Revision: 5644 Modified: tinysofa/releases/1.2/bash/current/specs/bash.spec Log: - another cleanup Modified: tinysofa/releases/1.2/bash/current/specs/bash.spec =================================================================== --- tinysofa/releases/1.2/bash/current/specs/bash.spec 2005-01-10 22:27:31 UTC (rev 5643) +++ tinysofa/releases/1.2/bash/current/specs/bash.spec 2005-01-10 22:31:21 UTC (rev 5644) @@ -140,7 +140,7 @@ --with-bash-malloc=no \ --with-afs \ --disable-nls -%make CPPFLAGS=`getconf LFS_CFLAGS` -j1 +%make #make check From svn at tinysofa.org Tue Jan 11 06:28:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 01:28:38 -0500 (EST) Subject: [tinysofa-svn] r5645 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050111062838.E09E9344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 01:28:23 -0500 (Tue, 11 Jan 2005) New Revision: 5645 Added: tinysofa/releases/1.1/pump/ Removed: tinysofa/releases/1.2/pump/ Log: - move pump to 1.1 Copied: tinysofa/releases/1.1/pump (from rev 5644, tinysofa/releases/1.2/pump) From svn at tinysofa.org Tue Jan 11 06:35:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 01:35:33 -0500 (EST) Subject: [tinysofa-svn] r5646 - tinysofa/releases/1.2 Message-ID: <20050111063533.2AE59344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 01:35:22 -0500 (Tue, 11 Jan 2005) New Revision: 5646 Added: tinysofa/releases/1.2/netconfig/ Log: - copy 1.1 pump to 1.2 as netconfig Copied: tinysofa/releases/1.2/netconfig (from rev 5645, tinysofa/releases/1.1/pump) From svn at tinysofa.org Tue Jan 11 07:00:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 02:00:47 -0500 (EST) Subject: [tinysofa-svn] r5647 - tinysofa/releases/1.2/netconfig/current/specs Message-ID: <20050111070047.72ABB344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 02:00:36 -0500 (Tue, 11 Jan 2005) New Revision: 5647 Added: tinysofa/releases/1.2/netconfig/current/specs/netconfig.spec Removed: tinysofa/releases/1.2/netconfig/current/specs/pump.spec Log: - rename to netconfig - install only netconfig Copied: tinysofa/releases/1.2/netconfig/current/specs/netconfig.spec (from rev 5646, tinysofa/releases/1.2/netconfig/current/specs/pump.spec) =================================================================== --- tinysofa/releases/1.2/netconfig/current/specs/pump.spec 2005-01-11 06:35:22 UTC (rev 5646) +++ tinysofa/releases/1.2/netconfig/current/specs/netconfig.spec 2005-01-11 07:00:36 UTC (rev 5647) @@ -0,0 +1,267 @@ +Summary: A text-based tool for simple configuration of ethernet devices. +Name: netconfig +Version: 0.8.20 +Release: 3jh +Group: main +License: MIT +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source: pump-%{version}.tar.gz +BuildRequires: newt-devel slang-devel gettext + +%description +A text-based tool for simple configuration of ethernet devices. + + +%prep +%setup -q -n pump-%{version} + + +%build +%make + + +%install +%{__mkdir_p} %{buildroot}%{_sbindir} +%{__install} -m 0755 netconfig %{buildroot}%{_sbindir}/netconfig + + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root) +%{_sbindir}/netconfig + + +%changelog +* Tue Jan 11 2005 Jaakko Heinonen 0.8.20-3jh +- netconfig only + +* Thu Aug 05 2004 tsintegrate 0.8.20-2ts +- current (0.8.20-2jh) integrated as 0.8.20-2ts for release 1.1 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jan 6 2004 Jeremy Katz 0.8.20-1 +- rebuild with vendor class id patch (#78843) + +* Thu Aug 14 2003 Bill Nottingham 0.8.19-1 +- translations + +* Wed Aug 13 2003 Bill Nottingham 0.8.18-1 +- add --hwaddr and --desc options to netconfig + +* Fri Aug 01 2003 Florian La Roche +- set hopcount (ip_ttl) from 0 to 16 + +* Tue Mar 11 2003 Jeremy Katz 0.8.15-2 +- rebuild + +* Tue Mar 11 2003 Jeremy Katz 0.8.15-1 +- add mtu and ptpaddr fields for s390 + +* Tue Feb 11 2003 Bill Nottingham 0.8.14-2 +- rebuild + +* Wed Dec 11 2002 Elliot Lee 0.8.14-1 +- Remove unpackaged files + +* Fri Oct 4 2002 Jeremy Katz +- build with -fPIC + +* Fri Oct 4 2002 Jeremy Katz +- link against libpopt.a in %%{_libdir} + +* Thu Aug 15 2002 Bill Nottingham +- rebuild against new newt + +* Thu Jun 27 2002 Bill Nottingham +- don't ship main package + +* Tue Jun 18 2002 Bill Nottingham +- sync patches and CVS +- rebuild against new slang +- don't strip binaries + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Aug 26 2001 Elliot Lee +- Fix one half #17724 + +* Wed Jul 25 2001 Trond Eivind Glomsr?d +- Don't obsolete netconfig, it's now separate again + +* Tue Jul 24 2001 Elliot Lee +- Fix installer segfaults with nobootp patch. + +* Mon Jul 23 2001 Trond Eivind Glomsr?d +- split out netconfig to a package of its own + +* Thu Jul 19 2001 Elliot Lee +- Patch from bugs #19501, #19502, #21088, etc. + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Thu Mar 1 2001 Bill Nottingham +- make netconfig much more sane (#30008, in essence) + +* Tue Feb 27 2001 Erik Troan +- applied patch to use SO_BINDTODEVICE properly (weejock at ferret.lmh.ox.ac.uk) + +* Mon Feb 12 2001 Bill Nottingham +- run ifup-post on lease renewal + +* Thu Feb 01 2001 Erik Troan +- update secs field properly +- don't reset interface flags we don't understand +- added --win-client-id flag +- cleaned up packet creation a bit +- added --no-gateway + +* Tue Jan 9 2001 Matt Wilson +- always set the src address of the broadcast to 0.0.0.0 + +* Mon Nov 20 2000 Erik Troan +- lo device needs to have it's network route added + +* Fri Nov 10 2000 Bill Nottingham +- don't pass a random length to accept() + +* Mon Oct 23 2000 Erik Troan +- up scripts called for first interface information, and called even if pump + failed + +* Wed Aug 30 2000 Bernhard Rosenkraenzer +- Fix up the "search" entry scan so it works in Europe... + +* Wed Aug 16 2000 Matt Wilson +- added a strerror(errno) to the "unable to set default route" syslog + +* Tue Aug 15 2000 Erik Troan +- reverted always put the dhcp option type as the first code in the vendor + field + +* Mon Aug 07 2000 Erik Troan +- added .net to list of top level domains +- don't crash on domains w/ no .'s in them +- syslog if adding the default route fails + +* Sat Aug 05 2000 Erik Troan +- net.c should use "pump.h", not + +* Fri Aug 04 2000 Erik Troan +- use BINDTODEVICE +- support nis domain names +- always put the dhcp option type as the first code in the vendor field + +* Mon Jul 3 2000 Bill Nottingham +- add some sanity checks in dhcp.c + +* Mon Jun 26 2000 Matt Wilson +- defattr root for devel subpackage + +* Mon Jun 19 2000 Than Ngo +- FHS fixes + +* Tue Mar 28 2000 Erik Troan +- added pump-devel package + +* Thu Feb 24 2000 Erik Troan +- set hw type properly (safford at watson.ibm.com) + +* Wed Feb 23 2000 Erik Troan +- fixed # parsing (aaron at schrab.com) + +* Tue Feb 15 2000 Erik Troan +- added script argument (Guy Delamarter ) +- fixed bug in hostname passing (H.J. Lu) +- fixed time displays to be in wall time, not up time (Chris Johnson) + +* Wed Feb 9 2000 Bill Nottingham +- fix bug in netconfig - hitting 'back' causes bogus config files + to get written + +* Thu Feb 03 2000 Erik Troan +- added patch from duanev at io.com which improves debug messages and + uses /proc/uptime rather time time() -- this should be correct for + everything but systems that are suspended during their lease time, in + which case we'll be wrong +- added hostname to DISCOVER and RELEASE events; hopefully this gets us + working for all @HOME systems. +- patch from dunham at cse.msu.edu fixed /etc/resolv.conf parsing + +* Wed Feb 02 2000 Cristian Gafton +- fix description +- man pages are compressed + +* Wed Nov 10 1999 Erik Troan +- at some point a separate dhcp.c was created +- include hostname in renewal request +- changed default lease time to 6 hours +- if no hostname is specified on the command line, use gethostname() + to request one (unless it's "localhost" or "localhost.localdomain") +- properly handle failed renewal attempts +- display (and request) syslog, lpr, ntp, font, and xdm servers + +* Tue Sep 14 1999 Michael K. Johnson +- pump processes cannot accumulate because of strange file + descriptors (bug only showed up under rp3) + +* Tue Sep 7 1999 Bill Nottingham +- add simple network configurator + +* Wed Jun 23 1999 Erik Troan +- patch from Sten Drescher for syslog debugging info +- patch from Sten Drescher to not look past end of dhcp packet for options +- patches form Alan Cox for cleanups, malloc failures, and proper udp checksums +- handle replies with more then 3 dns servers specified +- resend dhcp_discover with proper options field +- shrank dhcp_vendor_length to 312 for rfc compliance (thanks to Ben Reed) +- added support for a config file +- don't replace search pass in /etc/resolv.conf unless we have a better one +- bringing down a device didn't work properly + +* Sat May 29 1999 Erik Troan +- bootp interfaces weren't being brought down properly +- segv could result if no domain name was given + +* Sat May 08 1999 Erik Troan +- fixed some file descriptor leakage + +* Thu May 06 1999 Erik Troan +- set option list so we'll work with NT +- tried to add a -h option, but I have no way of testing it :-( + +* Wed Apr 28 1999 Erik Troan +- closing fd 1 is important + +* Mon Apr 19 1999 Bill Nottingham +- don't obsolete dhcpcd + +* Tue Apr 06 1999 Erik Troan +- retry code didn't handle failure terribly gracefully + +* Tue Mar 30 1999 Erik Troan +- added --lookup-hostname +- generate a DNS search path based on full domain set +- use raw socket for revieving reply; this lets us work properly on 2.2 + kernels when we recieve unicast replies from the bootp server + +* Mon Mar 22 1999 Erik Troan +- it was always requesting a 20 second lease + +* Mon Mar 22 1999 Michael K. Johnson +- added minimal man page /usr/man/man8/pump.8 Deleted: tinysofa/releases/1.2/netconfig/current/specs/pump.spec =================================================================== --- tinysofa/releases/1.2/netconfig/current/specs/pump.spec 2005-01-11 06:35:22 UTC (rev 5646) +++ tinysofa/releases/1.2/netconfig/current/specs/pump.spec 2005-01-11 07:00:36 UTC (rev 5647) @@ -1,304 +0,0 @@ -Summary: A Bootp and DHCP client for automatic IP configuration. -Name: pump -Version: 0.8.20 -Release: 2ts -Group: main -License: MIT -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source: pump-%{version}.tar.gz -Obsoletes: bootpc -BuildRequires: newt-devel slang-devel gettext -Requires: initscripts >= 3.92 - -%description -DHCP (Dynamic Host Configuration Protocol) and BOOTP (Boot Protocol) -are protocols which allow individual devices on an IP network to get -their own network configuration information (IP address, subnetmask, -broadcast address, etc.) from network servers. The overall purpose of -DHCP and BOOTP is to make it easier to administer a large network. - -Pump is a combined BOOTP and DHCP client daemon, which allows your -machine to retrieve configuration information from a server. You -should install this package if you are on a network which uses BOOTP -or DHCP. - -%package devel -Summary: Development tools for sending DHCP and BOOTP requests. -Group: development - -%description devel -The pump-devel package provides system developers the ability to send -BOOTP and DHCP requests from their programs. BOOTP and DHCP are -protocols used to provide network configuration information to -networked machines. - -%package -n netconfig -Group: main -Summary: A text-based tool for simple configuration of ethernet devices. -Conflicts: pump < 0.8.20-2 - -%description -n netconfig -A text-based tool for simple configuration of ethernet devices. - - -%prep -%setup -q - - -%build -%make - - -%install -%makeinstall RPM_BUILD_ROOT=$RPM_BUILD_ROOT - -%find_lang %{name} - - -%clean -%clean_buildroot - - -%files -%defattr(-,root,root) -/sbin/pump -%{_mandir}/man8/pump.8* - -%files devel -%defattr(-,root,root) -%{_libdir}/libpump.a -%{_includedir}/pump.h - -%files -n netconfig -f %{name}.lang -%defattr(-,root,root) -%{_sbindir}/netconfig - - -%changelog -* Thu Aug 05 2004 tsintegrate 0.8.20-2ts -- current (0.8.20-2jh) integrated as 0.8.20-2ts for release 1.1 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Tue Jan 6 2004 Jeremy Katz 0.8.20-1 -- rebuild with vendor class id patch (#78843) - -* Thu Aug 14 2003 Bill Nottingham 0.8.19-1 -- translations - -* Wed Aug 13 2003 Bill Nottingham 0.8.18-1 -- add --hwaddr and --desc options to netconfig - -* Fri Aug 01 2003 Florian La Roche -- set hopcount (ip_ttl) from 0 to 16 - -* Tue Mar 11 2003 Jeremy Katz 0.8.15-2 -- rebuild - -* Tue Mar 11 2003 Jeremy Katz 0.8.15-1 -- add mtu and ptpaddr fields for s390 - -* Tue Feb 11 2003 Bill Nottingham 0.8.14-2 -- rebuild - -* Wed Dec 11 2002 Elliot Lee 0.8.14-1 -- Remove unpackaged files - -* Fri Oct 4 2002 Jeremy Katz -- build with -fPIC - -* Fri Oct 4 2002 Jeremy Katz -- link against libpopt.a in %%{_libdir} - -* Thu Aug 15 2002 Bill Nottingham -- rebuild against new newt - -* Thu Jun 27 2002 Bill Nottingham -- don't ship main package - -* Tue Jun 18 2002 Bill Nottingham -- sync patches and CVS -- rebuild against new slang -- don't strip binaries - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Sun Aug 26 2001 Elliot Lee -- Fix one half #17724 - -* Wed Jul 25 2001 Trond Eivind Glomsr?d -- Don't obsolete netconfig, it's now separate again - -* Tue Jul 24 2001 Elliot Lee -- Fix installer segfaults with nobootp patch. - -* Mon Jul 23 2001 Trond Eivind Glomsr?d -- split out netconfig to a package of its own - -* Thu Jul 19 2001 Elliot Lee -- Patch from bugs #19501, #19502, #21088, etc. - -* Sun Jun 24 2001 Elliot Lee -- Bump release + rebuild. - -* Thu Mar 1 2001 Bill Nottingham -- make netconfig much more sane (#30008, in essence) - -* Tue Feb 27 2001 Erik Troan -- applied patch to use SO_BINDTODEVICE properly (weejock at ferret.lmh.ox.ac.uk) - -* Mon Feb 12 2001 Bill Nottingham -- run ifup-post on lease renewal - -* Thu Feb 01 2001 Erik Troan -- update secs field properly -- don't reset interface flags we don't understand -- added --win-client-id flag -- cleaned up packet creation a bit -- added --no-gateway - -* Tue Jan 9 2001 Matt Wilson -- always set the src address of the broadcast to 0.0.0.0 - -* Mon Nov 20 2000 Erik Troan -- lo device needs to have it's network route added - -* Fri Nov 10 2000 Bill Nottingham -- don't pass a random length to accept() - -* Mon Oct 23 2000 Erik Troan -- up scripts called for first interface information, and called even if pump - failed - -* Wed Aug 30 2000 Bernhard Rosenkraenzer -- Fix up the "search" entry scan so it works in Europe... - -* Wed Aug 16 2000 Matt Wilson -- added a strerror(errno) to the "unable to set default route" syslog - -* Tue Aug 15 2000 Erik Troan -- reverted always put the dhcp option type as the first code in the vendor - field - -* Mon Aug 07 2000 Erik Troan -- added .net to list of top level domains -- don't crash on domains w/ no .'s in them -- syslog if adding the default route fails - -* Sat Aug 05 2000 Erik Troan -- net.c should use "pump.h", not - -* Fri Aug 04 2000 Erik Troan -- use BINDTODEVICE -- support nis domain names -- always put the dhcp option type as the first code in the vendor field - -* Mon Jul 3 2000 Bill Nottingham -- add some sanity checks in dhcp.c - -* Mon Jun 26 2000 Matt Wilson -- defattr root for devel subpackage - -* Mon Jun 19 2000 Than Ngo -- FHS fixes - -* Tue Mar 28 2000 Erik Troan -- added pump-devel package - -* Thu Feb 24 2000 Erik Troan -- set hw type properly (safford at watson.ibm.com) - -* Wed Feb 23 2000 Erik Troan -- fixed # parsing (aaron at schrab.com) - -* Tue Feb 15 2000 Erik Troan -- added script argument (Guy Delamarter ) -- fixed bug in hostname passing (H.J. Lu) -- fixed time displays to be in wall time, not up time (Chris Johnson) - -* Wed Feb 9 2000 Bill Nottingham -- fix bug in netconfig - hitting 'back' causes bogus config files - to get written - -* Thu Feb 03 2000 Erik Troan -- added patch from duanev at io.com which improves debug messages and - uses /proc/uptime rather time time() -- this should be correct for - everything but systems that are suspended during their lease time, in - which case we'll be wrong -- added hostname to DISCOVER and RELEASE events; hopefully this gets us - working for all @HOME systems. -- patch from dunham at cse.msu.edu fixed /etc/resolv.conf parsing - -* Wed Feb 02 2000 Cristian Gafton -- fix description -- man pages are compressed - -* Wed Nov 10 1999 Erik Troan -- at some point a separate dhcp.c was created -- include hostname in renewal request -- changed default lease time to 6 hours -- if no hostname is specified on the command line, use gethostname() - to request one (unless it's "localhost" or "localhost.localdomain") -- properly handle failed renewal attempts -- display (and request) syslog, lpr, ntp, font, and xdm servers - -* Tue Sep 14 1999 Michael K. Johnson -- pump processes cannot accumulate because of strange file - descriptors (bug only showed up under rp3) - -* Tue Sep 7 1999 Bill Nottingham -- add simple network configurator - -* Wed Jun 23 1999 Erik Troan -- patch from Sten Drescher for syslog debugging info -- patch from Sten Drescher to not look past end of dhcp packet for options -- patches form Alan Cox for cleanups, malloc failures, and proper udp checksums -- handle replies with more then 3 dns servers specified -- resend dhcp_discover with proper options field -- shrank dhcp_vendor_length to 312 for rfc compliance (thanks to Ben Reed) -- added support for a config file -- don't replace search pass in /etc/resolv.conf unless we have a better one -- bringing down a device didn't work properly - -* Sat May 29 1999 Erik Troan -- bootp interfaces weren't being brought down properly -- segv could result if no domain name was given - -* Sat May 08 1999 Erik Troan -- fixed some file descriptor leakage - -* Thu May 06 1999 Erik Troan -- set option list so we'll work with NT -- tried to add a -h option, but I have no way of testing it :-( - -* Wed Apr 28 1999 Erik Troan -- closing fd 1 is important - -* Mon Apr 19 1999 Bill Nottingham -- don't obsolete dhcpcd - -* Tue Apr 06 1999 Erik Troan -- retry code didn't handle failure terribly gracefully - -* Tue Mar 30 1999 Erik Troan -- added --lookup-hostname -- generate a DNS search path based on full domain set -- use raw socket for revieving reply; this lets us work properly on 2.2 - kernels when we recieve unicast replies from the bootp server - -* Mon Mar 22 1999 Erik Troan -- it was always requesting a 20 second lease - -* Mon Mar 22 1999 Michael K. Johnson -- added minimal man page /usr/man/man8/pump.8 From svn at tinysofa.org Tue Jan 11 07:05:53 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 02:05:53 -0500 (EST) Subject: [tinysofa-svn] r5648 - tinysofa/releases/1.2/dhcp/current/specs Message-ID: <20050111070553.9C9DE344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 02:05:48 -0500 (Tue, 11 Jan 2005) New Revision: 5648 Modified: tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec Log: - -client obsoletes pump Modified: tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec =================================================================== --- tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec 2005-01-11 07:00:36 UTC (rev 5647) +++ tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec 2005-01-11 07:05:48 UTC (rev 5648) @@ -2,7 +2,7 @@ Name: dhcp Epoch: 1 Version: 3.0.1 -Release: 2ts +Release: 3jh License: distributable Group: main URL: http://isc.org/products/DHCP/ @@ -58,6 +58,7 @@ Summary: The ISC DHCP (Dynamic Host Configuration Protocol) client Group: main Requires: dhcp-common = %{epoch}:%{version} +Obsoletes: pump %description client DHCP client is the Internet Software Consortium (ISC) DHCP client for various @@ -69,11 +70,11 @@ install the base dhcp package. %package server -Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server +Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server Group: extra -Requires: dhcp-common = %{epoch}:%{version} +Requires: dhcp-common = %{epoch}:%{version} %service_requires -Obsoletes: dhcp +Obsoletes: dhcp %description server DHCP server is the Internet Software Consortium (ISC) DHCP server for various @@ -84,9 +85,9 @@ network. You will also need to install the base dhcp package. %package devel -Summary: Development headers and libraries for the dhcpctl API +Summary: Development headers and libraries for the dhcpctl API Group: development -Requires: dhcp-common = %{epoch}:%{version} +Requires: dhcp-common = %{epoch}:%{version} %description devel DHCP devel contains all of the libraries and headers for developing with th @@ -138,6 +139,7 @@ %make + %install %makeinstall_std @@ -170,6 +172,7 @@ %clean %clean_buildroot + %post server %service_post dhcpd %service_post dhcrelay @@ -232,6 +235,9 @@ %changelog +* Tue Jan 11 2005 Jaakko Heinonen 3.0.1-3jh +- obsolete pump + * Tue Jan 04 2005 tsintegrate 3.0.1-2ts - current (3.0.1-2jh) integrated as 3.0.1-2ts for release 1.1-U3 From svn at tinysofa.org Tue Jan 11 07:48:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 02:48:37 -0500 (EST) Subject: [tinysofa-svn] r5649 - tinysofa/releases/1.2/dialog/current/specs Message-ID: <20050111074837.AC4EC344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 02:48:30 -0500 (Tue, 11 Jan 2005) New Revision: 5649 Modified: tinysofa/releases/1.2/dialog/current/specs/dialog.spec Log: - rewrite spec Modified: tinysofa/releases/1.2/dialog/current/specs/dialog.spec =================================================================== --- tinysofa/releases/1.2/dialog/current/specs/dialog.spec 2005-01-11 07:05:48 UTC (rev 5648) +++ tinysofa/releases/1.2/dialog/current/specs/dialog.spec 2005-01-11 07:48:30 UTC (rev 5649) @@ -4,10 +4,10 @@ Release: 9ts License: GPL Group: extra -Source: ftp://AdvancedResearch.org/pub/vstemen/dialog-%{version}.tar.gz +Source: http://hightek.org/dialog/dialog-0.7.tar.gz Patch1: dialog-0.7-opt.patch -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: ncurses ncurses-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: ncurses-devel %description Dialog is a utility that allows you to show dialog boxes (containing @@ -18,37 +18,40 @@ Install dialog if you would like to create TTY dialog boxes. + %prep %setup -q -%patch1 -p1 -b .opt -#cd src -#make depend +%patch1 -p1 -b .opt~ + %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +%make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/man1} -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 +%{__mkdir_p} \ + %{buildroot}%{_bindir} \ + %{buildroot}%{_mandir}/man1 -make DESTDIR=$RPM_BUILD_ROOT install +%{__install} -m 0755 dialog %{buildroot}%{_bindir}/dialog +%{__install} -m 0644 dialog.1 %{buildroot}%{_mandir}/man1 -cp -a $RPM_BUILD_ROOT/usr/man/* $RPM_BUILD_ROOT/usr/share/man -rm -rf $RPM_BUILD_ROOT/usr/man -strip $RPM_BUILD_ROOT/usr/bin/dialog - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +%clean_buildroot + %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog README samples -/usr/bin/dialog -%{_mandir}/man1/dialog* +%{_bindir}/dialog +%{_mandir}/man1/dialog.1* + %changelog +* Tue Jan 11 2005 Jaakko Heinonen +- rewrite spec + * Thu Aug 05 2004 tsintegrate 0.7-9ts - current (0.7-9jh) integrated as 0.7-9ts for release 1.1 From svn at tinysofa.org Tue Jan 11 16:12:15 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 11:12:15 -0500 (EST) Subject: [tinysofa-svn] r5650 - in tinysofa/releases/1.2/gnupg/current: sources specs Message-ID: <20050111161215.07C79344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 11:11:08 -0500 (Tue, 11 Jan 2005) New Revision: 5650 Added: tinysofa/releases/1.2/gnupg/current/sources/gnupg-1.4.0.tar.bz2 Removed: tinysofa/releases/1.2/gnupg/current/sources/gnupg-1.2.6.tar.bz2 Modified: tinysofa/releases/1.2/gnupg/current/specs/gnupg.spec Log: - 1.4.0 Deleted: tinysofa/releases/1.2/gnupg/current/sources/gnupg-1.2.6.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/gnupg/current/sources/gnupg-1.4.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/gnupg/current/sources/gnupg-1.4.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/gnupg/current/specs/gnupg.spec =================================================================== --- tinysofa/releases/1.2/gnupg/current/specs/gnupg.spec 2005-01-11 07:48:30 UTC (rev 5649) +++ tinysofa/releases/1.2/gnupg/current/specs/gnupg.spec 2005-01-11 16:11:08 UTC (rev 5650) @@ -1,7 +1,7 @@ Summary: A GNU utility for secure communication and data storage. Name: gnupg -Version: 1.2.6 -Release: 1ts +Version: 1.4.0 +Release: 1jh License: GPL Group: main Source: http://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.bz2 @@ -9,7 +9,7 @@ Source2: gnupg-index.html URL: http://www.gnupg.org Provides: gpg openpgp gnupg -BuildRequires: openldap-devel zlib-devel +BuildRequires: openldap-devel zlib-devel bzip2-devel libcap-devel perl %info_requires BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -47,7 +47,9 @@ --libexecdir="%{_libdir}" \ --with-mailprog=/usr/sbin/sendmail \ --disable-nls \ - --with-zlib + --with-zlib \ + --with-bzip2 \ + --with-capabilities %make @@ -57,7 +59,7 @@ %install -%makeinstall install-strip libexecdir="$RPM_BUILD_ROOT/%{_libdir}/%{name}" +%makeinstall libexecdir="$RPM_BUILD_ROOT/%{_libdir}/%{name}" install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/%{name} \ $RPM_BUILD_ROOT%{_htmldir}/%{name} @@ -100,8 +102,7 @@ %{_mandir}/man1/* %{_mandir}/man7/* -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/tinysofa.pub.gpg +%{_libdir}/%{name} %dir %{_datadir}/%{name} %{_datadir}/%{name}/options.skel %{_htmldir}/%{name} @@ -113,6 +114,9 @@ %changelog +* Tue Jan 11 2005 Jaakko Heinonen 1.4.0-1jh +- 1.4.0 + * Tue Jan 04 2005 tsintegrate 1.2.6-1ts - current (1.2.6-1jh) integrated as 1.2.6-1ts for release 1.1-U3 From svn at tinysofa.org Tue Jan 11 16:13:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 11:13:11 -0500 (EST) Subject: [tinysofa-svn] r5651 - tinysofa/releases/1.2/gmp/current/sources Message-ID: <20050111161311.B0AF4344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 11:11:53 -0500 (Tue, 11 Jan 2005) New Revision: 5651 Added: tinysofa/releases/1.2/gmp/current/sources/gmp-4.1.4.tar.bz2 Log: - add missing source Added: tinysofa/releases/1.2/gmp/current/sources/gmp-4.1.4.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/gmp/current/sources/gmp-4.1.4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svn at tinysofa.org Tue Jan 11 16:15:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 11:15:14 -0500 (EST) Subject: [tinysofa-svn] r5652 - in tinysofa/releases/1.2/lftp/current: sources specs Message-ID: <20050111161514.23687344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 11:14:36 -0500 (Tue, 11 Jan 2005) New Revision: 5652 Added: tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13.tar.bz2 tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13.tar.bz2.asc Removed: tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.6.tar.bz2 tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.6.tar.bz2.asc Modified: tinysofa/releases/1.2/lftp/current/specs/lftp.spec Log: - 3.0.13 - build as pie Added: tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13.tar.bz2.asc =================================================================== --- tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13.tar.bz2.asc 2005-01-11 16:11:53 UTC (rev 5651) +++ tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13.tar.bz2.asc 2005-01-11 16:14:36 UTC (rev 5652) @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.1 (SunOS) + +iD8DBQBBxvGkqCS7afKpmhgRAi8LAJ0d2+55QKYF8Sni8RJKOww600gF/gCeK7iD +t+OMAtYVfP+cHlXnL8ldR7I= +=pODL +-----END PGP SIGNATURE----- Deleted: tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.6.tar.bz2 =================================================================== (Binary files differ) Deleted: tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.6.tar.bz2.asc =================================================================== --- tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.6.tar.bz2.asc 2005-01-11 16:11:53 UTC (rev 5651) +++ tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.6.tar.bz2.asc 2005-01-11 16:14:36 UTC (rev 5652) @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.1 (SunOS) - -iD8DBQBAysBMqCS7afKpmhgRAtHeAJoDL+7g5/HEyLCswC3mhLifLgZSjwCcCI0Z -wZrrQJOcROZQaNuTbKCjE3Q= -=PHya ------END PGP SIGNATURE----- Modified: tinysofa/releases/1.2/lftp/current/specs/lftp.spec =================================================================== --- tinysofa/releases/1.2/lftp/current/specs/lftp.spec 2005-01-11 16:11:53 UTC (rev 5651) +++ tinysofa/releases/1.2/lftp/current/specs/lftp.spec 2005-01-11 16:14:36 UTC (rev 5652) @@ -1,7 +1,7 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 3.0.6 -Release: 2ts +Version: 3.0.13 +Release: 1jh License: GPL Group: main Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2 @@ -11,7 +11,6 @@ BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel BuildRequires: libstdc++-devel gcc-c++ BuildRequires: libtool - Requires: libstdc++ openssl ncurses readline %description @@ -20,33 +19,39 @@ mirroring, and can transfer several files in parallel. It is designed with reliability in mind. + %prep %setup -q + %build if pkg-config openssl ; then CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS fi -LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS +LDFLAGS="-L`pwd`/src/.libs $LDFLAGS -pie"; export LDFLAGS +CPPFLAGS="$CPPFLAGS -fPIE"; export CPPFLAGS + %configure --with-modules --disable-static --with-ssl -make +%make + %install %makeinstall -rm -f %{buildroot}%{_libdir}/lftp/%{version}/*.la chmod 0755 %{buildroot}%{_libdir}/lftp/* chmod 0755 %{buildroot}%{_libdir}/lftp/%{version}/*.so # Remove files from %{buildroot} that we aren't shipping. -rm -f %{buildroot}%{_libdir}/lftp/%{version}/*.a +rm -f %{buildroot}%{_libdir}/lftp/%{version}/*.{la,a} %find_lang %{name} + %clean %clean_buildroot + %files -f %{name}.lang %defattr(-,root,root,-) %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO @@ -66,7 +71,12 @@ %{_libdir}/lftp/%{version}/proto-http.so %{_libdir}/lftp/%{version}/proto-sftp.so + %changelog +* Tue Jan 11 2005 Jaakko Heinonen 3.0.13-1jh +- 3.0.13 +- build as pie + * Thu Aug 05 2004 tsintegrate 3.0.6-2ts - current (3.0.6-2jh) integrated as 3.0.6-2ts for release 1.1 From svn at tinysofa.org Tue Jan 11 16:15:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 11:15:21 -0500 (EST) Subject: [tinysofa-svn] r5653 - tinysofa/releases/1.2/gmp/current/specs Message-ID: <20050111161521.727AF344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 11:15:11 -0500 (Tue, 11 Jan 2005) New Revision: 5653 Modified: tinysofa/releases/1.2/gmp/current/specs/gmp.spec Log: - update version number Modified: tinysofa/releases/1.2/gmp/current/specs/gmp.spec =================================================================== --- tinysofa/releases/1.2/gmp/current/specs/gmp.spec 2005-01-11 16:14:36 UTC (rev 5652) +++ tinysofa/releases/1.2/gmp/current/specs/gmp.spec 2005-01-11 16:15:11 UTC (rev 5653) @@ -7,8 +7,8 @@ Summary: A GNU arbitrary precision library. Name: gmp -Version: 4.1.3 -Release: 1ts +Version: 4.1.4 +Release: 1jh URL: http://www.swox.com/gmp/ Source: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2 Patch0: gmp-4.0.1-s390.patch From svn at tinysofa.org Tue Jan 11 16:25:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 11:25:02 -0500 (EST) Subject: [tinysofa-svn] r5654 - in tinysofa/releases/1.2/elfutils/current: sources specs Message-ID: <20050111162502.1CFDC344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 11:24:33 -0500 (Tue, 11 Jan 2005) New Revision: 5654 Added: tinysofa/releases/1.2/elfutils/current/sources/elfutils-0.97.tar.gz Removed: tinysofa/releases/1.2/elfutils/current/sources/elfutils-0.95.tar.gz Modified: tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec Log: - 0.97 - use RPM_OPT_FLAGS - spec cleanup Deleted: tinysofa/releases/1.2/elfutils/current/sources/elfutils-0.95.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/elfutils/current/sources/elfutils-0.97.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/elfutils/current/sources/elfutils-0.97.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec =================================================================== --- tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec 2005-01-11 16:15:11 UTC (rev 5653) +++ tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec 2005-01-11 16:24:33 UTC (rev 5654) @@ -1,27 +1,19 @@ -%define gpl 0 Summary: A collection of utilities and DSOs to handle compiled objects. Name: elfutils -Version: 0.95 -Release: 2ts -%if %{gpl} -Copyright: GPL -%else -Copyright: OSL -%endif +Version: 0.97 +Release: 1jh +License: OSL Group: extra #URL: file://home/devel/drepper/ Source: elfutils-%{version}.tar.gz Obsoletes: libelf libelf-devel Requires: elfutils-libelf = %{version}-%{release} -%if %{gpl} -Requires: binutils >= 2.14 -%endif - # ExcludeArch: xxx - -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gcc >= 3.2 BuildRequires: sharutils +BuildRequires: bison >= 1.875 +BuildRequires: flex >= 2.5.4a %define _gnu %{nil} %define _programprefix eu- @@ -70,12 +62,15 @@ access the internals of the ELF object file format, so you can see the different sections of an ELF file. + %prep %setup -q + %build mkdir build-%{_target_platform} cd build-%{_target_platform} +CFLAGS="$CFLAGS $RPM_OPT_FLAGS" \ ../configure \ --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ @@ -85,8 +80,8 @@ --infodir=%{_infodir} --program-prefix=%{_programprefix} --enable-shared cd .. + %install -rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_prefix} cd build-%{_target_platform} @@ -94,32 +89,25 @@ %makeinstall chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so* -%if !%{gpl} chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so* -%endif cd .. -%if !%{gpl} # XXX Nuke unpackaged files { cd ${RPM_BUILD_ROOT} - rm -f .%{_bindir}/eu-ld rm -f .%{_includedir}/elfutils/libasm.h rm -f .%{_includedir}/elfutils/libdw.h - rm -f .%{_libdir}/libasm-%{version}.so - rm -f .%{_libdir}/libasm.a - rm -f .%{_libdir}/libdw.so - rm -f .%{_libdir}/libdw.a } -%endif -#%check -#cd build-%{_target_platform} -#make check +%check +cd build-%{_target_platform} +make check + %clean -rm -rf ${RPM_BUILD_ROOT} +%clean_buildroot + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -128,40 +116,34 @@ %postun libelf -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README TODO -%if %{gpl} -%doc fake-src/FULL -%endif +%exclude %{_bindir}/eu-ld +%exclude %{_libdir}/libasm-%{version}.so %{_bindir}/eu-elflint %{_bindir}/eu-nm %{_bindir}/eu-readelf %{_bindir}/eu-size %{_bindir}/eu-strip -%if !%{gpl} -#%{_bindir}/eu-ld -#%{_libdir}/libasm-%{version}.so %{_libdir}/libdw-%{version}.so -#%{_libdir}/libasm*.so.* +%exclude %{_libdir}/libasm*.so.* %{_libdir}/libdw*.so.* %dir %{_libdir}/elfutils %{_libdir}/elfutils/lib*.so -%endif %files devel %defattr(-,root,root) %{_includedir}/dwarf.h %dir %{_includedir}/elfutils %{_includedir}/elfutils/elf-knowledge.h -%if !%{gpl} %{_includedir}/elfutils/libebl.h -#%{_libdir}/libasm.a +%exclude %{_libdir}/libasm.a %{_libdir}/libebl.a -#%{_libdir}/libdw.a -#%{_libdir}/libasm.so -#%{_libdir}/libdw.so -%endif +%exclude %{_libdir}/libdw.a +%exclude %{_libdir}/libasm.so +%exclude %{_libdir}/libdw.so %files libelf %defattr(-,root,root) @@ -176,7 +158,13 @@ %{_libdir}/libelf.a %{_libdir}/libelf.so + %changelog +* Tue Jan 11 2005 Jaakko Heinonen 0.97-1jh +- 0.97 +- use RPM_OPT_FLAGS +- spec cleanup + * Thu Aug 05 2004 tsintegrate 0.95-2ts - current (0.95-2jh) integrated as 0.95-2ts for release 1.1 From svn at tinysofa.org Tue Jan 11 16:33:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 11:33:46 -0500 (EST) Subject: [tinysofa-svn] r5655 - in tinysofa/releases/1.2/squid/current: sources specs Message-ID: <20050111163346.BA213344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 11:33:35 -0500 (Tue, 11 Jan 2005) New Revision: 5655 Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-fakeauth_auth.patch Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec Log: - fix NTLM fakeauth_auth helper denial of service Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-fakeauth_auth.patch =================================================================== --- tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-fakeauth_auth.patch 2005-01-11 16:24:33 UTC (rev 5654) +++ tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-fakeauth_auth.patch 2005-01-11 16:33:35 UTC (rev 5655) @@ -0,0 +1,324 @@ +Index: squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c +diff -c squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.2.1 squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.2.7 +*** squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.2.1 Fri Aug 20 02:09:58 2004 +--- squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c Fri Jan 7 14:12:27 2005 +*************** +*** 38,47 **** + #if HAVE_PWD_H + #include + #endif +! +! +! #define ERR "ERR\n" +! #define OK "OK\n" + + #if 0 + #define NTLM_STATIC_CHALLENGE "deadbeef" +--- 38,46 ---- + #if HAVE_PWD_H + #include + #endif +! #if HAVE_ASSERT_H +! #include +! #endif + + #if 0 + #define NTLM_STATIC_CHALLENGE "deadbeef" +*************** +*** 55,61 **** + static void + lc(char *string) + { +! char *p = string, c; + while ((c = *p)) { + *p = tolower(c); + p++; +--- 54,61 ---- + static void + lc(char *string) + { +! char *p = string; +! char c; + while ((c = *p)) { + *p = tolower(c); + p++; +*************** +*** 65,71 **** + + /* + * Generates a challenge request. The randomness of the 8 byte +! * challenge strings can be guarenteed to be poor at best. + */ + void + ntlmMakeChallenge(struct ntlm_challenge *chal) +--- 65,71 ---- + + /* + * Generates a challenge request. The randomness of the 8 byte +! * challenge strings can be guaranteed to be poor at best. + */ + void + ntlmMakeChallenge(struct ntlm_challenge *chal) +*************** +*** 89,95 **** + if (authenticate_ntlm_domain != NULL) + while (authenticate_ntlm_domain[i++]); + +- + chal->target.offset = WSWAP(48); + chal->target.maxlen = SSWAP(i); + chal->target.len = chal->target.maxlen; +--- 89,94 ---- +*************** +*** 110,116 **** + } + + /* +! * Check the vailidity of a request header. Return -1 on error. + */ + int + ntlmCheckHeader(ntlmhdr * hdr, int type) +--- 109,115 ---- + } + + /* +! * Check the validity of a request header. Return -1 on error. + */ + int + ntlmCheckHeader(ntlmhdr * hdr, int type) +*************** +*** 127,135 **** + return 0; + + if (WSWAP(hdr->type) != type) { +! /* don't report this error - it's ok as we do a if() around this function */ +! // fprintf(stderr, "ntlmCheckHeader: type is %d, wanted %d\n", +! // WSWAP(hdr->type), type); + return (-1); + } + return (0); +--- 126,133 ---- + return 0; + + if (WSWAP(hdr->type) != type) { +! /* don't report this error - it's ok as we do a if() around this function */ +! /* fprintf(stderr, "ntlmCheckHeader: type is %d, wanted %d\n", WSWAP(hdr->type), type); */ + return (-1); + } + return (0); +*************** +*** 142,150 **** + ntlmGetString(ntlmhdr * hdr, strhdr * str, int flags) + { + static char buf[512]; +! u_short *s, c; +! char *d, *sc; +! int l, o; + + l = SSWAP(str->len); + o = WSWAP(str->offset); +--- 140,151 ---- + ntlmGetString(ntlmhdr * hdr, strhdr * str, int flags) + { + static char buf[512]; +! u_short *s; +! u_short c; +! char *d; +! char *sc; +! int l; +! int o; + + l = SSWAP(str->len); + o = WSWAP(str->offset); +*************** +*** 195,256 **** + int + ntlmDecodeAuth(struct ntlm_authenticate *auth, char *buf, size_t size) + { +! char *p, *origbuf; + int s; + +! if (!buf) { + return 1; +- } + origbuf = buf; +! if (ntlmCheckHeader(&auth->hdr, NTLM_AUTHENTICATE)) { + +- fprintf(stderr, "ntlmDecodeAuth: header check fails\n"); +- return -1; +- } +- /* only on when you need to debug +- * fprintf(stderr,"ntlmDecodeAuth: size of %d\n", size); +- * fprintf(stderr,"ntlmDecodeAuth: flg %08x\n", auth->flags); +- * fprintf(stderr,"ntlmDecodeAuth: usr o(%d) l(%d)\n", auth->user.offset, auth->user.len); +- */ + if ((p = ntlmGetString(&auth->hdr, &auth->domain, 2)) == NULL) + p = authenticate_ntlm_domain; +! // fprintf(stderr,"ntlmDecodeAuth: Domain '%s'.\n",p); + if ((s = strlen(p) + 1) >= size) + return 1; + strcpy(buf, p); +! // fprintf(stdout,"ntlmDecodeAuth: Domain '%s'.\n",buf); + + size -= s; + buf += (s - 1); + *buf++ = '\\'; /* Using \ is more consistent with MS-proxy */ + + p = ntlmGetString(&auth->hdr, &auth->user, 2); + if ((s = strlen(p) + 1) >= size) + return 1; + while (*p) +! *buf++ = (*p++); //tolower + + *buf++ = '\0'; + size -= s; +! // fprintf(stderr, "ntlmDecodeAuth: user: %s%s\n",origbuf, p); +! + + return 0; + } + + + int +! main() + { + char buf[256]; +! char user[256], *p, *cleartext; + struct ntlm_challenge chal; + int len; + char *data = NULL; + + setbuf(stdout, NULL); + while (fgets(buf, 256, stdin) != NULL) { +! user[0] = '\0'; /*no usercode */ + + if ((p = strchr(buf, '\n')) != NULL) + *p = '\0'; /* strip \n */ +--- 196,265 ---- + int + ntlmDecodeAuth(struct ntlm_authenticate *auth, char *buf, size_t size) + { +! char *p; +! char *origbuf; + int s; + +! if (!buf) + return 1; + origbuf = buf; +! assert (0 == ntlmCheckHeader(&auth->hdr, NTLM_AUTHENTICATE)); +! +! #if DEBUG_FAKEAUTH +! fprintf(stderr,"ntlmDecodeAuth: size of %d\n", size); +! fprintf(stderr,"ntlmDecodeAuth: flg %08x\n", auth->flags); +! fprintf(stderr,"ntlmDecodeAuth: usr o(%d) l(%d)\n", auth->user.offset, +! auth->user.len); +! #endif + + if ((p = ntlmGetString(&auth->hdr, &auth->domain, 2)) == NULL) + p = authenticate_ntlm_domain; +! #if DEBUG_FAKEAUTH +! fprintf(stderr,"ntlmDecodeAuth: Domain '%s'.\n",p); +! #endif + if ((s = strlen(p) + 1) >= size) + return 1; + strcpy(buf, p); +! #if DEBUG_FAKEAUTH +! fprintf(stdout,"ntlmDecodeAuth: Domain '%s'.\n",buf); +! #endif + + size -= s; + buf += (s - 1); + *buf++ = '\\'; /* Using \ is more consistent with MS-proxy */ + + p = ntlmGetString(&auth->hdr, &auth->user, 2); ++ if (NULL == p) ++ return 1; + if ((s = strlen(p) + 1) >= size) + return 1; + while (*p) +! *buf++ = (*p++); /* tolower */ + + *buf++ = '\0'; + size -= s; +! #if DEBUG_FAKEAUTH +! fprintf(stderr, "ntlmDecodeAuth: user: %s%s\n",origbuf, p); +! #endif + + return 0; + } + + + int +! main(int argc, char *argv[]) + { + char buf[256]; +! char user[256]; +! char *p; +! char *cleartext = NULL; + struct ntlm_challenge chal; + int len; + char *data = NULL; + + setbuf(stdout, NULL); + while (fgets(buf, 256, stdin) != NULL) { +! memset(user, '\0', sizeof(user)); /* no usercode */ + + if ((p = strchr(buf, '\n')) != NULL) + *p = '\0'; /* strip \n */ +*************** +*** 270,280 **** + printf("AF %s\n", user); + } else { + lc(user); +! printf("NA invalid credentials%s\n", user); + } + } else { + lc(user); +! printf("BH wrong packet type!%s\n", user); + } + } + #endif +--- 279,289 ---- + printf("AF %s\n", user); + } else { + lc(user); +! printf("NA invalid credentials, user=%s\n", user); + } + } else { + lc(user); +! printf("BH wrong packet type! user=%s\n", user); + } + } + #endif +*************** +*** 291,300 **** + SSWAP(chal.target.maxlen); + data = (char *) base64_encode_bin((char *) &chal, len); + printf("CH %s\n", data); +! } else if (!ntlmCheckHeader +! ((struct ntlmhdr *) cleartext, NTLM_AUTHENTICATE)) { +! if (!ntlmDecodeAuth +! ((struct ntlm_authenticate *) cleartext, user, 256)) { + lc(user); + printf("OK %s\n", user); + } else { +--- 300,307 ---- + SSWAP(chal.target.maxlen); + data = (char *) base64_encode_bin((char *) &chal, len); + printf("CH %s\n", data); +! } else if (!ntlmCheckHeader ((struct ntlmhdr *) cleartext, NTLM_AUTHENTICATE)) { +! if (!ntlmDecodeAuth ((struct ntlm_authenticate *) cleartext, user, 256)) { + lc(user); + printf("OK %s\n", user); + } else { +*************** +*** 307,312 **** +--- 314,321 ---- + } + } + #endif /*v2 */ ++ free(cleartext); ++ cleartext = NULL; + } + exit(0); + } Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec =================================================================== --- tinysofa/releases/1.2/squid/current/specs/squid.spec 2005-01-11 16:24:33 UTC (rev 5654) +++ tinysofa/releases/1.2/squid/current/specs/squid.spec 2005-01-11 16:33:35 UTC (rev 5655) @@ -4,7 +4,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE7 -Release: 1ts +Release: 2jh Epoch: 0 License: GPL Group: extra @@ -21,6 +21,7 @@ Patch4: squid-2.5.STABLE7-build.patch Patch5: squid-2.5.STABLE4-perlpath.patch Patch6: squid-2.5.STABLE5-pipe.patch +Patch7: squid-2.5.STABLE7-fakeauth_auth.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: logrotate coreutils /usr/bin/find @@ -50,6 +51,7 @@ %patch4 -p1 -b .build %patch5 -p1 -b .perlpath %patch6 -p1 -b .pipe +%patch7 -p1 -b .fakeauth_auth %build @@ -275,6 +277,9 @@ %changelog +* Tue Jan 11 2005 Jaakko Heinonen 2.5.STABLE7-2jh +- fix NTLM fakeauth_auth helper denial of service + * Tue Jan 04 2005 tsintegrate 2.5.STABLE7-1ts - current (2.5.STABLE7-1jh) integrated as 2.5.STABLE7-1ts for release 1.1-U3 From svn at tinysofa.org Tue Jan 11 18:57:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 13:57:59 -0500 (EST) Subject: [tinysofa-svn] r5657 - tinysofa/releases/1.2/rpm/current/sources Message-ID: <20050111185759.7242F344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 13:57:52 -0500 (Tue, 11 Jan 2005) New Revision: 5657 Modified: tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-msglvl.patch Log: - update msglvl patch Modified: tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-msglvl.patch =================================================================== --- tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-msglvl.patch 2005-01-11 18:34:52 UTC (rev 5656) +++ tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-msglvl.patch 2005-01-11 18:57:52 UTC (rev 5657) @@ -7,7 +7,7 @@ - int anaconda = rpmtsFlags(ts) & RPMTRANS_FLAG_ANACONDA; - int msglvl = (anaconda || (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS)) + //int anaconda = rpmtsFlags(ts) & RPMTRANS_FLAG_ANACONDA; -+ int msglvl = (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS) ++ int msglvl = 0 ? RPMMESS_WARNING : RPMMESS_DEBUG; int ac = 0; int i; From svn at tinysofa.org Tue Jan 11 20:04:48 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 15:04:48 -0500 (EST) Subject: [tinysofa-svn] r5660 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050111200448.7BDED344132@minbar.tinysofa.org> Author: jh Date: 2005-01-11 15:04:34 -0500 (Tue, 11 Jan 2005) New Revision: 5660 Added: tinysofa/releases/1.1/kernel/ Removed: tinysofa/releases/1.2/kernel/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/kernel (from rev 5659, tinysofa/releases/1.2/kernel) From svn at tinysofa.org Tue Jan 11 20:01:36 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 15:01:36 -0500 (EST) Subject: [tinysofa-svn] r5659 - in tinysofa/releases/1.2/rpm/current: sources specs Message-ID: <20050111200136.45D2D344131@minbar.tinysofa.org> Author: jh Date: 2005-01-11 15:01:26 -0500 (Tue, 11 Jan 2005) New Revision: 5659 Modified: tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-msglvl.patch tinysofa/releases/1.2/rpm/current/specs/rpm.spec Log: - fix msglvl patch - disable msglvl patch for 1.2 Modified: tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-msglvl.patch =================================================================== --- tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-msglvl.patch 2005-01-11 19:22:31 UTC (rev 5658) +++ tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-msglvl.patch 2005-01-11 20:01:26 UTC (rev 5659) @@ -1,5 +1,5 @@ ---- rpm-4.3.3/lib/depends.c.msglvl 2005-01-05 18:03:11.692083860 +0200 -+++ rpm-4.3.3/lib/depends.c 2005-01-05 18:09:56.145032991 +0200 +--- rpm-4.3.3/lib/depends.c.msglvl~ 2004-11-11 23:35:45.000000000 +0200 ++++ rpm-4.3.3/lib/depends.c 2005-01-11 21:58:36.133893670 +0200 @@ -833,8 +833,8 @@ if (!badDepsInitialized) { char * s = rpmExpand("%{?_dependency_whiteout}", NULL); @@ -7,7 +7,16 @@ - int anaconda = rpmtsFlags(ts) & RPMTRANS_FLAG_ANACONDA; - int msglvl = (anaconda || (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS)) + //int anaconda = rpmtsFlags(ts) & RPMTRANS_FLAG_ANACONDA; -+ int msglvl = 0 ++ int msglvl = (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS) ? RPMMESS_WARNING : RPMMESS_DEBUG; int ac = 0; int i; +@@ -1452,7 +1452,7 @@ + while ((p = q) != NULL && (q = rpmteTSI(p)->tsi_chain) != NULL) { + const char * dp; + char buf[4096]; +- int msglvl = (anaconda || (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS)) ++ int msglvl = (rpmtsFlags(ts) & RPMTRANS_FLAG_DEPLOOPS) + ? RPMMESS_WARNING : RPMMESS_DEBUG; + ; + Modified: tinysofa/releases/1.2/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.2/rpm/current/specs/rpm.spec 2005-01-11 19:22:31 UTC (rev 5658) +++ tinysofa/releases/1.2/rpm/current/specs/rpm.spec 2005-01-11 20:01:26 UTC (rev 5659) @@ -136,7 +136,7 @@ %endif %patch2 -p1 %patch3 -p1 -b .aptctrlc~ -%patch4 -p1 -b .msglvl~ +#%patch4 -p1 -b .msglvl~ cp -f %{SOURCE1} . @@ -518,6 +518,9 @@ %{__includedir}/popt.h %changelog +* Tue Jan 11 2005 Jaakko Heinonen 4.3.3-4jh +- disable msglvl patch for 1.2 + * Wed Jan 5 2005 Jaakko Heinonen 4.3.3-2jh - add msglvl patch to avoid debug messages in anaconda - update tarball From svn at tinysofa.org Tue Jan 11 19:22:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 11 Jan 2005 14:22:37 -0500 (EST) Subject: [tinysofa-svn] r5658 - tinysofa/releases/1.2/rpm/current/specs Message-ID: <20050111192237.C4565344130@minbar.tinysofa.org> Author: jh Date: 2005-01-11 14:22:31 -0500 (Tue, 11 Jan 2005) New Revision: 5658 Modified: tinysofa/releases/1.2/rpm/current/specs/rpm.spec Log: - bump up release Modified: tinysofa/releases/1.2/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.2/rpm/current/specs/rpm.spec 2005-01-11 18:57:52 UTC (rev 5657) +++ tinysofa/releases/1.2/rpm/current/specs/rpm.spec 2005-01-11 19:22:31 UTC (rev 5658) @@ -21,7 +21,7 @@ %define version 4.3.3 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 2jh +Release: 4jh Group: main Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Source1: GROUPS From svn at tinysofa.org Wed Jan 12 18:08:01 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 12 Jan 2005 13:08:01 -0500 (EST) Subject: [tinysofa-svn] r5667 - in tinysofa/releases/1.2/glib/current: sources specs Message-ID: <20050112180801.84295344132@minbar.tinysofa.org> Author: jh Date: 2005-01-12 13:07:01 -0500 (Wed, 12 Jan 2005) New Revision: 5667 Added: tinysofa/releases/1.2/glib/current/sources/glib-2.6.1.tar.bz2 Removed: tinysofa/releases/1.2/glib/current/sources/glib-2.4.7.tar.bz2 Modified: tinysofa/releases/1.2/glib/current/specs/glib.spec Log: - 2.6.1 Deleted: tinysofa/releases/1.2/glib/current/sources/glib-2.4.7.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/glib/current/sources/glib-2.6.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/glib/current/sources/glib-2.6.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/glib/current/specs/glib.spec =================================================================== --- tinysofa/releases/1.2/glib/current/specs/glib.spec 2005-01-12 17:47:18 UTC (rev 5666) +++ tinysofa/releases/1.2/glib/current/specs/glib.spec 2005-01-12 18:07:01 UTC (rev 5667) @@ -1,6 +1,6 @@ Summary: A library of handy utility functions. Name: glib -Version: 2.4.7 +Version: 2.6.1 Release: 1ts License: LGPL Group: main @@ -31,8 +31,8 @@ Provides: glib2-devel = %{version} %description devel -The glib2-devel package includes the header files and static -libararies for version 2 of the GLib library. +The glib2-devel package includes the header files for +version 2 of the GLib library. %prep @@ -47,7 +47,8 @@ %make # test-thread fails on ia64: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=116829 -%ifnarch ia64 s390 s390x +# abicheck fails on ppc and ppc64 +%ifnarch ia64 s390 s390x ppc ppc64 make check %endif @@ -67,7 +68,7 @@ %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post -p /sbin/ldconfig @@ -100,6 +101,9 @@ %changelog +* Wed Jan 12 2005 Jaakko Heinonen 2.6.1-1jh +- 2.6.1 + * Tue Jan 04 2005 tsintegrate 2.4.7-1ts - current (2.4.7-1jh) integrated as 2.4.7-1ts for release 1.1-U3 From svn at tinysofa.org Thu Jan 13 05:27:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 00:27:43 -0500 (EST) Subject: [tinysofa-svn] r5669 - in tinysofa/releases/1.2: etcskel/current/specs rootfiles/current/specs Message-ID: <20050113052743.E86CB344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 00:27:30 -0500 (Thu, 13 Jan 2005) New Revision: 5669 Modified: tinysofa/releases/1.2/etcskel/current/specs/etcskel.spec tinysofa/releases/1.2/rootfiles/current/specs/rootfiles.spec Log: - don't use non-standard tar switches Modified: tinysofa/releases/1.2/etcskel/current/specs/etcskel.spec =================================================================== --- tinysofa/releases/1.2/etcskel/current/specs/etcskel.spec 2005-01-12 20:11:47 UTC (rev 5668) +++ tinysofa/releases/1.2/etcskel/current/specs/etcskel.spec 2005-01-13 05:27:30 UTC (rev 5669) @@ -21,7 +21,7 @@ %install mkdir -p $RPM_BUILD_ROOT/etc/skel -zcat $RPM_SOURCE_DIR/etcskel.tar.gz | (cd $RPM_BUILD_ROOT ; tar -xvSpf-) +zcat $RPM_SOURCE_DIR/etcskel.tar.gz | (cd $RPM_BUILD_ROOT ; tar -xvpf-) %clean Modified: tinysofa/releases/1.2/rootfiles/current/specs/rootfiles.spec =================================================================== --- tinysofa/releases/1.2/rootfiles/current/specs/rootfiles.spec 2005-01-12 20:11:47 UTC (rev 5668) +++ tinysofa/releases/1.2/rootfiles/current/specs/rootfiles.spec 2005-01-13 05:27:30 UTC (rev 5669) @@ -7,6 +7,7 @@ Source: rootfiles.tar.gz BuildRoot: %{_tmppath}/%{name}-root BuildArchitectures: noarch +BuildRequires: tar %description The rootfiles package contains basic required files that are placed @@ -18,9 +19,8 @@ %setup -q -n rootfiles %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/root -tar -cvSpf- . | (cd $RPM_BUILD_ROOT/root ; tar -xSpf-) +tar -cpf- . | (cd $RPM_BUILD_ROOT/root ; tar -xvpf-) %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT From svn at tinysofa.org Thu Jan 13 14:47:10 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 09:47:10 -0500 (EST) Subject: [tinysofa-svn] r5670 - in tinysofa/releases/1.2/shadow-utils/current: sources specs Message-ID: <20050113144710.C69DF344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 09:46:37 -0500 (Thu, 13 Jan 2005) New Revision: 5670 Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-chage-selinux.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-debuginfo.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-goodname.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-maxmem.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-pl-n_useradd.8.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-removemalloc.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-skellink.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-useradd-unlock.patch Modified: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-lastlog-size.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-mailspool.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-noinst.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-nscd.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-redhat.patch tinysofa/releases/1.2/shadow-utils/current/sources/shadow-utils-selinux.patch tinysofa/releases/1.2/shadow-utils/current/specs/shadow-utils.spec Log: - add malloc patch to make it compile with gcc 3.4 - add more patches Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-chage-selinux.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-chage-selinux.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-chage-selinux.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -0,0 +1,27 @@ +--- shadow-4.0.3/src/chage.c.selinux 2002-01-05 10:41:43.000000000 -0500 ++++ shadow-4.0.3/src/chage.c 2004-10-01 16:16:28.313330980 -0400 +@@ -28,7 +28,10 @@ + */ + + #include +- ++#ifdef WITH_SELINUX ++#include ++#include ++#endif + #include "rcsid.h" + RCSID (PKG_VER "$Id: chage.c,v 1.27 2002/01/05 15:41:43 kloczek Exp $") + #include +@@ -377,8 +380,11 @@ + textdomain (PACKAGE); + + ruid = getuid (); ++#ifdef WITH_SELINUX ++ amroot = (ruid == 0 && checkPasswdAccess(PASSWD__ROOTOK) == 0); ++#else + amroot = (ruid == 0); +- ++#endif + /* + * Get the program name so that error messages can use it. + */ Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-debuginfo.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-debuginfo.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-debuginfo.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -0,0 +1,11 @@ +--- shadow-4.0.3/src/Makefile.am.debuginfo 2004-11-16 16:28:08.333835079 -0500 ++++ shadow-4.0.3/src/Makefile.am 2004-11-16 16:28:57.421127529 -0500 +@@ -4,6 +4,8 @@ + ubindir = ${prefix}/bin + usbindir = ${prefix}/sbin + ++LDFLAGS = ++ + DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" + + INCLUDES = -I${top_srcdir} \ Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-goodname.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-goodname.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-goodname.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -0,0 +1,65 @@ +--- shadow-4.0.3/libmisc/chkname.c.goodname 2002-01-10 08:04:34.000000000 -0500 ++++ shadow-4.0.3/libmisc/chkname.c 2004-12-03 16:56:02.931628451 -0500 +@@ -22,16 +22,24 @@ + good_name(const char *name) + { + /* +- * User/group names must match [a-z_][a-z0-9_-]* ++ * User/group names must match gnu e-regex: ++ * [a-zA-Z0-9_.][a-zA-Z0-9_-.]{0,30}[a-zA-Z0-9_.$-]? ++ * ++ * as a non-POSIX, extension, allow "$" as the last char for ++ * sake of Samba 3.x "add machine script" + */ +- if (!*name || !((*name >= 'a' && *name <= 'z') || *name == '_')) ++ if (!*name || !((*name >= 'a' && *name <= 'z') ++ || (*name >= 'A' && *name <= 'Z') ++ || (*name >= '0' && *name <= '9') ++ || *name == '_' || *name == '.')) + return 0; + + while (*++name) { +- if (!((*name >= 'a' && *name <= 'z') || +- (*name >= '0' && *name <= '9') || +- *name == '_' || *name == '-' || +- (*name == '$' && *(name+1) == NULL))) ++ if (!( (*name >= 'a' && *name <= 'z') ++ || (*name >= 'A' && *name <= 'Z') ++ || (*name >= '0' && *name <= '9') ++ || *name == '_' || *name == '.' || *name == '-' ++ || (*name == '$' && *(name + 1) == '\0'))) + return 0; + } + +@@ -48,10 +56,9 @@ + #endif + + /* +- * User names are limited by whatever utmp can +- * handle (usually max 8 characters). ++ * User names are limited by whatever utmp can handle. + */ +- if (strlen(name) > sizeof(ut.ut_user)) ++ if (strlen(name) + 1 > sizeof(ut.ut_user)) + return 0; + + return good_name(name); +@@ -60,11 +67,13 @@ + int + check_group_name(const char *name) + { +- /* +- * Arbitrary limit for group names - max 16 +- * characters (same as on HP-UX 10). +- */ +- if (strlen(name) > 16) ++#if HAVE_UTMPX_H ++ struct utmpx ut; ++#else ++ struct utmp ut; ++#endif ++ ++ if (strlen(name) + 1 > sizeof(ut.ut_user)) + return 0; + + return good_name(name); Modified: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-lastlog-size.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-lastlog-size.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-lastlog-size.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -1,9 +1,41 @@ -Handle cases where the ll_time field is smaller than a time_t by assuming that -it's at least not larger and letting the compiler take it from there. - ---- shadow-4.0.3/src/lastlog.c 2002-01-05 07:41:43.000000000 -0800 -+++ shadow-4.0.3/src/lastlog.c 2003-11-06 13:37:49.000000000 -0800 -@@ -167,6 +167,7 @@ static void print_one (const struct pass +--- shadow-4.0.3/src/lastlog.c.lastlog-size 2002-01-05 10:41:43.000000000 -0500 ++++ shadow-4.0.3/src/lastlog.c 2004-12-03 18:18:34.796426697 -0500 +@@ -1,3 +1,4 @@ ++#define _LARGEFILE_SOURCE + /* + * Copyright 1989 - 1994, Julianne Frances Haugh + * All rights reserved. +@@ -128,7 +129,7 @@ + off_t offset; + + if (uflg) { +- offset = (unsigned long) user *sizeof lastlog; ++ offset = user * sizeof lastlog; + + if (fstat (fileno (lastlogfile), &statbuf)) { + perror (LASTLOG_FILE); +@@ -137,7 +138,7 @@ + if (offset >= statbuf.st_size) + return; + +- fseek (lastlogfile, offset, SEEK_SET); ++ fseeko (lastlogfile, offset, SEEK_SET); + if (fread ((char *) &lastlog, sizeof lastlog, 1, + lastlogfile) == 1) + print_one (pwent); +@@ -147,9 +148,9 @@ + setpwent (); + while ((pwent = getpwent ())) { + user = pwent->pw_uid; +- offset = (unsigned long) user *sizeof lastlog; ++ offset = user * sizeof lastlog; + +- fseek (lastlogfile, offset, SEEK_SET); ++ fseeko (lastlogfile, offset, SEEK_SET); + if (fread ((char *) &lastlog, sizeof lastlog, 1, + lastlogfile) != 1) + continue; +@@ -167,6 +168,7 @@ static int once; char *cp; struct tm *tm; @@ -11,7 +43,7 @@ #ifdef HAVE_STRFTIME char ptime[80]; -@@ -184,7 +185,8 @@ static void print_one (const struct pass +@@ -184,7 +186,8 @@ #endif once++; } Modified: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-mailspool.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-mailspool.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-mailspool.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -37,9 +37,9 @@ + mail_gid = mail->gr_gid; + } + -+ ms = malloc(strlen(user_name) + 18); ++ ms = malloc(strlen(user_name) + 11); + if (ms != NULL) { -+ sprintf(ms, "/var/spool/mail/%s", user_name); ++ sprintf(ms, "/var/mail/%s", user_name); + if (access(ms, R_OK) != 0) { + fd = open(ms, O_CREAT|O_EXCL|O_WRONLY|O_TRUNC); + if (fd != -1) { Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-maxmem.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-maxmem.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-maxmem.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -0,0 +1,64 @@ +--- shadow-4.0.3/lib/gshadow.c.maxmem 1998-04-02 16:51:43.000000000 -0500 ++++ shadow-4.0.3/lib/gshadow.c 2004-11-16 16:04:36.227776993 -0500 +@@ -48,12 +48,10 @@ + static int dbmerror; + #endif + +-#define MAXMEM 1024 +- + static FILE *shadow; + static char sgrbuf[BUFSIZ*4]; +-static char *members[MAXMEM+1]; +-static char *admins[MAXMEM+1]; ++static char **members = NULL; static size_t nmembers = 0; ++static char **admins = NULL; static size_t nadmins = 0; + static struct sgrp sgroup; + + extern char *fgetsx(); +@@ -105,17 +103,25 @@ + #endif + + static char ** +-list(char *s, char **l) +-{ +- int nmembers = 0; +- +- while (s && *s) { +- l[nmembers++] = s; +- if ((s = strchr (s, ','))) +- *s++ = '\0'; ++list(char *s, char **list[], size_t *nlist) { ++ char **ptr = *list; ++ size_t nelem = *nlist, size; ++ ++ while (s != NULL && *s != '\0') { ++ size = (nelem + 1) * sizeof(ptr); ++ if ((ptr = realloc(*list, size)) != NULL) { ++ ptr[nelem++] = s; ++ *list = ptr; *nlist = nelem; ++ if ((s = strchr(s, ','))) ++ *s++ = '\0'; ++ } ++ } ++ size = (nelem + 1) * sizeof(ptr); ++ if ((ptr = realloc(*list, size)) != NULL) { ++ ptr[nelem] = '\0'; ++ *list = ptr; + } +- l[nmembers] = (char *) 0; +- return l; ++ return ptr; + } + + void +@@ -215,8 +221,8 @@ + + sgroup.sg_name = fields[0]; + sgroup.sg_passwd = fields[1]; +- sgroup.sg_adm = list (fields[2], admins); +- sgroup.sg_mem = list (fields[3], members); ++ sgroup.sg_adm = list (fields[2], &admins, &nadmins); ++ sgroup.sg_mem = list (fields[3], &members, &nmembers); + + return &sgroup; + } Modified: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-noinst.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-noinst.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-noinst.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -1,4 +1,4 @@ -These libraries aren't meant to be installed. +These libraries aren't meant to be installed. Not without headers, at least. --- shadow-4.0.3/libmisc/Makefile.am 2002-11-21 23:19:50.000000000 -0500 +++ shadow-4.0.3/libmisc/Makefile.am 2002-11-21 23:19:45.000000000 -0500 Modified: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-nscd.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-nscd.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-nscd.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -19,7 +19,7 @@ + char *pidbuf=calloc(256,1); + int pid; + -+ if ((pidfile=fopen("/var/run/nscd.pid","r")) != NULL) ++ if ((pidfile=fopen("/var/run/nscd/nscd.pid","r")) != NULL || (pidfile=fopen("/var/run/nscd.pid","r")) != NULL) + { + pidbuf = fgets(pidbuf, 256, pidfile); + fclose(pidfile); Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-pl-n_useradd.8.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-pl-n_useradd.8.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-pl-n_useradd.8.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -0,0 +1,13 @@ +--- shadow-4.0.3/man/pl/useradd.8.orig 2002-03-09 09:37:44.000000000 -0500 ++++ shadow-4.0.3/man/pl/useradd.8 2004-10-13 12:04:31.294158601 -0400 +@@ -100,6 +100,10 @@ + Opcja \fB-k\fR jest dozwolona tylko w po??czeniu z opcj? \fB-m\fR. + Domy?lnym dzia?aniem jest nie tworzenie katalogu i nie kopiowanie + jakichkolwiek plik?w. ++.IP "\fB-n\fR" ++Domy?lnie gdy do systemu jest dodawany u?ytkownik tworzona jest te? grupa o ++takiej samej nazwie. Ta opcja wy??cza takie, specyficzne dla Linuksa Red Hat, ++zachowanie. + .IP "\fB-o\fR" + Umo?liwia utworzenie u?ytkownaika z nieunikalnym UID (takim samym jak ju? + istniej?cy). Modified: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-redhat.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-redhat.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-redhat.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -1,50 +1,12 @@ -diff -Nru shadow-4.0.3.orig/man/groupadd.8 shadow-4.0.3/man/groupadd.8 ---- shadow-4.0.3.orig/man/groupadd.8 2002-03-09 15:37:43.000000000 +0100 -+++ shadow-4.0.3/man/groupadd.8 2003-04-22 14:52:07.000000000 +0200 -@@ -29,7 +29,7 @@ - .SH NAME - groupadd \- Create a new group - .SH SYNOPSIS --\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] \fIgroup\fR -+\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-r\fR] [\fB-f\fR] \fIgroup\fR - .SH DESCRIPTION - The \fBgroupadd\fR command - creates a new group account using the values specified on the -@@ -40,9 +40,29 @@ - The numerical value of the group's ID. - This value must be unique, unless the \fB-o\fR option is used. - The value must be non-negative. --The default is to use the smallest ID value greater than 99 and -+The default is to use the smallest ID value greater than 500 and - greater than every other group. --Values between 0 and 99 are typically reserved for system accounts. -+Values between 0 and 499 are typically reserved for \fIsystem accounts\fR. -+.IP \fB-r\fR -+This flag instructs \fBgroupadd\fR to add a \fIsystem -+account\fR. The first available \fIgid\fR lower than 499 will be -+automatically selected unless the \fB-g\fR option is also given on the -+command line. -+.br -+This is an option added by Red Hat. -+.IP \fB-f\fR -+This is the \fIforce\fR flag. This will cause \fBgroupadd\fR to exit with an -+error when the group about to be added already exists on the -+system. If that is the case, the group won't be altered (or added -+again). -+.br -+This option also modifies the way \fB-g\fR option works. When you -+request a \fIgid\fR that it is not unique and you don't specify the \fB-o\fR -+option too, the group creation will fall back to the standard behavior -+(adding a group as if neither \fB-g\fR or \fB-o\fR options were -+specified). -+.br -+This is an option added by Red Hat. - .SH FILES - /etc/group \- group account information - .br -diff -Nru shadow-4.0.3.orig/man/shadowconfig.8 shadow-4.0.3/man/shadowconfig.8 ---- shadow-4.0.3.orig/man/shadowconfig.8 2001-08-24 01:10:48.000000000 +0200 -+++ shadow-4.0.3/man/shadowconfig.8 2003-04-22 14:52:07.000000000 +0200 +Add the -M, -n, and -r flags to useradd, setting the default shell to +/sbin/nologin instead of "" (which is treated as "/bin/sh"), and the default +crypted password to "!!" instead of "!". +Add the -r flag to groupadd. +Remove references to the not-packaged README.debian file from the not-packaged +shadowconfig man page. + +--- shadow-4.0.3/man/shadowconfig.8 2001-08-23 19:10:48.000000000 -0400 ++++ shadow-4.0.3/man/shadowconfig.8 2002-11-25 17:10:09.000000000 -0500 @@ -18,7 +18,3 @@ Turning shadow passwords on when they are already on, or off when they @@ -53,25 +15,37 @@ -Read -.I /usr/share/doc/passwd/README.debian.gz -for a brief introduction to shadow passwords and related features. -diff -Nru shadow-4.0.3.orig/man/useradd.8 shadow-4.0.3/man/useradd.8 ---- shadow-4.0.3.orig/man/useradd.8 2002-03-08 05:39:12.000000000 +0100 -+++ shadow-4.0.3/man/useradd.8 2003-04-22 14:59:28.000000000 +0200 +--- shadow-4.0.3/man/useradd.8 2002-03-07 23:39:12.000000000 -0500 ++++ shadow-4.0.3/man/useradd.8 2002-11-25 17:10:09.000000000 -0500 @@ -36,7 +36,7 @@ .br [\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR[,...]] .br -[\fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] -+[\fB-m\fR [\fB-k\fR \fIskeleton_dir\fR] | \fB-M\fR] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] [\fB-r\fP] ++[\fB-m\fR [\fB-k\fR \fIskeleton_dir\fR] | \fB-M\fR] [\fB-n\fR] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] [\fB-r\fP] .br [\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR .TP 8 -@@ -95,11 +95,23 @@ +@@ -53,6 +53,8 @@ + The new user account will be entered into the system files as needed, + the home directory will be created, and initial files copied, depending + on the command line options. ++The version provided with Red Hat Linux will create a group for each ++user added to the system, unless the \fB-n\fR option is given. + The options which apply to the \fBuseradd\fR command are: + .IP "\fB-c \fIcomment\fR" + The new user's password file comment field. +@@ -95,11 +97,27 @@ option. The default is to not create the directory and to not copy any files. +.IP \fB-M\fR +The user home directory will not be created, even if the system +wide settings from \fI/etc/login.defs\fR is to create home dirs. ++.IP \fB-n\fR ++A group having the same name as the user being added to the system ++will be created by default. This option will turn off this Red Hat ++Linux specific behavior. .IP "\fB-o\fR" Allow create user with duplicate (non-unique) UID. .IP "\fB-p \fIpasswd\fR" @@ -89,98 +63,83 @@ .IP "\fB-s \fIshell\fR" The name of the user's login shell. The default is to leave this field blank, which causes the system -@@ -143,15 +155,19 @@ +@@ -139,19 +157,26 @@ + .SH NOTES + The system administrator is responsible for placing the default + user files in the \fI/etc/skel\fR directory. ++.br ++This version of useradd was modified by Red Hat to suit Red Hat ++user/group conventions. + .SH CAVEATS You may not add a user to an NIS group. This must be performed on the NIS server. .SH FILES -/etc/passwd \- user account information +\fB/etc/passwd\fR \- user account information ++.br ++\fB/etc/shadow\fR \- secure user account information ++.br ++\fB/etc/group\fR \- group information .br -/etc/shadow \- secure user account information -+\fB/etc/shadow\fR \- secure user account information ++\fB/etc/gshadow\fR \- secure group information .br -/etc/group \- group information -+\fB/etc/group\fR \- group information ++\fB/etc/default/useradd\fR \- default information .br -/etc/default/useradd \- default information -+\fB/etc/gshadow\fR \- secure group information ++\fB/etc/login.defs\fR \- system-wide settings .br -/etc/skel \- directory containing default files -+\fB/etc/default/useradd\fR \- default information -+.br -+\fB/etc/login.defs\fR \- system-wide settings -+.br +\fB/etc/skel\fR \- directory containing default files .SH SEE ALSO .BR chfn (1), .BR chsh (1), -diff -Nru shadow-4.0.3.orig/src/groupadd.c shadow-4.0.3/src/groupadd.c ---- shadow-4.0.3.orig/src/groupadd.c 2002-01-06 15:09:07.000000000 +0100 -+++ shadow-4.0.3/src/groupadd.c 2003-04-22 14:52:07.000000000 +0200 -@@ -71,6 +71,7 @@ - static int oflg = 0; /* permit non-unique group ID to be specified with -g */ - static int gflg = 0; /* ID value for the new group */ - static int fflg = 0; /* if group already exists, do nothing and exit(0) */ -+static int rflg = 0; /* for adding system accounts (Red Hat) */ - - #ifdef NDBM - extern int gr_dbm_mode; -@@ -98,7 +99,7 @@ - - static void usage (void) - { -- fprintf (stderr, _("usage: groupadd [-g gid [-o]] group\n")); -+ fprintf (stderr, _("usage: groupadd [-g gid [-o]] [-r] [-f] group\n")); - exit (E_USAGE); - } - -@@ -224,8 +225,13 @@ - const struct group *grp; - gid_t gid_min, gid_max; - -- gid_min = getdef_unum ("GID_MIN", 100); -- gid_max = getdef_unum ("GID_MAX", 60000); -+ if (!rflg) { -+ gid_min = getdef_unum ("GID_MIN", 500); -+ gid_max = getdef_unum ("GID_MAX", 60000); -+ } else { -+ gid_min = 1; -+ gid_max = getdef_unum ("GID_MIN", 500) - 1; -+ } - - /* - * Start with some GID value if the user didn't provide us with -@@ -333,7 +339,7 @@ - char *cp; - int arg; - -- while ((arg = getopt (argc, argv, "og:O:f")) != EOF) { -+ while ((arg = getopt (argc, argv, "og:O:fr")) != EOF) { - switch (arg) { - case 'g': - gflg++; -@@ -374,11 +380,17 @@ - * "force" - do nothing, just exit(0), if the - * specified group already exists. With -g, if - * specified gid already exists, choose another -- * (unique) gid (turn off -g). Based on the RedHat's -+ * (unique) gid (turn off -g). Based on the Red Hat's - * patch from shadow-utils-970616-9. - */ - fflg++; - break; -+ case 'r': -+ /* -+ * create a system group -+ */ -+ rflg++; -+ break; - default: - usage (); - } -diff -Nru shadow-4.0.3.orig/src/useradd.c shadow-4.0.3/src/useradd.c ---- shadow-4.0.3.orig/src/useradd.c 2002-01-10 14:01:28.000000000 +0100 -+++ shadow-4.0.3/src/useradd.c 2003-04-22 15:07:27.000000000 +0200 +--- shadow-4.0.3/man/groupadd.8 2002-03-09 09:37:43.000000000 -0500 ++++ shadow-4.0.3/man/groupadd.8 2002-11-25 17:10:09.000000000 -0500 +@@ -29,7 +29,7 @@ + .SH NAME + groupadd \- Create a new group + .SH SYNOPSIS +-\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] \fIgroup\fR ++\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-r\fR] [\fB-f\fR] \fIgroup\fR + .SH DESCRIPTION + The \fBgroupadd\fR command + creates a new group account using the values specified on the +@@ -40,9 +40,29 @@ + The numerical value of the group's ID. + This value must be unique, unless the \fB-o\fR option is used. + The value must be non-negative. +-The default is to use the smallest ID value greater than 99 and ++The default is to use the smallest ID value greater than 500 and + greater than every other group. +-Values between 0 and 99 are typically reserved for system accounts. ++Values between 0 and 499 are typically reserved for \fIsystem accounts\fR. ++.IP \fB-r\fR ++This flag instructs \fBgroupadd\fR to add a \fIsystem ++account\fR. The first available \fIgid\fR lower than 499 will be ++automatically selected unless the \fB-g\fR option is also given on the ++command line. ++.br ++This is an option added by Red Hat. ++.IP \fB-f\fR ++This is the \fIforce\fR flag. This will cause \fBgroupadd\fR to exit with an ++error when the group about to be added already exists on the ++system. If that is the case, the group won't be altered (or added ++again). ++.br ++This option also modifies the way \fB-g\fR option works. When you ++request a \fIgid\fR that it is not unique and you don't specify the \fB-o\fR ++option too, the group creation will fall back to the standard behavior ++(adding a group as if neither \fB-g\fR or \fB-o\fR options were ++specified). ++.br ++This is an option added by Red Hat. + .SH FILES + /etc/group \- group account information + .br +--- shadow-4.0.3/src/useradd.c 2002-01-10 08:01:28.000000000 -0500 ++++ shadow-4.0.3/src/useradd.c 2002-11-25 17:11:37.000000000 -0500 @@ -74,7 +74,7 @@ static gid_t def_group = 100; static const char *def_gname = "other"; @@ -199,11 +158,13 @@ static uid_t user_id; static gid_t user_gid; static const char *user_comment = ""; -@@ -119,7 +119,9 @@ +@@ -118,8 +118,10 @@ + Gflg = 0, /* secondary group set for new account */ kflg = 0, /* specify a directory to fill new user directory */ mflg = 0, /* create user's home directory if it doesn't exist */ - nflg = 0, /* create a group having the same name as the user */ +- nflg = 0, /* create a group having the same name as the user */ + Mflg = 0, /* do NOT create user's home directory no matter what */ ++ nflg = 0, /* do NOT create a group having the same name as the user */ oflg = 0, /* permit non-unique user ID to be specified with -u */ + rflg = 0, /* create a system account */ sflg = 0, /* shell program for new account */ @@ -214,7 +175,7 @@ fprintf (stderr, _("[-A program] ")); #endif - fprintf (stderr, _("[-p passwd] name\n")); -+ fprintf (stderr, _("[-p passwd] [-M] [-r] name\n")); ++ fprintf (stderr, _("[-p passwd] [-M] [-n] [-r] name\n")); fprintf (stderr, _(" %s\t-D [-g group] [-b base] [-s shell]\n"), @@ -396,10 +357,10 @@ #ifdef SHADOWPWD -#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:M" -+#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:Mr" ++#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:Mnr" #else -#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:M" -+#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:Mr" ++#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:Mnr" #endif while ((arg = getopt (argc, argv, FLAGS)) != EOF) { #undef FLAGS @@ -416,10 +377,13 @@ case 'o': oflg++; break; -@@ -1345,12 +1409,21 @@ +@@ -1345,12 +1409,24 @@ user_id = get_uid (optarg); uflg++; break; ++ case 'n': ++ nflg++; ++ break; + case 'r': + rflg++; + break; @@ -438,7 +402,7 @@ /* * Certain options are only valid in combination with others. * Check it here so that they can be specified in any order. -@@ -1429,7 +1502,6 @@ +@@ -1429,7 +1505,6 @@ Prog); fail_exit (E_GRP_UPDATE); } @@ -446,7 +410,7 @@ #ifdef SHADOWGRP if (is_shadow_grp && !sgr_close ()) { fprintf (stderr, -@@ -1438,15 +1510,8 @@ +@@ -1438,15 +1513,8 @@ Prog); fail_exit (E_GRP_UPDATE); } @@ -462,7 +426,7 @@ } /* -@@ -1485,6 +1550,31 @@ +@@ -1485,6 +1553,31 @@ exit (E_PW_UPDATE); } #endif @@ -494,7 +458,7 @@ } -@@ -1665,6 +1755,118 @@ +@@ -1665,6 +1758,118 @@ grp_update (); } @@ -613,7 +577,7 @@ /* * create_home - create the user's home directory * -@@ -1785,6 +1987,14 @@ +@@ -1785,6 +1990,14 @@ process_flags (argc, argv); @@ -628,7 +592,7 @@ /* * See if we are messing with the defaults file, or creating * a new user. -@@ -1831,29 +2041,28 @@ +@@ -1831,29 +2044,35 @@ open_files (); @@ -637,6 +601,13 @@ + * gid too ... --gafton */ + find_new_uid (); + ++ /* do we have to add a group for that user? This is why we need to ++ * open the group files in the open_files() function --gafton */ ++ if (! (nflg || gflg)) { ++ find_new_gid(); ++ grp_add(); ++ } ++ usr_update (); if (mflg) { @@ -674,9 +645,71 @@ close_files (); -diff -Nru shadow-4.0.3.orig/src/userdel.c shadow-4.0.3/src/userdel.c ---- shadow-4.0.3.orig/src/userdel.c 2002-01-05 16:41:44.000000000 +0100 -+++ shadow-4.0.3/src/userdel.c 2003-04-22 14:52:07.000000000 +0200 +--- shadow-4.0.3/src/groupadd.c 2002-01-06 09:09:07.000000000 -0500 ++++ shadow-4.0.3/src/groupadd.c 2002-11-25 17:10:10.000000000 -0500 +@@ -71,6 +71,7 @@ + static int oflg = 0; /* permit non-unique group ID to be specified with -g */ + static int gflg = 0; /* ID value for the new group */ + static int fflg = 0; /* if group already exists, do nothing and exit(0) */ ++static int rflg = 0; /* for adding system accounts (Red Hat) */ + + #ifdef NDBM + extern int gr_dbm_mode; +@@ -98,7 +99,7 @@ + + static void usage (void) + { +- fprintf (stderr, _("usage: groupadd [-g gid [-o]] group\n")); ++ fprintf (stderr, _("usage: groupadd [-g gid [-o]] [-r] [-f] group\n")); + exit (E_USAGE); + } + +@@ -224,8 +225,13 @@ + const struct group *grp; + gid_t gid_min, gid_max; + +- gid_min = getdef_unum ("GID_MIN", 100); +- gid_max = getdef_unum ("GID_MAX", 60000); ++ if (!rflg) { ++ gid_min = getdef_unum ("GID_MIN", 500); ++ gid_max = getdef_unum ("GID_MAX", 60000); ++ } else { ++ gid_min = 1; ++ gid_max = getdef_unum ("GID_MIN", 500) - 1; ++ } + + /* + * Start with some GID value if the user didn't provide us with +@@ -333,7 +339,7 @@ + char *cp; + int arg; + +- while ((arg = getopt (argc, argv, "og:O:f")) != EOF) { ++ while ((arg = getopt (argc, argv, "og:O:fr")) != EOF) { + switch (arg) { + case 'g': + gflg++; +@@ -374,11 +380,17 @@ + * "force" - do nothing, just exit(0), if the + * specified group already exists. With -g, if + * specified gid already exists, choose another +- * (unique) gid (turn off -g). Based on the RedHat's ++ * (unique) gid (turn off -g). Based on the Red Hat's + * patch from shadow-utils-970616-9. + */ + fflg++; + break; ++ case 'r': ++ /* ++ * create a system group ++ */ ++ rflg++; ++ break; + default: + usage (); + } +--- shadow-4.0.3/src/userdel.c 2002-01-05 10:41:44.000000000 -0500 ++++ shadow-4.0.3/src/userdel.c 2002-11-25 17:10:10.000000000 -0500 @@ -60,7 +60,9 @@ #define E_HOMEDIR 12 /* can't remove home directory */ static char *user_name; Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-removemalloc.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-removemalloc.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-removemalloc.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -0,0 +1,11 @@ +--- shadow-4.0.3/libmisc/xmalloc.c.removemalloc 1998-12-28 15:34:56.000000000 -0500 ++++ shadow-4.0.3/libmisc/xmalloc.c 2004-06-17 07:32:31.112400832 -0400 +@@ -16,8 +16,6 @@ + + #include "defines.h" + +-extern char *malloc(); +- + char * + xmalloc(size_t size) + { Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-skellink.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-skellink.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-skellink.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -0,0 +1,13 @@ +--- shadow-4.0.3/libmisc/copydir.c.skellink 2001-06-28 20:27:29.000000000 +0200 ++++ shadow-4.0.3/libmisc/copydir.c 2004-10-18 21:37:42.786297512 +0200 +@@ -240,7 +240,9 @@ + dst_orig, oldlink + strlen(src_orig)); + strcpy(oldlink, dummy); + } +- if (symlink(oldlink, dst_name)) { ++ if (symlink(oldlink, dst_name) || ++ lchown (dst_name, uid == (uid_t) -1 ? sb.st_uid:uid, ++ gid == (gid_t) -1 ? sb.st_gid:gid)) { + err++; + break; + } Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-useradd-unlock.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-useradd-unlock.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-useradd-unlock.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -0,0 +1,27 @@ +--- shadow-4.0.3/src/useradd.c.orig 2004-09-27 15:08:10.911090746 -0400 ++++ shadow-4.0.3/src/useradd.c 2004-09-27 15:13:38.175166646 -0400 +@@ -273,6 +273,15 @@ + exit (code); + } + ++static void unlock_all(void) { ++ /* ignore return values about unlocking failures because the ++ * files may already be unlocked, depending on the exit conditions ++ */ ++ (void) gr_unlock(); ++ if (is_shadow_grp) (void) sgr_unlock(); ++ (void) pw_unlock(); ++ if (is_shadow_pwd) (void) spw_unlock(); ++} + + static struct group *getgr_nam_gid (const char *name) + { +@@ -2021,6 +2030,8 @@ + is_shadow_grp = sgr_file_present (); + #endif + ++ atexit(unlock_all); ++ + /* + * The open routines for the NDBM files don't use read-write + * as the mode, so we have to clue them in. Modified: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-utils-selinux.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-utils-selinux.patch 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-utils-selinux.patch 2005-01-13 14:46:37 UTC (rev 5670) @@ -1,16 +1,20 @@ ---- shadow-4.0.3/lib/Makefile.am.selinux 2004-01-21 16:12:54.342392154 -0500 -+++ shadow-4.0.3/lib/Makefile.am 2004-01-21 16:59:56.718109817 -0500 -@@ -1,7 +1,7 @@ +--- shadow-4.0.3/configure.in.selinux 2002-03-13 03:36:40.000000000 -0500 ++++ shadow-4.0.3/configure.in 2004-06-17 07:09:22.249540080 -0400 +@@ -238,6 +239,12 @@ + AC_CHECK_LIB(crypt, crypt, [AC_DEFINE(HAVE_LIBCRYPT) LIBCRYPT=-lcrypt]) + fi - AUTOMAKE_OPTIONS = 1.0 foreign - --DEFS = -+DEFS = -DWITH_SELINUX - INCLUDES = -I$(top_srcdir) - - noinst_LTLIBRARIES = libshadow.la ++AC_SUBST(LIBSELINUX) ++if test "$with_selinux" != "no"; then ++ AC_CHECK_LIB(selinux, is_selinux_enabled, [AC_DEFINE(WITH_SELINUX) ++ LIBSELINUX=-lselinux]) ++fi ++ + AC_SUBST(LIBCRACK) + if test "$with_libcrack" != "no"; then + echo "checking cracklib flavour, don't be surprised by the results" --- shadow-4.0.3/lib/commonio.c.selinux 2001-11-17 08:15:52.000000000 -0500 -+++ shadow-4.0.3/lib/commonio.c 2004-01-21 16:55:13.952746340 -0500 ++++ shadow-4.0.3/lib/commonio.c 2004-06-17 07:45:19.801542320 -0400 @@ -15,7 +15,9 @@ #ifdef HAVE_SHADOW_H #include @@ -33,30 +37,27 @@ if (!db->isopen) { errno = EINVAL; -@@ -627,6 +633,22 @@ +@@ -627,6 +633,19 @@ goto fail; } +#ifdef WITH_SELINUX -+ if (is_selinux_enabled()>0) { -+ if (getfscreatecon(&old_context) < 0) { -+ errors++; -+ goto fail; -+ } -+ if (fgetfilecon(fileno(db->fp),&scontext) < 0) { -+ errors++; -+ goto fail; -+ } -+ if (setfscreatecon(scontext)<0) { -+ errors++; -+ goto fail; -+ } ++ if (is_selinux_enabled() > 0) { ++ if (getfscreatecon(&old_context) < 0) ++ if (security_getenforce()) ++ goto fail; ++ if (fgetfilecon(fileno(db->fp),&scontext) < 0) ++ if (security_getenforce()) ++ goto fail; ++ if (setfscreatecon(scontext) < 0) ++ if (security_getenforce()) ++ goto fail; + } +#endif /* * Create backup file. */ -@@ -683,14 +705,26 @@ +@@ -683,14 +702,26 @@ goto fail; nscd_need_reload = 1; @@ -71,15 +72,15 @@ -fail: +#ifdef WITH_SELINUX + if (scontext != NULL) { -+ if (setfscreatecon(old_context)<0) { -+ errors++; -+ } -+ if (old_context != NULL) { -+ freecon(old_context); -+ old_context=NULL; -+ } -+ freecon(scontext); -+ scontext=NULL; ++ if (setfscreatecon(old_context) < 0) ++ if (security_getenforce()) ++ errors++; ++ if (old_context != NULL) { ++ freecon(old_context); ++ old_context=NULL; ++ } ++ freecon(scontext); ++ scontext=NULL; + } +#endif free_linked_list(db); @@ -89,22 +90,25 @@ --- shadow-4.0.3/src/Makefile.am.selinux 2002-03-10 02:12:52.000000000 -0500 -+++ shadow-4.0.3/src/Makefile.am 2004-01-21 16:12:54.592405425 -0500 -@@ -4,7 +4,7 @@ - ubindir = ${prefix}/bin - usbindir = ${prefix}/sbin - --DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" -+DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" -DWITH_SELINUX - - INCLUDES = -I${top_srcdir} \ - -I${top_srcdir}/lib \ ++++ shadow-4.0.3/src/Makefile.am 2004-06-17 07:10:21.307561896 -0400 @@ -35,7 +35,7 @@ suidubins = chage chfn chsh expiry gpasswd newgrp passwd LDADD = $(top_builddir)/libmisc/libmisc.la \ - $(top_builddir)/lib/libshadow.la -+ $(top_builddir)/lib/libshadow.la -lselinux ++ $(top_builddir)/lib/libshadow.la $(LIBSELINUX) chpasswd_LDADD = $(LDADD) $(LIBPAM) chage_LDADD = $(LDADD) $(LIBPAM) +--- shadow-4.0.3/acconfig.h.selinux 2002-01-06 09:46:07.000000000 -0500 ++++ shadow-4.0.3/acconfig.h 2004-06-17 07:09:22.217544944 -0400 +@@ -51,6 +51,9 @@ + /* Defined if you have libcrack. */ + #undef HAVE_LIBCRACK + ++/* Defined if you have libselinux. */ ++#undef WITH_SELINUX ++ + /* Defined if you have the ts&szs cracklib. */ + #undef HAVE_LIBCRACK_HIST + Modified: tinysofa/releases/1.2/shadow-utils/current/specs/shadow-utils.spec =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/specs/shadow-utils.spec 2005-01-13 05:27:30 UTC (rev 5669) +++ tinysofa/releases/1.2/shadow-utils/current/specs/shadow-utils.spec 2005-01-13 14:46:37 UTC (rev 5670) @@ -3,7 +3,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.3 -Release: 27ts +Release: 28jh 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 @@ -25,7 +25,16 @@ Patch10: shadow-4.0.3-largefile.patch Patch11: shadow-4.0.3-fixref.patch Patch12: shadow-4.0.3-uninitialized.patch -Patch13: 036_CAN-2004-1001_passwd_check.diff +Patch13: shadow-4.0.3-removemalloc.patch +Patch14: shadow-4.0.3-useradd-unlock.patch +Patch15: shadow-4.0.3-chage-selinux.patch +Patch16: shadow-4.0.3-goodname.patch +Patch17: shadow-4.0.3-pl-n_useradd.8.patch +Patch18: shadow-4.0.3-skellink.patch +Patch19: shadow-4.0.3-matchpathcon.patch +Patch20: shadow-4.0.3-maxmem.patch +Patch21: shadow-4.0.3-debuginfo.patch +Patch22: 036_CAN-2004-1001_passwd_check.diff License: BSD Group: main BuildPrereq: autoconf, automake, libtool @@ -56,15 +65,21 @@ %patch5 -p1 -b .mailspool %patch6 -p1 -b .usg %patch7 -p1 -b .shadow-man -%if %{with_selinux} -#SELinux %patch8 -p1 -b .selinux -%endif %patch9 -p1 -b .lastlog-size %patch10 -p1 -b .largefile %patch11 -p1 -b .fixref %patch12 -p1 -b .uninitialized -%patch13 -p1 +%patch13 -p1 -b .removemalloc +%patch14 -p1 -b .useradd-unlock +%patch15 -p1 -b .chage-selinux +%patch16 -p1 -b .goodname +%patch17 -p1 +%patch18 -p1 -b .skellink +%patch19 -p1 -b .matchpathcon +%patch20 -p1 -b .maxmem +%patch21 -p1 -b .debuginfo +%patch22 -p1 rm po/*.gmo # Recode man pages from euc-jp to UTF-8. @@ -87,9 +102,15 @@ } %if %{utf8_man_pages} manconv euc-jp utf-8 man/ja/*.* +manconv iso-8859-1 utf-8 man/de/* +manconv iso-8859-1 utf-8 man/fr/* +manconv iso-8859-1 utf-8 man/it/* +manconv iso-8859-1 utf-8 man/pt_BR/* +manconv iso-8859-2 utf-8 man/hu/* +manconv iso-8859-2 utf-8 man/pl/* %endif -libtoolize --copy --force +libtoolize --force aclocal automake -a autoconf @@ -255,6 +276,10 @@ %changelog +* Thu Jan 13 2005 Jaakko Heinonen 4.0.5-1jh +- add malloc patch to make it compile with gcc 3.4 +- add more patches + * Tue Jan 04 2005 tsintegrate 4.0.3-27ts - current (4.0.3-27jh) integrated as 4.0.3-27ts for release 1.1-U3 From svn at tinysofa.org Thu Jan 13 14:51:56 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 09:51:56 -0500 (EST) Subject: [tinysofa-svn] r5671 - tinysofa/releases/1.2/shadow-utils/current/sources Message-ID: <20050113145156.A2E81344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 09:51:49 -0500 (Thu, 13 Jan 2005) New Revision: 5671 Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-matchpathcon.patch Log: - add missing patch Added: tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-matchpathcon.patch =================================================================== --- tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-matchpathcon.patch 2005-01-13 14:46:37 UTC (rev 5670) +++ tinysofa/releases/1.2/shadow-utils/current/sources/shadow-4.0.3-matchpathcon.patch 2005-01-13 14:51:49 UTC (rev 5671) @@ -0,0 +1,39 @@ +--- shadow-4.0.3/lib/commonio.c.matchpathcon 2004-10-21 14:18:49.000000000 -0400 ++++ shadow-4.0.3/lib/commonio.c 2004-10-21 14:18:54.000000000 -0400 +@@ -611,6 +611,7 @@ + #ifdef WITH_SELINUX + security_context_t old_context=NULL; + security_context_t scontext=NULL; ++ int selinux_enabled=is_selinux_enabled() > 0; + #endif + + if (!db->isopen) { +@@ -634,7 +635,7 @@ + } + + #ifdef WITH_SELINUX +- if (is_selinux_enabled() > 0) { ++ if (selinux_enabled) { + if (getfscreatecon(&old_context) < 0) + if (security_getenforce()) + goto fail; +@@ -662,6 +663,19 @@ + goto fail; + } + } else { ++#ifdef WITH_SELINUX ++ if (selinux_enabled) { ++ if (getfscreatecon(&old_context) < 0) ++ if (security_getenforce()) ++ goto fail; ++ if (matchpathcon(db->filename,0,&scontext) < 0) ++ if (security_getenforce()) ++ goto fail; ++ if (setfscreatecon(scontext) < 0) ++ if (security_getenforce()) ++ goto fail; ++ } ++#endif + /* + * Default permissions for new [g]shadow files. + * (passwd and group always exist...) From svn at tinysofa.org Thu Jan 13 14:53:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 09:53:21 -0500 (EST) Subject: [tinysofa-svn] r5673 - tinysofa/releases/1.2/gcc/current/specs Message-ID: <20050113145321.C6B0B344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 09:52:47 -0500 (Thu, 13 Jan 2005) New Revision: 5673 Modified: tinysofa/releases/1.2/gcc/current/specs/gcc.spec Log: - create symlink for jar - add enable_stack_protector_by_default macro Modified: tinysofa/releases/1.2/gcc/current/specs/gcc.spec =================================================================== --- tinysofa/releases/1.2/gcc/current/specs/gcc.spec 2005-01-13 14:52:16 UTC (rev 5672) +++ tinysofa/releases/1.2/gcc/current/specs/gcc.spec 2005-01-13 14:52:47 UTC (rev 5673) @@ -1,3 +1,5 @@ +%define enable_stack_protector_by_default 0 + %define DATE 20041227 %define gcc_version 3.4.3 %define _unpackaged_files_terminate_build 0 @@ -421,14 +423,17 @@ --disable-libgcj \ %endif %ifarch sparc - --host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7 + --host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7 \ %endif %ifarch ppc - --host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32 + --host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32 \ %endif %ifnarch sparc ppc - --host=%{gcc_target_platform} + --host=%{gcc_target_platform} \ %endif +%if %{enable_stack_protector_by_default} + --enable-stack-protector +%endif #make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap %ifarch %{ix86} x86_64 @@ -836,6 +841,7 @@ pushd $RPM_BUILD_ROOT%{_prefix}/bin mv -f rmiregistry grmiregistry mv -f jar fastjar + ln -s fastjar jar # tinysofa mv -f rmic grmic popd @@ -843,6 +849,7 @@ pushd $RPM_BUILD_ROOT%{_mandir}/man1 mv -f rmiregistry.1 grmiregistry.1 mv -f jar.1 fastjar.1 + ln -s fastjar.1 jar.1 # tinysofa mv -f rmic.1 grmic.1 popd %endif @@ -1163,10 +1170,12 @@ %{_prefix}/bin/jv-convert %{_prefix}/bin/gij %{_prefix}/bin/fastjar +%{_prefix}/bin/jar %{_prefix}/bin/grepjar %{_prefix}/bin/grmic %{_prefix}/bin/grmiregistry %{_mandir}/man1/fastjar.1* +%{_mandir}/man1/jar.1* %{_mandir}/man1/grepjar.1* %{_mandir}/man1/jv-convert.1* %{_mandir}/man1/gij.1* @@ -1287,6 +1296,10 @@ %changelog +* Thu Jan 13 2005 Jaakko Heinonen +- create symlink for jar +- add enable_stack_protector_by_default macro + * Sun Jan 9 2005 Jaakko Heinonen 3.4.3-1jh - tinysofa - add propolice From svn at tinysofa.org Thu Jan 13 15:00:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 10:00:14 -0500 (EST) Subject: [tinysofa-svn] r5674 - in tinysofa/releases/1.2/lvm/current: sources specs Message-ID: <20050113150014.58A6E344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 10:00:03 -0500 (Thu, 13 Jan 2005) New Revision: 5674 Added: tinysofa/releases/1.2/lvm/current/sources/lvm-1.0.8-gcc34.patch Modified: tinysofa/releases/1.2/lvm/current/specs/lvm.spec Log: - add gcc34 patch to make it compile with gcc 3.4 Added: tinysofa/releases/1.2/lvm/current/sources/lvm-1.0.8-gcc34.patch =================================================================== --- tinysofa/releases/1.2/lvm/current/sources/lvm-1.0.8-gcc34.patch 2005-01-13 14:52:47 UTC (rev 5673) +++ tinysofa/releases/1.2/lvm/current/sources/lvm-1.0.8-gcc34.patch 2005-01-13 15:00:03 UTC (rev 5674) @@ -0,0 +1,10 @@ +--- 1.0.8/tools/lib/pv_read_all_pv_of_vg.c.gcc34 2005-01-13 16:57:40.177762684 +0200 ++++ 1.0.8/tools/lib/pv_read_all_pv_of_vg.c 2005-01-13 16:58:16.752956922 +0200 +@@ -130,6 +130,7 @@ + } + pv_this[p] = NULL; + uuid_check_end: ++ continue; + } + for ( pp = 0; pp < p - 2; pp++) { + if ( pv_this[pp] == NULL) { Modified: tinysofa/releases/1.2/lvm/current/specs/lvm.spec =================================================================== --- tinysofa/releases/1.2/lvm/current/specs/lvm.spec 2005-01-13 14:52:47 UTC (rev 5673) +++ tinysofa/releases/1.2/lvm/current/specs/lvm.spec 2005-01-13 15:00:03 UTC (rev 5674) @@ -1,7 +1,7 @@ Summary: LVM tools Name: lvm Version: 1.0.8 -Release: 9ts +Release: 10jh Source0: ftp://ftp.sistina.com/pub/LVM/1.0/%{name}_%{version}.tar.gz Source1: lvm.initd Source2: lvm.sysconfig @@ -9,6 +9,7 @@ Patch1: lvm-installowner.patch Patch2: lvm-1.0.8-kdevt.patch Patch3: lvm-1.0.8-tempfile.patch +Patch4: lvm-1.0.8-gcc34.patch License: GPL Group: main URL: http://www.sistina.com/lvm @@ -33,6 +34,7 @@ %patch1 -p2 %patch2 -p2 %patch3 -p2 -b .tempfile~ +%patch4 -p2 -b .gcc34~ %build @@ -82,6 +84,9 @@ %changelog +* Thu Jan 13 2005 Jaakko Heinonen 1.0.8-10jh +- add gcc34 patch to make it compile with gcc 3.4 + * Sun Nov 14 2004 Jaakko Heinonen - add tempfile patch From svn at tinysofa.org Thu Jan 13 17:01:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 12:01:18 -0500 (EST) Subject: [tinysofa-svn] r5675 - tinysofa/releases/1.2/lvm/current/sources Message-ID: <20050113170118.0F400344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 12:01:11 -0500 (Thu, 13 Jan 2005) New Revision: 5675 Modified: tinysofa/releases/1.2/lvm/current/sources/lvm-1.0.8-gcc34.patch Log: - update gcc3.4 patch Modified: tinysofa/releases/1.2/lvm/current/sources/lvm-1.0.8-gcc34.patch =================================================================== --- tinysofa/releases/1.2/lvm/current/sources/lvm-1.0.8-gcc34.patch 2005-01-13 15:00:03 UTC (rev 5674) +++ tinysofa/releases/1.2/lvm/current/sources/lvm-1.0.8-gcc34.patch 2005-01-13 17:01:11 UTC (rev 5675) @@ -1,5 +1,29 @@ ---- 1.0.8/tools/lib/pv_read_all_pv_of_vg.c.gcc34 2005-01-13 16:57:40.177762684 +0200 -+++ 1.0.8/tools/lib/pv_read_all_pv_of_vg.c 2005-01-13 16:58:16.752956922 +0200 +--- LVM/1.0.8/tools/lib/pv_write_uuidlist.c.gcc34 2005-01-13 18:58:17.545428404 +0200 ++++ LVM/1.0.8/tools/lib/pv_write_uuidlist.c 2005-01-13 18:58:45.042059772 +0200 +@@ -71,8 +71,8 @@ + + /* Create/fix UUIDs for any PVs that need it */ + if (lvm_check_uuid(pv->pv_uuid) < 0) { +- debug(__FUNCTION__ " -- creating new UUID for PV %s\n", +- pv->pv_name); ++ debug("%s -- creating new UUID for PV %s\n", ++ __func__, pv->pv_name); + memset(pv->pv_uuid, 0, sizeof(pv->pv_uuid)); + memcpy(pv->pv_uuid, lvm_create_uuid(UUID_LEN), UUID_LEN); + } +--- LVM/1.0.8/tools/lib/pv_read_uuidlist.c.gcc34 2005-01-13 18:50:10.089049759 +0200 ++++ LVM/1.0.8/tools/lib/pv_read_uuidlist.c 2005-01-13 18:56:15.491136355 +0200 +@@ -50,7 +50,7 @@ + static char *this_pv_uuidlist = NULL; + int num; + +- debug_enter(__FUNCTION__ " -- CALLED with %s\n", pv ? pv->pv_name : "NULL"); ++ debug_enter("%s -- CALLED with %s\n", __func__, pv ? pv->pv_name : "NULL"); + + if (pv == NULL || pv_uuidlist == NULL) + return -LVM_EPARAM; +--- LVM/1.0.8/tools/lib/pv_read_all_pv_of_vg.c.gcc34 2005-01-13 16:57:40.177762684 +0200 ++++ LVM/1.0.8/tools/lib/pv_read_all_pv_of_vg.c 2005-01-13 16:58:16.752956922 +0200 @@ -130,6 +130,7 @@ } pv_this[p] = NULL; From svn at tinysofa.org Thu Jan 13 18:03:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 13:03:18 -0500 (EST) Subject: [tinysofa-svn] r5676 - tinysofa/releases/1.2/netconfig/current/specs Message-ID: <20050113180318.B69C3344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 13:03:12 -0500 (Thu, 13 Jan 2005) New Revision: 5676 Modified: tinysofa/releases/1.2/netconfig/current/specs/netconfig.spec Log: - add pump-devel subpackage Modified: tinysofa/releases/1.2/netconfig/current/specs/netconfig.spec =================================================================== --- tinysofa/releases/1.2/netconfig/current/specs/netconfig.spec 2005-01-13 17:01:11 UTC (rev 5675) +++ tinysofa/releases/1.2/netconfig/current/specs/netconfig.spec 2005-01-13 18:03:12 UTC (rev 5676) @@ -11,7 +11,17 @@ %description A text-based tool for simple configuration of ethernet devices. +%package -n pump-devel +Summary: Development tools for sending DHCP and BOOTP requests. +Group: development +%description -n pump-devel +The pump-devel package provides system developers the ability to send +BOOTP and DHCP requests from their programs. BOOTP and DHCP are +protocols used to provide network configuration information to +networked machines. + + %prep %setup -q -n pump-%{version} @@ -24,7 +34,11 @@ %{__mkdir_p} %{buildroot}%{_sbindir} %{__install} -m 0755 netconfig %{buildroot}%{_sbindir}/netconfig +%{__mkdir_p} %{buildroot}%{_libdir} %{buildroot}%{_includedir} +%{__install} -m 0644 libpump.a %{buildroot}%{_libdir} +%{__install} -m 0644 pump.h %{buildroot}%{_includedir} + %clean %clean_buildroot @@ -33,8 +47,16 @@ %defattr(-,root,root) %{_sbindir}/netconfig +%files -n pump-devel +%defattr(-,root,root) +%{_libdir}/libpump.a +%{_includedir}/pump.h + %changelog +* Thu Jan 13 2005 Jaakko Heinonen +- add pump-devel subpackage + * Tue Jan 11 2005 Jaakko Heinonen 0.8.20-3jh - netconfig only From svn at tinysofa.org Thu Jan 13 18:04:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 13:04:18 -0500 (EST) Subject: [tinysofa-svn] r5677 - in tinysofa/releases/1.2: bind/current/sources bind/current/specs glib/current/specs mysql/current/specs Message-ID: <20050113180418.00C5F344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 13:03:59 -0500 (Thu, 13 Jan 2005) New Revision: 5677 Removed: tinysofa/releases/1.2/bind/current/sources/bind-9.2.4.tar.gz.asc Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec tinysofa/releases/1.2/glib/current/specs/glib.spec tinysofa/releases/1.2/mysql/current/specs/mysql.spec Log: - misc fixes Deleted: tinysofa/releases/1.2/bind/current/sources/bind-9.2.4.tar.gz.asc =================================================================== --- tinysofa/releases/1.2/bind/current/sources/bind-9.2.4.tar.gz.asc 2005-01-13 18:03:12 UTC (rev 5676) +++ tinysofa/releases/1.2/bind/current/sources/bind-9.2.4.tar.gz.asc 2005-01-13 18:03:59 UTC (rev 5677) @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (Darwin) - -iD8DBQBBUaL8Z5EvUMN1X/cRApqTAJ9PfE0n7zw203iSzmvO+Opx27P9zACdEo3W -Hjy/2gayNoIzCpNrCNWGiE8= -=bhe3 ------END PGP SIGNATURE----- Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.2/bind/current/specs/bind.spec 2005-01-13 18:03:12 UTC (rev 5676) +++ tinysofa/releases/1.2/bind/current/specs/bind.spec 2005-01-13 18:03:59 UTC (rev 5677) @@ -11,7 +11,7 @@ License: BSD Like URL: http://www.isc.org/bind.html Source0: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz -Source1: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz.asc +#Source1: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz.asc Source2: named.conf.non-root.example Source3: named.sysconfig #Source5: resolver.5.gz Modified: tinysofa/releases/1.2/glib/current/specs/glib.spec =================================================================== --- tinysofa/releases/1.2/glib/current/specs/glib.spec 2005-01-13 18:03:12 UTC (rev 5676) +++ tinysofa/releases/1.2/glib/current/specs/glib.spec 2005-01-13 18:03:59 UTC (rev 5677) @@ -75,7 +75,7 @@ %postun -p /sbin/ldconfig - #-f glib20.lang + %files %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-01-13 18:03:12 UTC (rev 5676) +++ tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-01-13 18:03:59 UTC (rev 5677) @@ -1,4 +1,5 @@ %define mysqld_user mysql +%define mysqld_uid 101 %define mysql_datadir %{_localstatedir}/lib/mysql/ Summary: A SQL database engine @@ -88,46 +89,38 @@ %prep %setup -q -n %{name}-%{version} - %patch -p1 -b .fixpath %build -export CC="${MYSQL_BUILD_CC:-gcc}" -export CXX="${MYSQL_BUILD_CXX:-gcc}" -export CFLAGS="${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS}" -export CXXFLAGS="${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}" -./configure \ - --prefix=/ \ - --exec-prefix=%{_exec_prefix} \ - --datadir=%{_datadir} \ - --libexecdir=%{_sbindir} \ - --localstatedir=%{mysql_datadir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - --enable-assembler \ - --with-pic \ - --enable-local-infile \ - --enable-shared \ - --enable-thread-safe-client \ - --with-berkeley-db \ - --with-comment="tinysofa MySQL RPM" \ - --with-extra-charsets=complex \ - --with-innodb \ - --with-raid \ - --with-openssl \ - --with-readline \ - --sysconfdir=%{_sysconfdir} \ - --with-mysqld-user=%{mysqld_user} \ - --with-unix-socket-path=/var/run/mysql/mysql.sock \ - # Does not work as of MySQL 4.0.12 - # --with-libwrap - # Add this for more debugging support - # --with-debug +CC="gcc" +CXX="gcc" +CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +CXXFLAGS="$CFLAGS -fno-rtti -fno-exceptions" +LDFLAGS="-lstdc++" +export CC CXX CFLAGS CXXFLAGS LDFLAGS +%configure \ + --libexecdir=%{_sbindir} \ + --localstatedir=%{mysql_datadir} \ + --enable-assembler \ + --with-pic \ + --enable-local-infile \ + --enable-shared \ + --enable-thread-safe-client \ + --with-berkeley-db \ + --with-comment="tinysofa MySQL RPM" \ + --with-extra-charsets=complex \ + --with-innodb \ + --with-raid \ + --with-openssl \ + --with-readline \ + --sysconfdir=%{_sysconfdir} \ + --with-mysqld-user=%{mysqld_user} \ + --with-unix-socket-path=/var/run/mysql/mysql.sock \ + --enable-large-file=yes --enable-largefile=yes + %make benchdir_root=$RPM_BUILD_ROOT%{_datadir}/ @@ -139,7 +132,7 @@ install -d $RBR%{_initrddir} install -d $RBR%{mysql_datadir}/mysql -make install-strip DESTDIR=$RBR benchdir_root=%{_datadir}/ +make install DESTDIR=$RBR benchdir_root=%{_datadir}/ # Install logrotate and autostart install -m644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql @@ -160,13 +153,9 @@ %pre -if test -x %{_initrddir}/mysql -then - %{_initrddir}/mysql stop > /dev/null 2>&1 - sleep 5 -fi +%groupadd %{mysqld_user} %{mysqld_uid} +%useradd %{mysqld_user} %{mysqld_uid} -d %{mysql_datadir} -s /bin/bash -c MySQL - %post mysql_datadir=%{mysql_datadir} @@ -178,17 +167,6 @@ # Add mysql to the chkconfig overview %service_post mysql -# Check whether we need to add mysql group -if [ -z "`getent group %{mysqld_user}`" ] ; then - /usr/sbin/groupadd -g 101 %{mysqld_user} -fi - -# Check whether we need to add mysql user -if [ -z "`getent passwd %{mysqld_user}`" ] ; then - /usr/sbin/useradd -u 101 -m -g %{mysqld_user} -d $mysql_datadir \ - -s /bin/bash -c "MySQL server" %{mysqld_user} -fi - # Change permissions so that the user that will run the MySQL daemon # owns all database files. chown -R %{mysqld_user}.%{mysqld_user} $mysql_datadir @@ -206,9 +184,6 @@ # Take care of info pages %info_post -# Allow mysqld_safe to start mysqld and print a message before we exit -sleep 2 - %preun %service_preun mysql # We do not remove the mysql user since it may still own a lot of @@ -216,7 +191,6 @@ %postun %service_postun mysql -# Take care of info pages %info_postun %post libs -p /sbin/ldconfig @@ -332,6 +306,11 @@ %changelog +* Thu Jan 13 2005 Jaakko Heinonen +- rework rpm scripts +- disable raid support for now +- other spec cleanups + * Wed Oct 13 2004 Jaakko Heinonen 4.0.21-3jh - disable initgroups hack as updated nss_ldap should work with mysql From svn at tinysofa.org Thu Jan 13 18:56:12 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 13:56:12 -0500 (EST) Subject: [tinysofa-svn] r5678 - in tinysofa/releases/1.2/dietlibc/current: sources specs Message-ID: <20050113185612.96A59344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 13:56:00 -0500 (Thu, 13 Jan 2005) New Revision: 5678 Added: tinysofa/releases/1.2/dietlibc/current/sources/dietlibc-0.27-nonnull.patch tinysofa/releases/1.2/dietlibc/current/sources/dietlibc-0.27-signal.patch Modified: tinysofa/releases/1.2/dietlibc/current/specs/dietlibc.spec Log: - add patches for gcc 3.4 Added: tinysofa/releases/1.2/dietlibc/current/sources/dietlibc-0.27-nonnull.patch =================================================================== --- tinysofa/releases/1.2/dietlibc/current/sources/dietlibc-0.27-nonnull.patch 2005-01-13 18:03:59 UTC (rev 5677) +++ tinysofa/releases/1.2/dietlibc/current/sources/dietlibc-0.27-nonnull.patch 2005-01-13 18:56:00 UTC (rev 5678) @@ -0,0 +1,13 @@ +--- dietlibc-0.27/include/sys/cdefs.h.nonnull 2004-09-23 12:14:58.089296912 -0400 ++++ dietlibc-0.27/include/sys/cdefs.h 2004-09-23 12:15:41.433707560 -0400 +@@ -63,4 +63,10 @@ + #define __deprecated__ + #endif + ++#if (__GNUC_ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) ++# define __nonnull(params) __attribute__ ((__nonnull__ params)) ++#else ++# define __nonnull(params) ++#endif ++ + #endif Added: tinysofa/releases/1.2/dietlibc/current/sources/dietlibc-0.27-signal.patch =================================================================== --- tinysofa/releases/1.2/dietlibc/current/sources/dietlibc-0.27-signal.patch 2005-01-13 18:03:59 UTC (rev 5677) +++ tinysofa/releases/1.2/dietlibc/current/sources/dietlibc-0.27-signal.patch 2005-01-13 18:56:00 UTC (rev 5678) @@ -0,0 +1,41 @@ +--- dietlibc-0.27/i386/sigaction.c.signal 2004-10-18 17:15:13.059357448 -0400 ++++ dietlibc-0.27/i386/sigaction.c 2004-10-20 11:01:28.999739696 -0400 +@@ -0,0 +1,38 @@ ++#include ++#include ++#include ++#include ++ ++#define RESTORE(name, syscall) RESTORE2 (name, syscall) ++#define RESTORE2(name, syscall) \ ++asm \ ++ ( \ ++ ".text\n" \ ++ " .align 8\n" \ ++ "__" #name ":\n" \ ++ " popl %eax\n" \ ++ " movl $" #syscall ", %eax\n" \ ++ " int $0x80" \ ++ ); ++ ++RESTORE (restore_rt, __NR_rt_sigreturn) ++RESTORE (restore, __NR_sigreturn) ++ ++extern void restore_rt (void) asm ("__restore_rt"); ++extern void restore (void) asm ("__restore"); ++ ++int __libc_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact); ++int __libc_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact) { ++ struct sigaction *newact = (struct sigaction *)act; ++ if (act) { ++ newact = alloca(sizeof(*newact)); ++ newact->sa_handler = act->sa_handler; ++ newact->sa_flags = act->sa_flags | SA_RESTORER; ++ newact->sa_restorer = &restore; ++ newact->sa_mask = act->sa_mask; ++ } ++ return __rt_sigaction(signum, newact, oldact, _NSIG/8); ++} ++ ++int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact) ++__attribute__((weak,alias("__libc_sigaction"))); Modified: tinysofa/releases/1.2/dietlibc/current/specs/dietlibc.spec =================================================================== --- tinysofa/releases/1.2/dietlibc/current/specs/dietlibc.spec 2005-01-13 18:03:59 UTC (rev 5677) +++ tinysofa/releases/1.2/dietlibc/current/specs/dietlibc.spec 2005-01-13 18:56:00 UTC (rev 5678) @@ -4,7 +4,7 @@ Summary: A small libc implementation Name: dietlibc Version: 0.27 -Release: 1ts +Release: 2jh Group: development License: GPL Url: http://www.fefe.de/dietlibc/ @@ -15,6 +15,8 @@ Patch2: dietlibc-0.21-ppc64asppc.patch Patch3: dietlibc-0.24-gnuokay.patch Patch4: dietlibc-0.25-old-qsort.patch +Patch5: dietlibc-0.27-nonnull.patch +Patch6: dietlibc-0.27-signal.patch %description A small libc implementation @@ -27,6 +29,8 @@ %patch2 -p1 -b .ppc %patch3 -p1 -b .gnuokay %patch4 -p1 -b .oldqsort +%patch5 -p1 -b .nonnull +%patch6 -p1 -b .signal %build @@ -48,6 +52,9 @@ %changelog +* Thu Jan 13 2005 Jaakko Heinonen 0.27-2jh +- add patches for gcc 3.4 + * Tue Jan 04 2005 tsintegrate 0.27-1ts - current (0.27-1jh) integrated as 0.27-1ts for release 1.1-U3 From svn at tinysofa.org Thu Jan 13 20:22:48 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 13 Jan 2005 15:22:48 -0500 (EST) Subject: [tinysofa-svn] r5679 - tinysofa/releases/1.2/bind/current/specs Message-ID: <20050113202248.AA712344130@minbar.tinysofa.org> Author: jh Date: 2005-01-13 15:22:42 -0500 (Thu, 13 Jan 2005) New Revision: 5679 Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec Log: - suppress rndc-keygen output in %post Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.2/bind/current/specs/bind.spec 2005-01-13 18:56:00 UTC (rev 5678) +++ tinysofa/releases/1.2/bind/current/specs/bind.spec 2005-01-13 20:22:42 UTC (rev 5679) @@ -309,7 +309,7 @@ chmod 600 %{jail}%{_sysconfdir}/rndc.key chown named.root %{jail}%{_sysconfdir}/rndc.key else - /usr/sbin/rndc-confgen -a -t %{jail} -u named + /usr/sbin/rndc-confgen -a -t %{jail} -u named 2>&1 > /dev/null fi fi # -f = is file, it should be a symlink! From svn at tinysofa.org Fri Jan 14 08:00:58 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 14 Jan 2005 03:00:58 -0500 (EST) Subject: [tinysofa-svn] r5680 - in contrib/1.1/icewm/current: sources specs Message-ID: <20050114080058.3A573344130@minbar.tinysofa.org> Author: jh Date: 2005-01-14 03:00:26 -0500 (Fri, 14 Jan 2005) New Revision: 5680 Added: contrib/1.1/icewm/current/sources/icewm-1.2.20.tar.gz Removed: contrib/1.1/icewm/current/sources/icewm-1.2.16.tar.gz Modified: contrib/1.1/icewm/current/specs/icewm.spec Log: - 1.2.20 Deleted: contrib/1.1/icewm/current/sources/icewm-1.2.16.tar.gz =================================================================== (Binary files differ) Added: contrib/1.1/icewm/current/sources/icewm-1.2.20.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.1/icewm/current/sources/icewm-1.2.20.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/icewm/current/specs/icewm.spec =================================================================== --- contrib/1.1/icewm/current/specs/icewm.spec 2005-01-13 20:22:42 UTC (rev 5679) +++ contrib/1.1/icewm/current/specs/icewm.spec 2005-01-14 08:00:26 UTC (rev 5680) @@ -1,7 +1,7 @@ Summary: A fast, small X Window System window manager. Name: icewm -Version: 1.2.16 -Release: 5jh +Version: 1.2.20 +Release: 1jh License: LGPL Group: contrib Source0: %{name}-%{version}.tar.gz @@ -89,6 +89,9 @@ %changelog +* Fri Jan 14 2005 Jaakko Heinonen 1.2.20-1jh +- 1.2.20 + * Thu Oct 7 2004 Jaakko Heinonen 1.2.16-5jh - add icon directory /usr/share/icewm/icons to default config From svn at tinysofa.org Fri Jan 14 08:43:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 14 Jan 2005 03:43:47 -0500 (EST) Subject: [tinysofa-svn] r5681 - tinysofa/releases/1.2/mysql/current/specs Message-ID: <20050114084347.62FA3344122@minbar.tinysofa.org> Author: jh Date: 2005-01-14 03:43:40 -0500 (Fri, 14 Jan 2005) New Revision: 5681 Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec Log: - %post fixes Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-01-14 08:00:26 UTC (rev 5680) +++ tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-01-14 08:43:40 UTC (rev 5681) @@ -157,6 +157,11 @@ %useradd %{mysqld_user} %{mysqld_uid} -d %{mysql_datadir} -s /bin/bash -c MySQL %post +%service_post mysql +%info_post + +[ $1 -gt 1 ] && exit 0 + mysql_datadir=%{mysql_datadir} # Create data directory if needed @@ -164,15 +169,12 @@ if test ! -d $mysql_datadir/mysql; then mkdir $mysql_datadir/mysql; fi if test ! -d $mysql_datadir/test; then mkdir $mysql_datadir/test; fi -# Add mysql to the chkconfig overview -%service_post mysql - # Change permissions so that the user that will run the MySQL daemon # owns all database files. chown -R %{mysqld_user}.%{mysqld_user} $mysql_datadir # Initiate databases -mysql_install_db -IN-RPM +mysql_install_db --rpm --user=%{mysqld_user} # Change permissions again to fix any new files. chown -R %{mysqld_user}:%{mysqld_user} $mysql_datadir @@ -181,9 +183,6 @@ # can read them. chmod -R og-rw $mysql_datadir/mysql -# Take care of info pages -%info_post - %preun %service_preun mysql # We do not remove the mysql user since it may still own a lot of From svn at tinysofa.org Fri Jan 14 08:50:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 14 Jan 2005 03:50:44 -0500 (EST) Subject: [tinysofa-svn] r5682 - in tinysofa/releases/1.2/openswan/current: sources specs Message-ID: <20050114085044.623AE344122@minbar.tinysofa.org> Author: jh Date: 2005-01-14 03:48:55 -0500 (Fri, 14 Jan 2005) New Revision: 5682 Added: tinysofa/releases/1.2/openswan/current/sources/openswan-2.3.0.tar.gz Removed: tinysofa/releases/1.2/openswan/current/sources/openswan-2.2.0.tar.gz Modified: tinysofa/releases/1.2/openswan/current/specs/openswan.spec Log: - 2.3.0 Deleted: tinysofa/releases/1.2/openswan/current/sources/openswan-2.2.0.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/openswan/current/sources/openswan-2.3.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/openswan/current/sources/openswan-2.3.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/openswan/current/specs/openswan.spec =================================================================== --- tinysofa/releases/1.2/openswan/current/specs/openswan.spec 2005-01-14 08:43:40 UTC (rev 5681) +++ tinysofa/releases/1.2/openswan/current/specs/openswan.spec 2005-01-14 08:48:55 UTC (rev 5682) @@ -1,7 +1,7 @@ Summary: A free ipsec VPN solution for Linux Name: openswan -Version: 2.2.0 -Release: 1ts +Version: 2.3.0 +Release: 1jh License: GPL Group: main URL: http://www.openswan.org/ From svn at tinysofa.org Fri Jan 14 12:53:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 14 Jan 2005 07:53:54 -0500 (EST) Subject: [tinysofa-svn] r5683 - tinysofa/releases/1.2/krb5/current/specs Message-ID: <20050114125354.2C475344130@minbar.tinysofa.org> Author: jh Date: 2005-01-14 07:53:47 -0500 (Fri, 14 Jan 2005) New Revision: 5683 Removed: tinysofa/releases/1.2/krb5/current/specs/kerberos5.spec Log: - not needed anymore Deleted: tinysofa/releases/1.2/krb5/current/specs/kerberos5.spec =================================================================== --- tinysofa/releases/1.2/krb5/current/specs/kerberos5.spec 2005-01-14 08:48:55 UTC (rev 5682) +++ tinysofa/releases/1.2/krb5/current/specs/kerberos5.spec 2005-01-14 12:53:47 UTC (rev 5683) @@ -1,156 +0,0 @@ -Summary: Kerberos is a network authentication protocol. -Name: kerberos5 -Version: 1.3.4 -Release: 2ts -Group: main -Source0: krb5-%{version}.tar.gz -Patch0: http://web.mit.edu/kerberos/advisories/2004-002-dblfree_patch.txt -Patch1: http://web.mit.edu/kerberos/advisories/2004-003-patch_1.3.4.txt -URL: http://web.mit.edu/kerberos -License: Distributable -Requires: libcom_err libtermcap ncurses -BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel -BuildRoot: %{_tmppath}/%{name}-root - -%description -(MIT) Kerberos is a network authentication protocol. It is designed to provide -strong authentication for client/server applications by using secret-key -cryptography. A free implementation of this protocol is available from the -Massachusetts Institute of Technology. Kerberos is available in many commercial -products as well. - -%package devel -Group: development -Summary: Development libraries for kerberos 5 -Requires: %{name}-libs -Requires: libcom_err-devel - -%description devel -The kerberos5-devel package contains the development libraries and header files -for MIT kerberos5. - -%package libs -Group: main -Summary: Kerberos libraries - -%description libs -The kerberos5-libs package contains the kerberos5 libraries. - - -%prep -%setup -q -n krb5-%{version} -%patch0 -p0 -b .dblfree-2004-002 -%patch1 -p0 -b .asn1buf-2004-003 - - -%build -pushd src -export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et" -export CFLAGS="$CFLAGS -DKRB5_DNS_LOOKUP=1" -%configure \ - --enable-shared \ - --program-prefix=krb5 \ - --with-system-et \ - --enable-dns \ - --with-netlib=-lresolv - -%make -popd - -%install -pushd src -%makeinstall_std -popd - - -%clean -%clean_buildroot - - -%files -%defattr(-,root,root) -%attr(755,root,root) %{_bindir}/* -%{_sbindir}/* -%{_datadir}/gnats -%{_mandir}/man8/* -%{_mandir}/man1/* -%{_mandir}/man5/* -%{_mandir}/man5/.k5login.5* - -%files libs -%attr(755,root,root) %{_libdir}/*.so.* - -%files devel -%defattr(-,root,root) -%{_includedir}/* -%attr(644,root,root) %{_libdir}/*.a -%attr(755,root,root) %{_libdir}/*.so - - -%changelog -* Sat Sep 04 2004 tsintegrate 1.3.4-2ts -- current (1.3.4-2jh) integrated as 1.3.4-2ts for release 1.1-U1 - -* Tue Aug 31 2004 Jaakko Heinonen -- MITKRB5-SA-2004-002 and MITKRB5-SA-2004-003 security fixes - -* Thu Aug 19 2004 Jaakko Heinonen -- 1.3.4 -- spec cleanup - -* Thu Aug 05 2004 tsintegrate 1.3.3-5ts -- current (1.3.3-5jh) integrated as 1.3.3-5ts for release 1.1 - -* Fri Jun 18 2004 tsintegrate 1.3.3-4ts -- current (1.3.3-3ts) integrated as 1.3.3-4ts for release 1.0-U2 - -* Fri Jun 18 2004 Omar Kilani -- Update MIT patch to latest version of vuln fix. - -* Wed Jun 02 2004 tsintegrate 1.3.3-3ts -- current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1 - -* Wed Jun 02 2004 Omar Kilani 1.3.3-3ok -- Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln. - -* Mon May 24 2004 tsintegrate 1.3.3-2ts -- current (1.3.3-2jh) integrated as 1.3.3-2ts for release 1.0-U1 - -* Sun May 23 2004 Jaakko Heinonen 1.3.3-2jh -- fix permissions for /usr/bin/krb5ksu and /usr/bin/krb5v4rcp - -* Wed May 19 2004 tsintegrate 1.3.3-1ts -- current (1.3.3-1ok) integrated as 1.3.3-1ts for release 1.0-U1 - -* Thu May 13 2004 Omar Kilani 1.3.3-1ok -- New Upstream. - -* Tue May 11 2004 Omar Kilani -- Add BuildRequires: byacc libtermcap-devel ncurses-devel -- Add Requires: libtermcap ncurses -- Add Requires: libcom_err-devel to devel sub package. - -* Mon May 10 2004 Jaakko Heinonen 1.3.2-4jh -- fixed permissions for library files - -* Mon May 03 2004 Omar Kilani 1.3.2-3ts -- Rebuild - -* Mon May 03 2004 Jaakko Heinonen 1.3.2-2jh -- fixed permissions for manual and include files - -* Wed Apr 07 2004 Omar Kilani 1.3.2-1ts -- New upstream. - -* Tue Feb 11 2004 Tor Hveem 1.3.1-4th -- Fixed stupid error with file wildcards. - -* Tue Feb 10 2004 Tor Hveem 1.3.1-3th -- New package libs. - -* Mon Feb 9 2004 Chr. Toldnes 1.3.1-2tr -- Use system et (libcom_err) - -* Mon Feb 9 2004 Chr. Toldnes 1.3.1-1tr -- Initial release for Trustix -- built shared :) with no stack protection :( From svn at tinysofa.org Fri Jan 14 13:05:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 14 Jan 2005 08:05:02 -0500 (EST) Subject: [tinysofa-svn] r5684 - tinysofa/releases/1.2/grsecurity/current/specs Message-ID: <20050114130502.807F5344130@minbar.tinysofa.org> Author: jh Date: 2005-01-14 08:04:55 -0500 (Fri, 14 Jan 2005) New Revision: 5684 Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - don't strip Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-14 12:53:47 UTC (rev 5683) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-14 13:04:55 UTC (rev 5684) @@ -38,7 +38,7 @@ %install -%makeinstall_std MKNOD=/bin/true +%makeinstall_std MKNOD=/bin/true STRIP=/bin/true touch %{buildroot}%{_sysconfdir}/grsec/pw From svn at tinysofa.org Fri Jan 14 13:31:30 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 14 Jan 2005 08:31:30 -0500 (EST) Subject: [tinysofa-svn] r5685 - in tinysofa/releases/1.2: nasm/current/specs ncurses/current/specs Message-ID: <20050114133130.CEDB2344130@minbar.tinysofa.org> Author: jh Date: 2005-01-14 08:31:17 -0500 (Fri, 14 Jan 2005) New Revision: 5685 Modified: tinysofa/releases/1.2/nasm/current/specs/nasm.spec tinysofa/releases/1.2/ncurses/current/specs/ncurses.spec Log: - disable parallel make Modified: tinysofa/releases/1.2/nasm/current/specs/nasm.spec =================================================================== --- tinysofa/releases/1.2/nasm/current/specs/nasm.spec 2005-01-14 13:04:55 UTC (rev 5684) +++ tinysofa/releases/1.2/nasm/current/specs/nasm.spec 2005-01-14 13:31:17 UTC (rev 5685) @@ -35,7 +35,7 @@ %build %configure -%make everything +%make -j1 everything %install Modified: tinysofa/releases/1.2/ncurses/current/specs/ncurses.spec =================================================================== --- tinysofa/releases/1.2/ncurses/current/specs/ncurses.spec 2005-01-14 13:04:55 UTC (rev 5684) +++ tinysofa/releases/1.2/ncurses/current/specs/ncurses.spec 2005-01-14 13:31:17 UTC (rev 5685) @@ -89,7 +89,7 @@ --with-install-prefix=${RPM_BUILD_ROOT} \ --libdir=/%{_lib} -%make +%make -j1 cd .. %install From svn at tinysofa.org Fri Jan 14 21:05:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 14 Jan 2005 16:05:02 -0500 (EST) Subject: [tinysofa-svn] r5686 - tinysofa/releases/1.2/dialog/current/specs Message-ID: <20050114210502.11DB6344130@minbar.tinysofa.org> Author: jh Date: 2005-01-14 16:04:55 -0500 (Fri, 14 Jan 2005) New Revision: 5686 Modified: tinysofa/releases/1.2/dialog/current/specs/dialog.spec Log: - disable parallel make Modified: tinysofa/releases/1.2/dialog/current/specs/dialog.spec =================================================================== --- tinysofa/releases/1.2/dialog/current/specs/dialog.spec 2005-01-14 13:31:17 UTC (rev 5685) +++ tinysofa/releases/1.2/dialog/current/specs/dialog.spec 2005-01-14 21:04:55 UTC (rev 5686) @@ -25,7 +25,7 @@ %build -%make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +%make -j1 RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %install From svn at tinysofa.org Fri Jan 14 22:10:13 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 14 Jan 2005 17:10:13 -0500 (EST) Subject: [tinysofa-svn] r5687 - tinysofa/releases/1.2/gnupg/current/specs Message-ID: <20050114221013.C574D344130@minbar.tinysofa.org> Author: jh Date: 2005-01-14 17:10:07 -0500 (Fri, 14 Jan 2005) New Revision: 5687 Modified: tinysofa/releases/1.2/gnupg/current/specs/gnupg.spec Log: - disable capabilites as it breaks things Modified: tinysofa/releases/1.2/gnupg/current/specs/gnupg.spec =================================================================== --- tinysofa/releases/1.2/gnupg/current/specs/gnupg.spec 2005-01-14 21:04:55 UTC (rev 5686) +++ tinysofa/releases/1.2/gnupg/current/specs/gnupg.spec 2005-01-14 22:10:07 UTC (rev 5687) @@ -9,7 +9,7 @@ Source2: gnupg-index.html URL: http://www.gnupg.org Provides: gpg openpgp gnupg -BuildRequires: openldap-devel zlib-devel bzip2-devel libcap-devel perl +BuildRequires: openldap-devel zlib-devel bzip2-devel perl %info_requires BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -48,8 +48,7 @@ --with-mailprog=/usr/sbin/sendmail \ --disable-nls \ --with-zlib \ - --with-bzip2 \ - --with-capabilities + --with-bzip2 %make From svn at tinysofa.org Sat Jan 15 12:35:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 15 Jan 2005 07:35:59 -0500 (EST) Subject: [tinysofa-svn] r5688 - in tinysofa/releases/1.2/squid/current: sources specs Message-ID: <20050115123559.DD0DB344130@minbar.tinysofa.org> Author: jh Date: 2005-01-15 07:35:47 -0500 (Sat, 15 Jan 2005) New Revision: 5688 Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-gopher_html_parsing.patch tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-wccp_denial_of_service.patch Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec Log: - fix An error in the handling of invalid field values in "WCCP_I_SEE_YOU" - messages - fix a boundary error in the "gopherToHTML()" function Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-gopher_html_parsing.patch =================================================================== --- tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-gopher_html_parsing.patch 2005-01-14 22:10:07 UTC (rev 5687) +++ tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-gopher_html_parsing.patch 2005-01-15 12:35:47 UTC (rev 5688) @@ -0,0 +1,18 @@ +Index: squid/src/gopher.c +diff -c squid/src/gopher.c:1.162.2.7 squid/src/gopher.c:1.162.2.8 +*** squid/src/gopher.c:1.162.2.7 Sat Nov 29 01:38:36 2003 +--- squid/src/gopher.c Tue Jan 11 23:04:01 2005 +*************** +*** 342,347 **** +--- 342,352 ---- + if (gopherState->len != 0) { + /* there is something left from last tx. */ + xstrncpy(line, gopherState->buf, gopherState->len + 1); ++ if (gopherState->len + len > TEMP_BUF_SIZE) { ++ debug(10, 1) ("GopherHTML: Buffer overflow. Lost some data on URL: %s\n", ++ storeUrl(entry)); ++ len = TEMP_BUF_SIZE - gopherState->len; ++ } + lpos = (char *) memccpy(line + gopherState->len, inbuf, '\n', len); + if (lpos) + *lpos = '\0'; Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-wccp_denial_of_service.patch =================================================================== --- tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-wccp_denial_of_service.patch 2005-01-14 22:10:07 UTC (rev 5687) +++ tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-wccp_denial_of_service.patch 2005-01-15 12:35:47 UTC (rev 5688) @@ -0,0 +1,56 @@ +Index: squid/src/wccp.c +diff -c squid/src/wccp.c:1.19.2.5 squid/src/wccp.c:1.19.2.6 +*** squid/src/wccp.c:1.19.2.5 Thu Oct 24 12:51:14 2002 +--- squid/src/wccp.c Tue Jan 11 23:07:12 2005 +*************** +*** 245,250 **** +--- 245,260 ---- + return; + if (ntohl(wccp_i_see_you.type) != WCCP_I_SEE_YOU) + return; ++ if (ntohl(wccp_i_see_you.number) > WCCP_ACTIVE_CACHES) { ++ debug(80, 1) ("Ignoring WCCP_I_SEE_YOU from %s with number of caches set to %d\n", ++ inet_ntoa(from.sin_addr), (int) ntohl(wccp_i_see_you.number)); ++ return; ++ } ++ if (ntohl(wccp_i_see_you.number) <= 0) { ++ debug(80, 1) ("Ignoring WCCP_I_SEE_YOU from %s with non-positive number of caches\n", ++ inet_ntoa(from.sin_addr)); ++ return; ++ } + if ((0 == change) && (number_caches == ntohl(wccp_i_see_you.number))) { + if (last_assign_buckets_change == wccp_i_see_you.change) { + /* +*************** +*** 274,280 **** +--- 284,294 ---- + wccpLowestIP(void) + { + int loop; ++ /* ++ * We sanity checked wccp_i_see_you.number back in wccpHandleUdp() ++ */ + for (loop = 0; loop < ntohl(wccp_i_see_you.number); loop++) { ++ assert(loop < WCCP_ACTIVE_CACHES); + if (wccp_i_see_you.wccp_cache_entry[loop].ip_addr.s_addr < local_ip.s_addr) + return 0; + } +*************** +*** 311,318 **** + + debug(80, 6) ("wccpAssignBuckets: Called\n"); + number_caches = ntohl(wccp_i_see_you.number); +! if (number_caches > WCCP_ACTIVE_CACHES) +! number_caches = WCCP_ACTIVE_CACHES; + wab_len = sizeof(struct wccp_assign_bucket_t); + cache_len = WCCP_CACHE_LEN * number_caches; + +--- 325,332 ---- + + debug(80, 6) ("wccpAssignBuckets: Called\n"); + number_caches = ntohl(wccp_i_see_you.number); +! assert(number_caches > 0); +! assert(number_caches <= WCCP_ACTIVE_CACHES); + wab_len = sizeof(struct wccp_assign_bucket_t); + cache_len = WCCP_CACHE_LEN * number_caches; + Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec =================================================================== --- tinysofa/releases/1.2/squid/current/specs/squid.spec 2005-01-14 22:10:07 UTC (rev 5687) +++ tinysofa/releases/1.2/squid/current/specs/squid.spec 2005-01-15 12:35:47 UTC (rev 5688) @@ -4,7 +4,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE7 -Release: 2jh +Release: 3jh Epoch: 0 License: GPL Group: extra @@ -22,6 +22,8 @@ Patch5: squid-2.5.STABLE4-perlpath.patch Patch6: squid-2.5.STABLE5-pipe.patch Patch7: squid-2.5.STABLE7-fakeauth_auth.patch +Patch8: squid-2.5.STABLE7-wccp_denial_of_service.patch +Patch9: squid-2.5.STABLE7-gopher_html_parsing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: logrotate coreutils /usr/bin/find @@ -52,6 +54,8 @@ %patch5 -p1 -b .perlpath %patch6 -p1 -b .pipe %patch7 -p1 -b .fakeauth_auth +%patch8 -p1 -b .wccp_denial_of_service +%patch9 -p1 -b .gopher_html_parsing %build @@ -277,6 +281,11 @@ %changelog +* Sat Jan 15 2005 Jaakko Heinonen 2.5.STABLE7-3jh +- fix An error in the handling of invalid field values in "WCCP_I_SEE_YOU" +- messages +- fix a boundary error in the "gopherToHTML()" function + * Tue Jan 11 2005 Jaakko Heinonen 2.5.STABLE7-2jh - fix NTLM fakeauth_auth helper denial of service From svn at tinysofa.org Sat Jan 15 17:12:56 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 15 Jan 2005 12:12:56 -0500 (EST) Subject: [tinysofa-svn] r5690 - tinysofa/releases/1.2/vim/current/specs Message-ID: <20050115171256.25FE6344130@minbar.tinysofa.org> Author: jh Date: 2005-01-15 12:12:49 -0500 (Sat, 15 Jan 2005) New Revision: 5690 Modified: tinysofa/releases/1.2/vim/current/specs/vim.spec Log: - put tutorial to doc subpackage - put print, lang and keymap directories to tools subpackage Modified: tinysofa/releases/1.2/vim/current/specs/vim.spec =================================================================== --- tinysofa/releases/1.2/vim/current/specs/vim.spec 2005-01-15 12:53:57 UTC (rev 5689) +++ tinysofa/releases/1.2/vim/current/specs/vim.spec 2005-01-15 17:12:49 UTC (rev 5690) @@ -82,7 +82,7 @@ %setup -q -n %{shortname} %patch1 -p0 -%patch8 -p1 -b .tmpfile~ +%patch8 -p1 %patch1000 -p1 @@ -129,9 +129,9 @@ find %{buildroot}%{_datadir}/vim/%{shortname} -type f > filelist.all sed -e "s|%{buildroot}||" filelist.all | \ egrep -v '/tools(/|$)' > filelist.nottools -egrep -v '/(colors|compiler|ftplugin|indent|macros|plugin|syntax)(/|$)' \ +egrep -v '/(colors|compiler|ftplugin|indent|macros|plugin|syntax|lang|keymap|print)(/|$)' \ filelist.nottools > filelist.nosyntax -egrep -v '/doc(/|$)' filelist.nosyntax > filelist.left +egrep -v '/(doc|tutor)(/|$)' filelist.nosyntax > filelist.left %clean @@ -163,16 +163,13 @@ %{_mandir}/man1/evim.1* %dir %{_datadir}/vim %dir %{_datadir}/vim/%{shortname} -%dir %{_datadir}/vim/%{shortname}/keymap -%dir %{_datadir}/vim/%{shortname}/lang -%dir %{_datadir}/vim/%{shortname}/print -%dir %{_datadir}/vim/%{shortname}/tutor %dir %{_datadir}/vim/%{shortname}/syntax %{_datadir}/vim/%{shortname}/syntax/nosyntax.vim %files doc %defattr(-,root,root) %{_datadir}/vim/%{shortname}/doc +%{_datadir}/vim/%{shortname}/tutor %files syntax %defattr(-,root,root) @@ -187,11 +184,16 @@ %{_datadir}/vim/%{shortname}/indent %{_datadir}/vim/%{shortname}/macros %{_datadir}/vim/%{shortname}/plugin +%{_datadir}/vim/%{shortname}/print +%{_datadir}/vim/%{shortname}/keymap +%{_datadir}/vim/%{shortname}/lang %changelog * Sat Jan 15 2005 Jaakko Heinonen 6.3.57-1jh - update to 6.3.57 +- put tutorial to doc subpackage +- put print, lang and keymap directories to tools subpackage - fix tmpfile issues (vim-6.3-tmpfile.patch) * Tue Jan 04 2005 tsintegrate 6.2.532-3ts From svn at tinysofa.org Sat Jan 15 18:44:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 15 Jan 2005 13:44:00 -0500 (EST) Subject: [tinysofa-svn] r5691 - in tinysofa/releases/1.2/mysql/current: sources specs Message-ID: <20050115184400.3F92A344130@minbar.tinysofa.org> Author: jh Date: 2005-01-15 13:36:44 -0500 (Sat, 15 Jan 2005) New Revision: 5691 Added: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.9.tar.gz Removed: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.7.tar.gz Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec Log: - 4.1.9 Deleted: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.7.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.9.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.9.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-01-15 17:12:49 UTC (rev 5690) +++ tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-01-15 18:36:44 UTC (rev 5691) @@ -5,7 +5,7 @@ Summary: A SQL database engine Name: mysql Group: main -Version: 4.1.7 +Version: 4.1.9 Release: 1jh License: GPL / LGPL Source: http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/mysql-%{version}.tar.gz @@ -305,6 +305,9 @@ %changelog +* Fri Jan 14 2005 Jaakko Heinonen +- 4.1.9 + * Thu Jan 13 2005 Jaakko Heinonen - rework rpm scripts - disable raid support for now From svn at tinysofa.org Sat Jan 15 18:44:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 15 Jan 2005 13:44:40 -0500 (EST) Subject: [tinysofa-svn] r5692 - tinysofa/releases/1.2/python/current/specs Message-ID: <20050115184440.BCFB3344130@minbar.tinysofa.org> Author: jh Date: 2005-01-15 13:44:34 -0500 (Sat, 15 Jan 2005) New Revision: 5692 Modified: tinysofa/releases/1.2/python/current/specs/python.spec Log: - BuildRequires: bzip2-devel Modified: tinysofa/releases/1.2/python/current/specs/python.spec =================================================================== --- tinysofa/releases/1.2/python/current/specs/python.spec 2005-01-15 18:36:44 UTC (rev 5691) +++ tinysofa/releases/1.2/python/current/specs/python.spec 2005-01-15 18:44:34 UTC (rev 5692) @@ -49,7 +49,7 @@ BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel BuildPrereq: glibc-devel gcc-c++ libstdc++-devel BuildPrereq: gzip tar findutils pkgconfig -BuildPrereq: gdbm-devel +BuildPrereq: gdbm-devel bzip2-devel URL: http://www.python.org/ %description From svn at tinysofa.org Sat Jan 15 22:08:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 15 Jan 2005 17:08:47 -0500 (EST) Subject: [tinysofa-svn] r5693 - in contrib/1.1/kernel26/current: sources specs Message-ID: <20050115220847.438C2344130@minbar.tinysofa.org> Author: gda Date: 2005-01-15 17:08:35 -0500 (Sat, 15 Jan 2005) New Revision: 5693 Modified: contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586-smp.config contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586.config contrib/1.1/kernel26/current/specs/kernel26.spec Log: agp driver as modules Modified: contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586-smp.config =================================================================== --- contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586-smp.config 2005-01-15 18:44:34 UTC (rev 5692) +++ contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586-smp.config 2005-01-15 22:08:35 UTC (rev 5693) @@ -1548,18 +1548,18 @@ # # Ftape, the floppy tape device driver # -CONFIG_AGP=y -CONFIG_AGP_ALI=y -CONFIG_AGP_ATI=y -CONFIG_AGP_AMD=y -CONFIG_AGP_AMD64=y -CONFIG_AGP_INTEL=y -CONFIG_AGP_INTEL_MCH=y -CONFIG_AGP_NVIDIA=y -CONFIG_AGP_SIS=y -CONFIG_AGP_SWORKS=y -CONFIG_AGP_VIA=y -CONFIG_AGP_EFFICEON=y +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_INTEL_MCH=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m CONFIG_DRM=y CONFIG_DRM_TDFX=m CONFIG_DRM_GAMMA=m Modified: contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586.config =================================================================== --- contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586.config 2005-01-15 18:44:34 UTC (rev 5692) +++ contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586.config 2005-01-15 22:08:35 UTC (rev 5693) @@ -1548,18 +1548,18 @@ # # Ftape, the floppy tape device driver # -CONFIG_AGP=y -CONFIG_AGP_ALI=y -CONFIG_AGP_ATI=y -CONFIG_AGP_AMD=y -CONFIG_AGP_AMD64=y -CONFIG_AGP_INTEL=y -CONFIG_AGP_INTEL_MCH=y -CONFIG_AGP_NVIDIA=y -CONFIG_AGP_SIS=y -CONFIG_AGP_SWORKS=y -CONFIG_AGP_VIA=y -CONFIG_AGP_EFFICEON=y +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_INTEL_MCH=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m CONFIG_DRM=y CONFIG_DRM_TDFX=m CONFIG_DRM_GAMMA=m Modified: contrib/1.1/kernel26/current/specs/kernel26.spec =================================================================== --- contrib/1.1/kernel26/current/specs/kernel26.spec 2005-01-15 18:44:34 UTC (rev 5692) +++ contrib/1.1/kernel26/current/specs/kernel26.spec 2005-01-15 22:08:35 UTC (rev 5693) @@ -116,7 +116,7 @@ Group: System Environment/Kernel License: GPLv2 Version: %{rpmversion} -Release: 1gd +Release: 2gd #ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ppc64iseries sparc sparc64 ppc s390 s390x ia64 ExclusiveArch: noarch %{all_x86} x86_64 ExclusiveOS: Linux @@ -1069,6 +1069,9 @@ %endif %changelog +* Sat Jan 15 2005 Gerald Dachs 2.6.10-2gd +- agp now build as modules + * Sat Jan 8 2005 Dave Jones - Periodic slab debug is incompatable with pagealloc debug. Disable the latter. From svn at tinysofa.org Sat Jan 15 22:26:57 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 15 Jan 2005 17:26:57 -0500 (EST) Subject: [tinysofa-svn] r5694 - in contrib/1.1/alsa-lib/current: sources specs Message-ID: <20050115222657.9476A344130@minbar.tinysofa.org> Author: gda Date: 2005-01-15 17:26:03 -0500 (Sat, 15 Jan 2005) New Revision: 5694 Added: contrib/1.1/alsa-lib/current/sources/alsa-lib-1.0.8.tar.bz2 Removed: contrib/1.1/alsa-lib/current/sources/alsa-lib-0.9.8-x86_64.patch contrib/1.1/alsa-lib/current/sources/alsa-lib-1.0.5.tar.bz2 Modified: contrib/1.1/alsa-lib/current/specs/alsa-lib.spec Log: new upstream Deleted: contrib/1.1/alsa-lib/current/sources/alsa-lib-0.9.8-x86_64.patch =================================================================== --- contrib/1.1/alsa-lib/current/sources/alsa-lib-0.9.8-x86_64.patch 2005-01-15 22:08:35 UTC (rev 5693) +++ contrib/1.1/alsa-lib/current/sources/alsa-lib-0.9.8-x86_64.patch 2005-01-15 22:26:03 UTC (rev 5694) @@ -1,11 +0,0 @@ ---- alsa-lib-0.9.8/configure.orig 2003-11-26 05:08:49.000000000 -0500 -+++ alsa-lib-0.9.8/configure 2003-11-26 05:19:51.000000000 -0500 -@@ -2747,7 +2747,7 @@ - # This must be Linux ELF. - linux*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | m68* | mips* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | m68* | mips* | x86_64 ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM Deleted: contrib/1.1/alsa-lib/current/sources/alsa-lib-1.0.5.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.1/alsa-lib/current/sources/alsa-lib-1.0.8.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/alsa-lib/current/sources/alsa-lib-1.0.8.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/alsa-lib/current/specs/alsa-lib.spec =================================================================== --- contrib/1.1/alsa-lib/current/specs/alsa-lib.spec 2005-01-15 22:08:35 UTC (rev 5693) +++ contrib/1.1/alsa-lib/current/specs/alsa-lib.spec 2005-01-15 22:26:03 UTC (rev 5694) @@ -1,14 +1,14 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib -Version: 1.0.5 -Release: 1jh +Version: 1.0.8 +Release: 1gd License: LGPL Group: contrib Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}.tar.bz2 -Patch: alsa-lib-0.9.8-x86_64.patch URL: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig +Buildrequires: gcc-c++ %description The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI @@ -33,7 +33,6 @@ %prep %setup -q -n %{name}-%{version}%{?prever} -%patch -p1 -b x86_64 %build %configure \ @@ -73,6 +72,12 @@ %{_datadir}/aclocal/alsa.m4 %changelog +* Sat Jan 15 2005 Gerald Dachs 1.0.8-1gd +- update to 1.0.8 + +* Fri Dec 10 2004 Gerald Dachs 1.0.7-1gd +- update to 1.0.7 + * Mon Sep 13 2004 tsintegrate 1.0.5-1jh - current (1.0.5-1jh) integrated as 1.0.5-1jh From svn at tinysofa.org Sat Jan 15 22:27:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 15 Jan 2005 17:27:44 -0500 (EST) Subject: [tinysofa-svn] r5695 - in contrib/1.1/alsa-utils/current: sources specs Message-ID: <20050115222744.03548344130@minbar.tinysofa.org> Author: gda Date: 2005-01-15 17:27:19 -0500 (Sat, 15 Jan 2005) New Revision: 5695 Added: contrib/1.1/alsa-utils/current/sources/alsa-utils-1.0.8.tar.bz2 Removed: contrib/1.1/alsa-utils/current/sources/alsa-utils-1.0.5.tar.bz2 Modified: contrib/1.1/alsa-utils/current/specs/alsa-utils.spec Log: new upstream Deleted: contrib/1.1/alsa-utils/current/sources/alsa-utils-1.0.5.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.1/alsa-utils/current/sources/alsa-utils-1.0.8.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/alsa-utils/current/sources/alsa-utils-1.0.8.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/alsa-utils/current/specs/alsa-utils.spec =================================================================== --- contrib/1.1/alsa-utils/current/specs/alsa-utils.spec 2005-01-15 22:26:03 UTC (rev 5694) +++ contrib/1.1/alsa-utils/current/specs/alsa-utils.spec 2005-01-15 22:27:19 UTC (rev 5695) @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils -Version: 1.0.5 -Release: 1jh +Version: 1.0.8 +Release: 1gd License: GPL Group: contrib URL: http://www.alsa-project.org/ @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: alsa-lib-devel >= %{version} BuildRequires: ncurses-devel +BuildRequires: gettext %description @@ -38,8 +39,15 @@ %{_bindir}/* %{_sbindir}/* %{_mandir}/man?/* +%{_prefix}/share/locale/* %changelog +* Sat Jan 15 2005 Gerald Dachs 1.0.8-1gd +- update to 1.0.8 + +* Sat Dec 11 2004 Gerald Dachs 1.0.7-1gd +- update to 1.0.7 + * Mon Sep 13 2004 tsintegrate 1.0.5-1jh - current (1.0.5-1jh) integrated as 1.0.5-1jh From svn at tinysofa.org Sun Jan 16 09:06:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 16 Jan 2005 04:06:11 -0500 (EST) Subject: [tinysofa-svn] r5696 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050116090611.CB7DA344138@minbar.tinysofa.org> Author: jh Date: 2005-01-16 04:05:54 -0500 (Sun, 16 Jan 2005) New Revision: 5696 Added: tinysofa/releases/1.1/modutils/ Removed: tinysofa/releases/1.2/modutils/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/modutils (from rev 5695, tinysofa/releases/1.2/modutils) From svn at tinysofa.org Sun Jan 16 09:07:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 16 Jan 2005 04:07:02 -0500 (EST) Subject: [tinysofa-svn] r5697 - tinysofa/releases/1.1 Message-ID: <20050116090702.0D726344138@minbar.tinysofa.org> Author: jh Date: 2005-01-16 04:06:51 -0500 (Sun, 16 Jan 2005) New Revision: 5697 Added: tinysofa/releases/1.1/module-init-tools/ Log: - copy to 1.1 Copied: tinysofa/releases/1.1/module-init-tools (from rev 5696, tinysofa/releases/1.2/module-init-tools) From svn at tinysofa.org Sun Jan 16 11:23:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 16 Jan 2005 06:23:08 -0500 (EST) Subject: [tinysofa-svn] r5698 - in tinysofa/releases/1.2/module-init-tools/current: sources specs Message-ID: <20050116112308.F3540344138@minbar.tinysofa.org> Author: jh Date: 2005-01-16 06:22:52 -0500 (Sun, 16 Jan 2005) New Revision: 5698 Added: tinysofa/releases/1.2/module-init-tools/current/sources/module-init-tools-3.1.tar.bz2 Removed: tinysofa/releases/1.2/module-init-tools/current/sources/module-init-tools-3.0.tar.bz2 Modified: tinysofa/releases/1.2/module-init-tools/current/sources/module-init-tools-defconfig.patch tinysofa/releases/1.2/module-init-tools/current/specs/module-init-tools.spec Log: - adapt for 1.2 - update to 3.1 - enable zlib support Deleted: tinysofa/releases/1.2/module-init-tools/current/sources/module-init-tools-3.0.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/module-init-tools/current/sources/module-init-tools-3.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/module-init-tools/current/sources/module-init-tools-3.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/module-init-tools/current/sources/module-init-tools-defconfig.patch =================================================================== --- tinysofa/releases/1.2/module-init-tools/current/sources/module-init-tools-defconfig.patch 2005-01-16 09:06:51 UTC (rev 5697) +++ tinysofa/releases/1.2/module-init-tools/current/sources/module-init-tools-defconfig.patch 2005-01-16 11:22:52 UTC (rev 5698) @@ -1,6 +1,6 @@ ---- module-init-tools-3.0-pre10/modprobe.c.orig 2004-02-12 01:56:34.000000000 -0500 -+++ module-init-tools-3.0-pre10/modprobe.c 2004-02-24 00:11:15.097495564 -0500 -@@ -58,6 +61,10 @@ +--- module-init-tools-3.1-pre5/modprobe.c.dist 2004-06-20 05:34:34.000000000 -0400 ++++ module-init-tools-3.1-pre5/modprobe.c 2004-09-01 12:57:26.214587739 -0400 +@@ -59,6 +59,10 @@ #define MODULE_DIR "/lib/modules" #endif @@ -11,22 +11,23 @@ typedef void (*errfn_t)(const char *fmt, ...); /* Do we use syslog or stderr for messages? */ -@@ -919,6 +927,10 @@ - char *result = NULL; +@@ -971,7 +975,12 @@ + char *line; unsigned int linenum = 0; + FILE *cfile; ++ char *result = NULL; + if (!strcmp(filename, DEFAULT_CONFIG)) -+ result = read_config(DIST_CONFIG, 1, name, ++ result = read_config(DIST_CONFIG, name, + dump_only, removing, -+ options, commands); ++ options, commands, alias); cfile = fopen(filename, "r"); - if (!cfile) { - if (mustload) -@@ -1084,8 +1096,6 @@ + if (!cfile) + return 0; +@@ -1209,7 +1218,6 @@ { "first-time", 0, NULL, 3 }, { NULL, 0, NULL, 0 } }; --#define DEFAULT_CONFIG "/etc/modprobe.conf" -#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs" /* This is a horrible hack to allow devfsd, which calls modprobe with Modified: tinysofa/releases/1.2/module-init-tools/current/specs/module-init-tools.spec =================================================================== --- tinysofa/releases/1.2/module-init-tools/current/specs/module-init-tools.spec 2005-01-16 09:06:51 UTC (rev 5697) +++ tinysofa/releases/1.2/module-init-tools/current/specs/module-init-tools.spec 2005-01-16 11:22:52 UTC (rev 5698) @@ -1,7 +1,9 @@ +%define _sbindir /sbin +%define _bindir /sbin Summary: Kernel module management utilities. Name: module-init-tools -Version: 3.0 -Release: 8ts +Version: 3.1 +Release: 1jh License: GPL Group: main Source: http://kernel.us.themoes.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2 @@ -9,17 +11,15 @@ Source2: kmod.crond Patch0: module-init-tools-defconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -Prereq: /sbin/chkconfig +BuildRequires: zlib-devel +PreReq: %{__chmod} Requires: crond -PreReq: modutils >= 2.4.26-2tr -PreReq: coreutils, bash, mktemp, grep, sed, awk %description The module-init-tools package includes programs for managing automatic -loading and unloading of modules under 2.6 kernels, with support for older -kenrnels using the old modutils package, as well as other module management -programs. Examples of loaded and unloaded modules are device drivers and -filesystems, as well as some other things. +loading and unloading of modules under 2.6 kernels as well as other module +management programs. Device drivers and filesystems are two examples of +loaded and unloaded modules. %prep @@ -28,57 +28,48 @@ %build -CFLAGS="$RPM_OPT_FLAGS" ./configure \ - --disable-combined \ - --enable-insmod-static \ - --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --exec-prefix=/ -%make +%configure --enable-zlib +%make DOCBOOKTOMAN= %install -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly -mkdir -p $RPM_BUILD_ROOT/{%{_mandir}/man{1,2,8},sbin} -make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install install-man -mv $RPM_BUILD_ROOT/bin/lsmod $RPM_BUILD_ROOT/sbin/ +%{__mkdir_p} %{buildroot}%{_sysconfdir}/cron.hourly -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.conf.dist +%makeinstall -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/kmod -touch $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.conf +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/modprobe.conf.dist +touch %{buildroot}%{_sysconfdir}/modprobe.conf +install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.hourly/kmod + %clean %clean_buildroot %post -# don't generate /etc/modprobe.conf here -exit 0 - -if [ ! -s /etc/modprobe.conf ]; then - MODPROBE_CONF=/etc/modprobe.conf -elif [ -e /etc/modprobe.conf.rpmnew ]; then - MODPROBE_CONF=/etc/modprobe.conf.rpmnew +if [ -f /etc/modules.conf -a ! -f /etc/modprobe.conf ] ; then + echo "# Note: for use under 2.4, changes must also be made to modules.conf!" >/etc/modprobe.conf + /sbin/generate-modprobe.conf --stdin < /etc/modules.conf >> /etc/modprobe.conf 2>/dev/null + chmod 644 /etc/modprobe.conf + echo "# Note: for use under 2.6, changes must also be made to modprobe.conf!" >> /etc/modules.conf fi -if [ -s /etc/modules.conf -a -n "$MODPROBE_CONF" ]; then - echo '# This file is autogenerated from /etc/modules.conf using generate-modprobe.conf command' >> $MODPROBE_CONF - echo >> $MODPROBE_CONF - /sbin/generate-modprobe.conf >> $MODPROBE_CONF 2> /dev/null -fi -exit 0 - %files %defattr(-,root,root) %{_sysconfdir}/modprobe.conf.dist /sbin/* -%{_mandir}/*/* +%{_mandir}/man?/* %{_sysconfdir}/cron.hourly/kmod %ghost %{_sysconfdir}/modprobe.conf + %changelog +* Sun Jan 16 2005 Jaakko Heinonen 3.1-1jh +- adapt for 1.2 +- update to 3.1 +- enable zlib support + * Tue Jan 04 2005 tsintegrate 3.0-8ts - current (3.0-8jh) integrated as 3.0-8ts for release 1.1-U3 From svn at tinysofa.org Sun Jan 16 13:06:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 16 Jan 2005 08:06:34 -0500 (EST) Subject: [tinysofa-svn] r5699 - in contrib/1.1/kernel26/current: sources specs Message-ID: <20050116130634.0BD3D344138@minbar.tinysofa.org> Author: gda Date: 2005-01-16 08:06:22 -0500 (Sun, 16 Jan 2005) New Revision: 5699 Modified: contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586-smp.config contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586.config contrib/1.1/kernel26/current/specs/kernel26.spec Log: make it more compatible with older kernels Modified: contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586-smp.config =================================================================== --- contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586-smp.config 2005-01-16 11:22:52 UTC (rev 5698) +++ contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586-smp.config 2005-01-16 13:06:22 UTC (rev 5699) @@ -1307,7 +1307,7 @@ # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_LKKBD is not set CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2=m CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_INPORT=m CONFIG_MOUSE_ATIXL=y @@ -1964,7 +1964,7 @@ # # USB Human Interface Devices (HID) # -CONFIG_USB_HID=y +CONFIG_USB_HID=m CONFIG_USB_HIDINPUT=y CONFIG_HID_FF=y CONFIG_HID_PID=y Modified: contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586.config =================================================================== --- contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586.config 2005-01-16 11:22:52 UTC (rev 5698) +++ contrib/1.1/kernel26/current/sources/kernel-2.6.10-i586.config 2005-01-16 13:06:22 UTC (rev 5699) @@ -1307,7 +1307,7 @@ # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_LKKBD is not set CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2=m CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_INPORT=m CONFIG_MOUSE_ATIXL=y @@ -1964,7 +1964,7 @@ # # USB Human Interface Devices (HID) # -CONFIG_USB_HID=y +CONFIG_USB_HID=m CONFIG_USB_HIDINPUT=y CONFIG_HID_FF=y CONFIG_HID_PID=y Modified: contrib/1.1/kernel26/current/specs/kernel26.spec =================================================================== --- contrib/1.1/kernel26/current/specs/kernel26.spec 2005-01-16 11:22:52 UTC (rev 5698) +++ contrib/1.1/kernel26/current/specs/kernel26.spec 2005-01-16 13:06:22 UTC (rev 5699) @@ -116,7 +116,7 @@ Group: System Environment/Kernel License: GPLv2 Version: %{rpmversion} -Release: 2gd +Release: 3gd #ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ppc64iseries sparc sparc64 ppc s390 s390x ia64 ExclusiveArch: noarch %{all_x86} x86_64 ExclusiveOS: Linux @@ -1069,6 +1069,9 @@ %endif %changelog +* Sun Jan 16 2005 Gerald Dachs 2.6.10-3gd +- usbhid, psmouse now build as module + * Sat Jan 15 2005 Gerald Dachs 2.6.10-2gd - agp now build as modules From svn at tinysofa.org Sun Jan 16 17:10:10 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 16 Jan 2005 12:10:10 -0500 (EST) Subject: [tinysofa-svn] r5700 - tinysofa/releases/1.2/release/current/specs Message-ID: <20050116171010.41523344138@minbar.tinysofa.org> Author: jh Date: 2005-01-16 12:10:03 -0500 (Sun, 16 Jan 2005) New Revision: 5700 Modified: tinysofa/releases/1.2/release/current/specs/release.spec Log: - change version Modified: tinysofa/releases/1.2/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.2/release/current/specs/release.spec 2005-01-16 13:06:22 UTC (rev 5699) +++ tinysofa/releases/1.2/release/current/specs/release.spec 2005-01-16 17:10:03 UTC (rev 5700) @@ -4,7 +4,7 @@ Summary: tinysofa release file Name: release -Version: 1.90 +Version: 1.1.99 Release: 0jh Epoch: 2 License: GPL From svn at tinysofa.org Tue Jan 18 06:51:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 18 Jan 2005 01:51:46 -0500 (EST) Subject: [tinysofa-svn] r5703 - in tinysofa/releases/1.2/openssh/current: sources specs Message-ID: <20050118065146.086BD344138@minbar.tinysofa.org> Author: jh Date: 2005-01-18 01:51:17 -0500 (Tue, 18 Jan 2005) New Revision: 5703 Added: tinysofa/releases/1.2/openssh/current/sources/openssh-3.9p1.tar.gz Removed: tinysofa/releases/1.2/openssh/current/sources/openssh-3.8.1p1.tar.gz Modified: tinysofa/releases/1.2/openssh/current/sources/sshd_config tinysofa/releases/1.2/openssh/current/specs/openssh.spec Log: - 3.9p1 - use AUTHPRIV syslog facility - spec cleanups - build with stack protector Deleted: tinysofa/releases/1.2/openssh/current/sources/openssh-3.8.1p1.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/openssh/current/sources/openssh-3.9p1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/openssh/current/sources/openssh-3.9p1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/openssh/current/sources/sshd_config =================================================================== --- tinysofa/releases/1.2/openssh/current/sources/sshd_config 2005-01-17 21:55:10 UTC (rev 5702) +++ tinysofa/releases/1.2/openssh/current/sources/sshd_config 2005-01-18 06:51:17 UTC (rev 5703) @@ -15,9 +15,9 @@ #ListenAddress 0.0.0.0 #ListenAddress :: -# HostKey for protocol version 1 +#HostKey for protocol version 1 #HostKey /etc/ssh/ssh_host_key -# HostKeys for protocol version 2 +#HostKeys for protocol version 2 #HostKey /etc/ssh/ssh_host_rsa_key #HostKey /etc/ssh/ssh_host_dsa_key @@ -28,6 +28,7 @@ # Logging #obsoletes QuietMode and FascistLogging #SyslogFacility AUTH +SyslogFacility AUTHPRIV #LogLevel INFO # Authentication: Modified: tinysofa/releases/1.2/openssh/current/specs/openssh.spec =================================================================== --- tinysofa/releases/1.2/openssh/current/specs/openssh.spec 2005-01-17 21:55:10 UTC (rev 5702) +++ tinysofa/releases/1.2/openssh/current/specs/openssh.spec 2005-01-18 06:51:17 UTC (rev 5703) @@ -1,13 +1,12 @@ %define _noVersionedDependencies 1 -%define realversion 3.8.1p1 Summary: OpenSSH free Secure Shell (SSH) implementation Name: openssh -Version: 3.8.1p1 -Release: 2ts +Version: 3.9p1 +Release: 1jh License: BSD Group: main -Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{realversion}.tar.gz +Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz Source1: sshd_config Source2: sshd.pam Source3: sshd.init @@ -18,25 +17,10 @@ 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 -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: ssh URL: http://www.openssh.com/ -%package clients -Summary: OpenSSH Secure Shell protocol clients -Requires: %{name} = %{version} -Group: main -Obsoletes: ssh-clients - - -%package server -Summary: OpenSSH Secure Shell protocol server (sshd) -Group: main -Obsoletes: ssh-server %{name}-server-config < %{version}-%{release} -PreReq: %{name} = %{version} -Requires: tcp_wrappers -%service_requires - %description Ssh (Secure Shell) a program for logging into a remote machine and for executing commands in a remote machine. It is intended to replace @@ -52,6 +36,11 @@ client and server. To make this package useful, you should also install openssh-clients, openssh-server, or both. +%package clients +Summary: OpenSSH Secure Shell protocol clients +Requires: %{name} = %{version} +Group: main +Obsoletes: ssh-clients %description clients Ssh (Secure Shell) a program for logging into a remote machine and for @@ -67,6 +56,13 @@ This package includes the clients necessary to make encrypted connections to SSH servers. +%package server +Summary: OpenSSH Secure Shell protocol server (sshd) +Group: main +Obsoletes: ssh-server %{name}-server-config < %{version}-%{release} +PreReq: %{name} = %{version} +Requires: tcp_wrappers +%service_requires %description server Ssh (Secure Shell) a program for logging into a remote machine and for @@ -85,7 +81,7 @@ %prep -%setup -q -n %{name}-%{realversion} +%setup -q %if %{with_selinux} patch -p1 < %{SOURCE4} %endif @@ -97,20 +93,19 @@ 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 LIBS="-lresolv"; export LIBS -CFLAGS="$RPM_OPT_FLAGS -fpie" \ - ./configure --prefix=/usr \ - --sysconfdir=/etc/ssh \ - --mandir=%{_mandir}\ - --with-tcp-wrappers \ - --with-ipv4-default \ - --infodir=/usr/share/info \ - --libexecdir=/usr/libexec/ssh \ - --with-pam \ - --with-lastlog=/var/log/lastlog \ - --with-privsep-path=/var/cache/openssh/empty +%configure \ + --sysconfdir=%{_sysconfdir}/ssh \ + --libexecdir=%{_libexecdir}/ssh \ + --with-tcp-wrappers \ + --with-ipv4-default \ + --with-pam \ + --with-lastlog=/var/log/lastlog \ + --with-privsep-path=/var/cache/openssh/empty %make @@ -118,21 +113,22 @@ %install %makeinstall_std -install -d $RPM_BUILD_ROOT/etc/pam.d/ -install -d $RPM_BUILD_ROOT%{_initrddir} -install -d $RPM_BUILD_ROOT/usr/libexec/ssh -install -m600 %{SOURCE1} $RPM_BUILD_ROOT/etc/ssh/ -install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sshd -install -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/sshd +%{__mkdir_p} \ + %{buildroot}%{_sysconfdir}/pam.d \ + %{buildroot}%{_initrddir} +install -m 600 %{SOURCE1} %{buildroot}%{_sysconfdir}/ssh +install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/sshd +install -m 755 %{SOURCE3} %{buildroot}%{_initrddir}/sshd + %pre server if [ -z "`getent group sshd`" ]; then /usr/sbin/groupadd -g 103 sshd fi if [ -z "`getent passwd sshd`" ]; then - /usr/sbin/useradd -d /no/dir -M -s /no/shell -g 103 -u 103 sshd + /usr/sbin/useradd -d /var/empty -M -s /sbin/nologin -g 103 -u 103 sshd fi @@ -154,24 +150,24 @@ %files %defattr(-,root,root) %doc ChangeLog OVERVIEW README* INSTALL CREDITS LICENCE TODO RFC.nroff -%attr(0755,root,root) /usr/bin/ssh-keygen -%attr(0755,root,root) /usr/bin/ssh-keyscan +%attr(0755,root,root) %{_bindir}/ssh-keygen +%attr(0755,root,root) %{_bindir}/ssh-keyscan %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1* -%attr(0755,root,root) %dir /etc/ssh -%attr(0755,root,root) %dir /usr/libexec/ssh -%attr(4755,root,root) /usr/libexec/ssh/ssh-keysign +%attr(0755,root,root) %dir %{_sysconfdir}/ssh +%attr(0755,root,root) %dir %{_libexecdir}/ssh +%attr(4755,root,root) %{_libexecdir}/ssh/ssh-keysign -%exclude %{_datadir}/Ssh.bin +%exclude /usr/share/Ssh.bin %files clients %defattr(-,root,root) -%attr(0755,root,root) /usr/bin/scp -%attr(0755,root,root) /usr/bin/sftp -%attr(0755,root,root) /usr/bin/ssh -%attr(0755,root,root) /usr/bin/ssh-add -%attr(0755,root,root) /usr/bin/ssh-agent -%attr(0755,root,root) /usr/bin/slogin +%attr(0755,root,root) %{_bindir}/scp +%attr(0755,root,root) %{_bindir}/sftp +%attr(0755,root,root) %{_bindir}/ssh +%attr(0755,root,root) %{_bindir}/ssh-add +%attr(0755,root,root) %{_bindir}/ssh-agent +%attr(0755,root,root) %{_bindir}/slogin %attr(0644,root,root) %{_mandir}/man1/scp.1* %attr(0644,root,root) %{_mandir}/man1/sftp.1* %attr(0644,root,root) %{_mandir}/man1/ssh.1* @@ -183,25 +179,32 @@ %files server %defattr(-,root,root) -%attr(0755,root,root) /usr/sbin/sshd -%attr(0755,root,root) /usr/libexec/ssh/sftp-server +%attr(0755,root,root) %{_sbindir}/sshd +%attr(0755,root,root) %{_libexecdir}/ssh/sftp-server %attr(0644,root,root) %{_mandir}/man5/sshd_config.5* %attr(0644,root,root) %{_mandir}/man8/sshd.8* %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* -%attr(0600,root,root) %config(noreplace) /etc/ssh/moduli -%attr(0644,root,root) %config(noreplace) /etc/pam.d/sshd +%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/sshd %attr(0755,root,root) %{_initrddir}/sshd -%attr(0755,root,root) /var/cache/openssh +%attr(0755,root,root) %dir /var/cache/openssh %attr(0700,root,root) /var/cache/openssh/empty %if 0 %files server-config %endif %defattr(-,root,root) -%attr(0644,root,root) %config(noreplace) /etc/ssh/sshd_config +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config + %changelog +* Tue Jan 18 2005 Jaakko Heinonen 3.9p1-1jh +- 3.9p1 +- use AUTHPRIV syslog facility +- spec cleanups +- build with stack protector + * Tue Jan 04 2005 tsintegrate 3.8.1p1-2ts - current (3.8.1p1-2jh) integrated as 3.8.1p1-2ts for release 1.1-U3 From svn at tinysofa.org Tue Jan 18 07:59:27 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 18 Jan 2005 02:59:27 -0500 (EST) Subject: [tinysofa-svn] r5705 - in tinysofa/releases/1.2/quota/current: sources specs Message-ID: <20050118075927.B7C51344138@minbar.tinysofa.org> Author: jh Date: 2005-01-18 02:59:09 -0500 (Tue, 18 Jan 2005) New Revision: 5705 Added: tinysofa/releases/1.2/quota/current/sources/quota-3.12.tar.gz Removed: tinysofa/releases/1.2/quota/current/sources/quota-3.09-root_sbindir.patch tinysofa/releases/1.2/quota/current/sources/quota-3.10.tar.gz Modified: tinysofa/releases/1.2/quota/current/sources/quota-3.06-warnquota.patch tinysofa/releases/1.2/quota/current/specs/quota.spec Log: - 3.12 Modified: tinysofa/releases/1.2/quota/current/sources/quota-3.06-warnquota.patch =================================================================== --- tinysofa/releases/1.2/quota/current/sources/quota-3.06-warnquota.patch 2005-01-18 07:49:25 UTC (rev 5704) +++ tinysofa/releases/1.2/quota/current/sources/quota-3.06-warnquota.patch 2005-01-18 07:59:09 UTC (rev 5705) @@ -1,6 +1,6 @@ ---- quota-tools/warnquota.conf.orig Sat Aug 16 00:54:17 2003 -+++ quota-tools/warnquota.conf Sat Aug 16 01:00:02 2003 -@@ -4,21 +4,25 @@ +--- quota-tools/warnquota.conf.orig 2004-03-12 13:15:40.000000000 -0500 ++++ quota-tools/warnquota.conf 2004-09-13 15:03:30.000000000 -0400 +@@ -4,25 +4,25 @@ # and even blank lines # values can be quoted: @@ -11,10 +11,13 @@ # but they don't have to be: -SUBJECT = Hey, user, clean up your account! -CC_TO = "sysadm at localhost" ++SUBJECT = NOTE: You are exceeding your allocated disk space limits ++CC_TO = "root at localhost" + # If you set this variable CC will be used only when user has less than + # specified grace time left (examples of possible times: 5 seconds, 1 minute, + # 12 hours, 5 days) + # CC_BEFORE = 2 days -SUPPORT = "support at myhost.com" -+# -+SUBJECT = NOTE: You are exceeding your allocatted disk space limits -+CC_TO = "root at localhost" +SUPPORT = "root at myhost.com" PHONE = "(123) 456-1111 or (222) 333-4444" # Text in the beginning of the mail (if not specified, default text is used) @@ -22,15 +25,12 @@ # Line breaks are done by '|' character -MESSAGE = Hello, I've noticed you use too much space\ - on my disk|Delete your files on following filesystems:| -+# -+MESSAGE = Your disk usage has exceeded the agreeded limits\ ++MESSAGE = Your disk usage has exceeded the agreed limits\ + on this server|Please delete any unnecessary files on following filesystems:| -+ # Text in the end of the mail (if not specified, default text using SUPPORT and PHONE # is created) -SIGNATURE = See you!| Your admin| +SIGNATURE = root at localhost -+ # Following text is used for mails about group exceeding quotas # It should contain string %s exactly once - it will be substituted for a group name GROUP_MESSAGE = Hello, a group '%s' you're member of use too much space.|\ Deleted: tinysofa/releases/1.2/quota/current/sources/quota-3.09-root_sbindir.patch =================================================================== --- tinysofa/releases/1.2/quota/current/sources/quota-3.09-root_sbindir.patch 2005-01-18 07:49:25 UTC (rev 5704) +++ tinysofa/releases/1.2/quota/current/sources/quota-3.09-root_sbindir.patch 2005-01-18 07:59:09 UTC (rev 5705) @@ -1,21 +0,0 @@ ---- quota-tools/Makefile.in.orig Tue Apr 8 09:04:25 2003 -+++ quota-tools/Makefile.in Sat Aug 16 01:53:05 2003 -@@ -30,6 +30,7 @@ - sbindir = $(prefix)/sbin - mandir = @mandir@ - includedir = $(prefix)/include -+root_sbindir = /sbin - locale_dir = $(prefix)/share/locale - sysconfdir = @sysconfdir@ - -@@ -78,8 +79,8 @@ - -mkdir -p $(ROOTDIR)$(sbindir) - -mkdir -p $(ROOTDIR)$(bindir) - -$(INSTALL) -m $(DEF_SBIN_MODE) \ -- quotacheck quotaon convertquota $(ROOTDIR)$(sbindir) -- $(LN) quotaon $(ROOTDIR)$(sbindir)/quotaoff -+ quotacheck quotaon convertquota $(ROOTDIR)$(root_sbindir) -+ $(LN) quotaon $(ROOTDIR)$(root_sbindir)/quotaoff - -$(INSTALL) -m $(DEF_SBIN_MODE) \ - edquota repquota warnquota quotastats setquota quot xqmstats \ - $(ROOTDIR)$(sbindir) Deleted: tinysofa/releases/1.2/quota/current/sources/quota-3.10.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/quota/current/sources/quota-3.12.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/quota/current/sources/quota-3.12.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/quota/current/specs/quota.spec =================================================================== --- tinysofa/releases/1.2/quota/current/specs/quota.spec 2005-01-18 07:49:25 UTC (rev 5704) +++ tinysofa/releases/1.2/quota/current/specs/quota.spec 2005-01-18 07:59:09 UTC (rev 5705) @@ -1,20 +1,19 @@ Name: quota Summary: System administration tools for monitoring users' disk usage. -Version: 3.10 -Release: 6ts +Version: 3.12 +Release: 1jh License: BSD Group: main BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: initscripts >= 6.38 BuildPreReq: e2fsprogs-devel gettext tcp_wrappers-devel Source0: http://prdownloads.sourceforge.net/linuxquota/quota-%{version}.tar.gz +URL: http://sourceforge.net/projects/linuxquota/ Patch0: quota-3.06-warnquota.patch Patch1: quota-3.06-no-stripping.patch Patch2: quota-3.06-man-page.patch -Patch3: quota-3.09-root_sbindir.patch -Patch4: quota-3.06-pie.patch +Patch3: quota-3.06-pie.patch - %description The quota package contains system administration tools for monitoring and limiting user and or group disk usage per filesystem. @@ -25,15 +24,14 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%ifnarch ppc ppc64 %patch3 -p1 -%ifnarch ppc ppc64 -%patch4 -p1 %endif %build %configure \ - --with-ext2direct=no + --with-ext2direct=no --enable-rootsbin %make @@ -43,11 +41,14 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_mandir}/{man1,man2,man3,man8} -make install \ - ROOTDIR=%{buildroot} \ - DEF_BIN_MODE=755 \ - DEF_SBIN_MODE=755 +make install ROOTDIR=%{buildroot} install -m 644 warnquota.conf %{buildroot}%{_sysconfdir} +# +# we don't support XFS yet +# +rm -f %{buildroot}%{_sbindir}/quot +rm -f %{buildroot}%{_sbindir}/xqmstats +rm -f %{buildroot}%{_mandir}/man8/quot.* %find_lang %{name} @@ -68,11 +69,12 @@ %attr(0644,root,root) %{_mandir}/man2/* %attr(0644,root,root) %{_mandir}/man3/* %attr(0644,root,root) %{_mandir}/man8/* -%exclude %{_mandir}/man8/rquotad* -%exclude %{_sbindir}/rpc.rquotad %changelog +* Tue Jan 18 2005 Jaakko Heinonen 3.12-1jh +- 3.12 + * Thu Aug 05 2004 tsintegrate 3.10-6ts - current (3.10-6jh) integrated as 3.10-6ts for release 1.1 From svn at tinysofa.org Tue Jan 18 08:31:16 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 18 Jan 2005 03:31:16 -0500 (EST) Subject: [tinysofa-svn] r5706 - in tinysofa/releases/1.2/sysklogd/current: sources specs Message-ID: <20050118083116.A2BB7344138@minbar.tinysofa.org> Author: jh Date: 2005-01-18 03:30:59 -0500 (Tue, 18 Jan 2005) New Revision: 5706 Added: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-noforward_local_address.patch tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-preserve_percents.patch tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-siginterrupt.patch Removed: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-security.patch tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch Modified: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh.tar.gz tinysofa/releases/1.2/sysklogd/current/specs/sysklogd.spec Log: - new Red Hat upstream Added: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-noforward_local_address.patch =================================================================== --- tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-noforward_local_address.patch 2005-01-18 07:59:09 UTC (rev 5705) +++ tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-noforward_local_address.patch 2005-01-18 08:30:59 UTC (rev 5706) @@ -0,0 +1,314 @@ +--- sysklogd-1.4.1rh/syslogd.c.noforward_local_address 2005-01-14 14:15:19.374123000 -0500 ++++ sysklogd-1.4.1rh/syslogd.c 2005-01-14 14:15:37.996481000 -0500 +@@ -441,6 +441,15 @@ + * Don't return a closed fd if `-a' is called with a wrong path. + * Thanks to Bill Nottingham for providing + * a patch. ++ * Wed Dec 1 18:00:00 EST 2004: Jason Vas Dias ++ * Use 'siginterrupt(SIGALRM,1)' after each 'signal(SIGALRM,domark)' ++ * else recvfrom(...) will never be interrupted ++ * (bugzilla #141983) ++ * ++ * Thu Dec 1 11:00:00 EST 2004: Jason Vas Dias ++ * Don't allow remote logging host targets like '@localhost' ++ * (or any name that resolves to the address of a local interface)!! ++ * + */ + + +@@ -491,6 +500,8 @@ + #include + #include + #include ++#include ++ + #ifndef TESTING + #include "pidfile.h" + #endif +@@ -777,6 +788,10 @@ + static int create_inet_socket(); + #endif + ++static struct addrinfo *host_ai_list( char *host ); ++static int hosts_equal(struct addrinfo *ai1, struct addrinfo *ai2); ++static struct in_addr *not_local_address( char *host ); ++ + int main(argc, argv) + int argc; + char **argv; +@@ -1667,7 +1682,7 @@ + register int l; + char line[MAXLINE + 1]; + time_t fwd_suspend; +- struct hostent *hp; ++ struct in_addr *ina; + #endif + + dprintf("Called fprintlog, "); +@@ -1736,7 +1751,7 @@ + fwd_suspend = time((time_t *) 0) - f->f_time; + if ( fwd_suspend >= INET_SUSPEND_TIME ) { + dprintf("Forwarding suspension to unknown over, retrying\n"); +- if ( (hp = gethostbyname(f->f_un.f_forw.f_hname)) == NULL ) { ++ if ( (ina = not_local_address(f->f_un.f_forw.f_hname)) == NULL ) { + dprintf("Failure: %s\n", sys_h_errlist[h_errno]); + dprintf("Retries: %d\n", f->f_prevcount); + if ( --f->f_prevcount < 0 ) { +@@ -1748,9 +1763,10 @@ + } + else { + dprintf("%s found, resuming.\n", f->f_un.f_forw.f_hname); +- memcpy((char *) &f->f_un.f_forw.f_addr.sin_addr, hp->h_addr, hp->h_length); ++ memcpy((char *) &f->f_un.f_forw.f_addr.sin_addr, ina, sizeof(struct in_addr)); + f->f_prevcount = 0; + f->f_type = F_FORW; ++ free(ina); + goto f_forw; + } + } +@@ -2454,7 +2470,7 @@ + int ignorepri = 0; + int syncfile; + #ifdef SYSLOG_INET +- struct hostent *hp; ++ struct in_addr *ina; + #endif + char buf[MAXLINE]; + char xbuf[200]; +@@ -2612,7 +2628,7 @@ + #ifdef SYSLOG_INET + (void) strcpy(f->f_un.f_forw.f_hname, ++p); + dprintf("forwarding host: %s\n", p); /*ASP*/ +- if ( (hp = gethostbyname(p)) == NULL ) { ++ if ( (ina = not_local_address(p)) == NULL ) { + f->f_type = F_FORW_UNKN; + f->f_prevcount = INET_RETRY_MAX; + f->f_time = time ( (time_t *)0 ); +@@ -2625,7 +2641,10 @@ + f->f_un.f_forw.f_addr.sin_family = AF_INET; + f->f_un.f_forw.f_addr.sin_port = LogPort; + if ( f->f_type == F_FORW ) +- memcpy((char *) &f->f_un.f_forw.f_addr.sin_addr, hp->h_addr, hp->h_length); ++ { ++ memcpy((char *) &f->f_un.f_forw.f_addr.sin_addr, ina, sizeof(struct in_addr)); ++ free(ina); ++ } + /* + * Otherwise the host might be unknown due to an + * inaccessible nameserver (perhaps on the same +@@ -2798,6 +2817,215 @@ + return; + } + ++/* These functions are for verifying that a remote logging host ++ * '@name' target does NOT resolve to an address attached to a ++ * local interface; as reported by Chuck Mead , ++ * if this happens, syslogd sends log messages to itself until ++ * the /var partition fills up. ++ * Jason Vas Dias ++ */ ++ ++ ++static void free_host_ai_list( struct addrinfo *ai ) ++{ ++ struct addrinfo *aie=0L, *ain=0L; ++ for(aie = ai; aie != 0L; aie = ain) ++ { ++ ain = aie->ai_next; ++ if(aie->ai_addr != 0L) ++ free(aie->ai_addr); ++ if(aie->ai_canonname != 0L) ++ free(aie->ai_canonname); ++ free(aie); ++ } ++} ++ ++static struct addrinfo *new_host_ai_node( struct addrinfo *ai ) ++{ ++ struct addrinfo *aie =(struct addrinfo *) malloc( sizeof(struct addrinfo) ); ++ int len; ++ ++ if( aie == 0L ) ++ return 0L; ++ if( ai != 0L ) ++ memcpy(aie, ai, sizeof(struct addrinfo)); ++ aie->ai_addr = 0L; ++ aie->ai_canonname =0L; ++ aie->ai_next = 0L; ++ if( ( ai->ai_addr != 0L ) && (ai->ai_addrlen > 0) ) ++ { ++ aie->ai_addr = (struct sockaddr*) malloc( ai->ai_addrlen ); ++ if( aie->ai_addr != 0L ) ++ memcpy(aie->ai_addr, ai->ai_addr, ai->ai_addrlen ); ++ } ++ if( ( ai->ai_canonname != 0L) && (*(ai->ai_canonname) != '\0') ) ++ { ++ len = strlen(ai->ai_canonname); ++ aie->ai_canonname = (char*) malloc( len + 1); ++ if( aie->ai_canonname != 0L ) ++ { ++ memcpy( aie->ai_canonname, ai->ai_canonname, len ); ++ ai->ai_canonname[len]='\0'; ++ } ++ } ++ return aie; ++} ++ ++struct addrinfo *host_ai_list( char *host ) ++{ ++ struct addrinfo *ai=0L, *ail=0L, *aip, *aie, aih; ++ int r; ++ char *n; ++ ++ if ( (host == 0L) || (*host == '\0') ) ++ return 0L; ++ memset(&aih,'\0',sizeof(struct addrinfo)); ++ aih.ai_flags = AI_CANONNAME; ++ aip=0L; ++ if( ((r=getaddrinfo(host, 0L, &aih, &aip)) != 0 ) || (aip == 0L) ) ++ return(0L); ++ else ++ for( aie=aip; aie != 0L; aie=aie->ai_next ) ++ { ++ if( (aie->ai_addr == 0L) ++ ||(aie->ai_family == PF_UNSPEC) ++ ||(aie->ai_addrlen <= 0) ++ ) ++ continue; ++ if(ai==0L) ++ { ++ if(aie->ai_canonname == 0L) ++ continue; ++ ai = new_host_ai_node(aie); ++ ail= ai; ++ }else ++ { ++ n=0L; ++ if( aie->ai_canonname == 0L) ++ { ++ n = ai->ai_canonname; ++ aie->ai_canonname = n; ++ } ++ ai->ai_next=new_host_ai_node(aie); ++ ai=ai->ai_next; ++ if(n != 0L) ++ aie->ai_canonname = 0L; ++ } ++ if (aie == aie->ai_next) ++ break; ++ while ++ ( ++ (aie->ai_next != 0L) ++ &&( ++ ( aie->ai_next->ai_addr == 0L) ++ ||( aie->ai_addr == aie->ai_next->ai_addr ) ++ ||( (aie->ai_next->ai_family == aie->ai_family) ++ &&(aie->ai_next->ai_addrlen == aie->ai_addrlen) ++ &&(memcmp( aie->ai_next->ai_addr, aie->ai_addr, aie->ai_addrlen)==0) ++ ) ++ ) ++ )/* bug: each unique address / name combination is repeated three times! */ ++ aie = aie->ai_next; ++ } ++ if ( ai != 0L) ++ ai->ai_next=0L; ++ freeaddrinfo(aip); ++ return ail; ++} ++ ++int hosts_equal( struct addrinfo *ai1, struct addrinfo *ai2 ) ++{ ++ struct addrinfo *ai=0; ++ for(; ai1 != 0L; ai1 = ai1->ai_next) ++ if (( ai1->ai_canonname != 0L) || ( ai1->ai_addr != 0L)) ++ { ++ for(ai = ai2; ai != 0L; ai = ai->ai_next) ++ { ++ if( ( ( ai1->ai_canonname != 0L) ++ &&( ai->ai_canonname != 0L) ++ &&( strcmp(ai->ai_canonname, ai1->ai_canonname)==0) ++ ) ++ || ( ( ai1->ai_addr != 0L) ++ &&( ai->ai_addr != 0L ) ++ &&( ai1->ai_family == ai->ai_family) ++ &&( ai1->ai_addrlen == ai->ai_addrlen) ++ &&( memcmp(ai->ai_addr, ai1->ai_addr, ai->ai_addrlen) == 0) ++ ) ++ ) break; ++ } ++ if( ai != 0L ) ++ break; ++ } ++ return ((ai1 != 0L) && (ai != 0L)); ++} ++ ++struct in_addr *not_local_address(char *host) ++{ ++ char hostname[1024]; ++ struct addrinfo *ai1, *ai2, *ai_next=0; ++ struct ifaddrs *ifa=0L; ++ struct in_addr *ina=0L; ++ if ( host == 0L ) ++ return 0L; ++ if( (strcmp(host,"localhost") == 0) ++ ||(strcmp(host,"localhost.localdomain") == 0) ++ ||(strcmp(host,"127.0.0.1") == 0) ++ ||(strcmp(host,"::1") == 0) ++ ) return 0L; ++ if (gethostname(hostname,1024) == 0) ++ if ( strcmp(host, hostname) == 0 ) ++ return 0L; ++ ai1 = host_ai_list(host); ++ ai2 = host_ai_list(hostname); ++ if( hosts_equal(ai1, ai2) ) ++ return 0L; ++ free_host_ai_list(ai2); ++ ai2=0L; ++ if( getifaddrs(&ifa) == 0) ++ { ++ for(; (ifa != 0L) && (ifa->ifa_addr != 0L); ifa = ifa->ifa_next ) ++ { ++ if( inet_ntop( ifa->ifa_addr->sa_family, ++ ((ifa->ifa_addr->sa_family == PF_INET) ++ ? (void*)&(((struct sockaddr_in*)(ifa->ifa_addr))->sin_addr) ++ : (ifa->ifa_addr->sa_family == PF_INET6) ++ ? (void*)&(((struct sockaddr_in6*)(ifa->ifa_addr))->sin6_addr) ++ : (void*)&(ifa->ifa_addr->sa_data[0]) ++ ), ++ hostname, ++ sizeof(hostname) ++ ) != 0L ++ ) ++ { ++ ai2=host_ai_list(hostname); ++ if( hosts_equal(ai1, ai2) ) ++ break; ++ free_host_ai_list(ai2); ++ ai2=0L; ++ } ++ } ++ } ++ if( ai2 != 0L ) ++ { ++ free_host_ai_list(ai2); ++ return 0L; ++ } ++ for(ai2 = ai1; ai2 != 0L; ai2 = ai_next) ++ { ++ if ( (ai2->ai_addr != 0L) && (ai2->ai_addr->sa_family == PF_INET)) ++ break; ++ } ++ if( ai2 != 0L ) ++ { ++ ina = (struct in_addr *)malloc(sizeof(struct in_addr)); ++ memcpy(ina,&(((struct sockaddr_in*)ai2->ai_addr)->sin_addr), sizeof(struct in_addr)); ++ free_host_ai_list(ai1); ++ return ina; ++ } ++ free_host_ai_list(ai1); ++ return 0L; ++} ++ + /* + * Local variables: + * c-indent-level: 8 Added: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-preserve_percents.patch =================================================================== --- tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-preserve_percents.patch 2005-01-18 07:59:09 UTC (rev 5705) +++ tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-preserve_percents.patch 2005-01-18 08:30:59 UTC (rev 5706) @@ -0,0 +1,45 @@ +--- sysklogd-1.4.1rh/klogd.c.preserve_percents 2002-04-17 10:49:34.000000000 -0400 ++++ sysklogd-1.4.1rh/klogd.c 2004-12-02 15:58:17.026614000 -0500 +@@ -741,7 +741,7 @@ + switch( parse_state ) + { + case PARSING_TEXT: +- delta = copyin( line, space, ptr, len, "\n[%" ); ++ delta = copyin( line, space, ptr, len, "\n[" ); + line += delta; + ptr += delta; + space -= delta; +@@ -797,30 +797,9 @@ + parse_state = PARSING_SYMSTART; /* at < */ + break; + } +- if( *ptr == '%' ) /* dangerous printf marker */ +- { +- delta = 0; +- while (len && *ptr == '%') +- { +- *line++ = *ptr++; /* copy it in */ +- space -= 1; +- len -= 1; +- delta++; +- } +- if (delta % 2) /* odd amount of %'s */ +- { +- if (space) +- { +- *line++ = '%'; /* so simply add one */ +- space -= 1; +- } +- else +- { +- *line++ = '\0'; /* remove the last one / terminate the string */ +- } +- +- } +- } ++ /* Now that line_buff is no longer fed to *printf as format ++ * string, '%'s are no longer "dangerous". ++ */ + break; + + case PARSING_SYMSTART: Deleted: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-security.patch =================================================================== --- tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-security.patch 2005-01-18 07:59:09 UTC (rev 5705) +++ tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-security.patch 2005-01-18 08:30:59 UTC (rev 5706) @@ -1,248 +0,0 @@ -diff -Nur sysklogd-1.4.1.orig/klogd.8 sysklogd-1.4.1/klogd.8 ---- sysklogd-1.4.1.orig/klogd.8 Sun Mar 11 20:35:51 2001 -+++ sysklogd-1.4.1/klogd.8 Fri Mar 16 14:11:38 2001 -@@ -3,6 +3,7 @@ - .\" Sun Jul 30 01:35:55 MET: Martin Schulze: Updates - .\" Sun Nov 19 23:22:21 MET: Martin Schulze: Updates - .\" Mon Aug 19 09:42:08 CDT 1996: Dr. G.W. Wettstein: Updates -+.\" Thu Feb 17 2000: Chris Wing: Unprivileged klogd feature - .\" - .TH KLOGD 8 "21 August, 1999" "Version 1.4" "Linux System Administration" - .SH NAME -@@ -17,7 +18,11 @@ - .RB [ " \-f " - .I fname - ] -+.RB [ " \-u " -+.I username -+] - .RB [ " \-iI " ] -+.RB [ " \-r " ] - .RB [ " \-n " ] - .RB [ " \-o " ] - .RB [ " \-p " ] -@@ -46,11 +51,24 @@ - .BI "\-f " file - Log messages to the specified filename rather than to the syslog facility. - .TP -+.BI "\-u " username -+Tells klogd to become the specified user and drop root privileges before -+starting logging. This is useful if you are paranoid about how well we wrote -+this program. -+.TP - .BI "\-i \-I" - Signal the currently executing klogd daemon. Both of these switches control - the loading/reloading of symbol information. The \-i switch signals the - daemon to reload the kernel module symbols. The \-I switch signals for a - reload of both the static kernel symbols and the kernel module symbols. -+.TP -+.B "\-r" -+Reset kernel logging. You should run -+.B klogd -+with this argument after killing the daemon, if you run the daemon as a non- -+privileged user. This is because -+.B klogd -+will be unable to reset kernel logging automatically in that case. - .TP - .B "\-n" - Avoid auto-backgrounding. This is needed especially if the -diff -Nur sysklogd-1.4.1.orig/klogd.c sysklogd-1.4.1/klogd.c ---- sysklogd-1.4.1.orig/klogd.c Sun Mar 11 20:40:10 2001 -+++ sysklogd-1.4.1/klogd.c Fri Mar 16 14:38:52 2001 -@@ -275,6 +275,10 @@ - #define ksyslog klogctl - #endif - -+/* Support for running as an unprivileged user */ -+#include -+#include -+ - #define LOG_BUFFER_SIZE 4096 - #define LOG_LINE_LENGTH 1000 - -@@ -308,6 +312,9 @@ - int debugging = 0; - int symbols_twice = 0; - -+int drop_privileges = 0; -+uid_t server_uid = 0; -+gid_t server_gid = 0; - - /* Function prototypes. */ - extern int ksyslog(int type, char *buf, int len); -@@ -994,7 +1001,7 @@ - chdir ("/"); - #endif - /* Parse the command-line. */ -- while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF) -+ while ((ch = getopt(argc, argv, "c:df:u:iIk:noprsvx2")) != EOF) - switch((char)ch) - { - case '2': /* Print lines with symbols twice. */ -@@ -1010,6 +1017,31 @@ - output = optarg; - use_output++; - break; -+ case 'u': /* Run as this user */ -+ if (optarg) { -+ struct passwd *pwd; -+ -+ pwd = getpwnam(optarg); -+ if (!pwd) { -+ fprintf(stderr, "Failed to look up user %s " \ -+ "to switch to. Terminating.\n", optarg); -+ exit(1); -+ } -+ -+ drop_privileges = 1; -+ server_uid = pwd->pw_uid; -+ server_gid = pwd->pw_gid; -+ } else { -+ fprintf(stderr, "Must specify user name along " \ -+ "with -u option.\n"); -+ exit(1); -+ } -+ break; -+ case 'r': /* Reset logging */ -+ Syslog(LOG_INFO, "Resetting kernel logging."); -+ CloseLogSrc(); -+ exit(0); -+ break; - case 'i': /* Reload module symbols. */ - SignalDaemon(SIGUSR1); - return(0); -@@ -1161,6 +1193,13 @@ - if (symbol_lookup) { - InitKsyms(symfile); - InitMsyms(); -+ } -+ -+ /* Drop privileges if a user name was specified on the command line */ -+ if (drop_privileges) { -+ setgroups(0, NULL); -+ setgid(server_gid); -+ setuid(server_uid); - } - - /* The main loop. */ -diff -Nur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8 ---- sysklogd-1.4.1.orig/sysklogd.8 Sun Mar 11 20:35:51 2001 -+++ sysklogd-1.4.1/sysklogd.8 Fri Mar 16 14:40:16 2001 -@@ -29,6 +29,9 @@ - .RB [ " \-s " - .I domainlist - ] -+.RB [ " \-u" -+.IB username -+] - .RB [ " \-v " ] - .LP - .SH DESCRIPTION -@@ -149,6 +152,22 @@ - is specified and the host logging resolves to satu.infodrom.north.de - no domain would be cut, you will have to specify two domains like: - .BR "\-s north.de:infodrom.north.de" . -+.TP -+.BI "\-u " "username" -+This causes the -+.B syslogd -+daemon to become the named user before starting up logging. This -+option is useful if you are paranoid about how well we wrote this -+program. -+ -+Note that when this option is in use, -+.B syslogd -+will open all log files as root when the daemon is first started; -+however, after a -+.B SIGHUP -+the files will be reopened as the non-privileged user. You should -+take this into account when deciding the ownership of the log -+files. - .TP - .B "\-v" - Print version and exit. -diff -Nur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c ---- sysklogd-1.4.1.orig/syslogd.c Sun Mar 11 20:40:10 2001 -+++ sysklogd-1.4.1/syslogd.c Fri Mar 16 14:44:02 2001 -@@ -500,6 +500,10 @@ - #include - #endif - -+/* Support for running syslogd as non-root user */ -+#include -+#include -+ - #ifndef UTMP_FILE - #ifdef UTMP_FILENAME - #define UTMP_FILE UTMP_FILENAME -@@ -735,6 +739,7 @@ - char **LocalHosts = NULL; /* these hosts are logged with their hostname */ - int NoHops = 1; /* Can we bounce syslog messages through an - intermediate host. */ -+char *server_user = NULL; /* user name to run server as, instead of root */ - - extern int errno; - -@@ -829,7 +834,7 @@ - funix[i] = -1; - } - -- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF) -+ while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:u:v")) != EOF) - switch((char)ch) { - case 'a': - if (nfunix < MAXFUNIX) -@@ -874,6 +879,15 @@ - } - StripDomains = crunch_list(optarg); - break; -+ case 'u': -+ if (optarg) -+ server_user = strdup(optarg); -+ else { -+ fprintf (stderr, "Must specify user name " \ -+ "along with -u option.\n"); -+ exit (1); -+ } -+ break; - case 'v': - printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); - exit (0); -@@ -1020,6 +1034,28 @@ - if (getpid() != ppid) - kill (ppid, SIGTERM); - #endif -+ /* -+ * Drop privileges if a user name was specified on -+ * the command line. -+ */ -+ if (server_user) { -+ struct passwd *pwd; -+ -+ pwd = getpwnam(server_user); -+ if (!pwd) { -+ dprintf("Failed to look up user %s.\n", server_user); -+ exit(1); -+ } -+ -+ /* initgroups should not require the stupid "extra group" thingy */ -+ if (initgroups(server_user, pwd->pw_gid)) { -+ dprintf("Failed to set groups for user %s.\n", server_user); -+ exit(1); -+ } -+ -+ setgid(pwd->pw_gid); -+ setuid(pwd->pw_uid); -+ } - - /* Main loop begins here. */ - for (;;) { -@@ -1175,7 +1211,7 @@ - int usage() - { - fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ -- " [-s domainlist] [-f conffile]\n"); -+ " [-s domainlist] [-f conffile] [-u username]\n"); - exit(1); - } - Added: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-siginterrupt.patch =================================================================== --- tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-siginterrupt.patch 2005-01-18 07:59:09 UTC (rev 5705) +++ tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-siginterrupt.patch 2005-01-18 08:30:59 UTC (rev 5706) @@ -0,0 +1,47 @@ +--- sysklogd-1.4.1rh/syslogd.c.siginterrupt 2004-08-02 18:02:35.000000000 -0400 ++++ sysklogd-1.4.1rh/syslogd.c 2004-12-01 13:21:34.751046000 -0500 +@@ -724,7 +724,7 @@ + char LocalHostName[MAXHOSTNAMELEN+1]; /* our hostname */ + char *LocalDomain; /* our local domain name */ + int InetInuse = 0; /* non-zero if INET sockets are being used */ +-int finet = -1; /* Internet datagram socket */ ++int finet= -1; /* Internet datagram socket */ + int LogPort; /* port number for INET connections */ + int Initialized = 0; /* set when we have initialized ourselves */ + int MarkInterval = 20 * 60; /* interval between marks in seconds */ +@@ -998,7 +998,15 @@ + (void) signal(SIGALRM, domark); + (void) signal(SIGUSR1, Debug ? debug_switch : SIG_IGN); + (void) alarm(TIMERINTVL); +- ++ ++ /* By default, signal() now specifies SA_RESTART, so system calls ++ * will NOT now return EINTR when a signal arrives during them. ++ * This makes things like recvfrom potentially hang forever... ++ * Hence we need to add siginterrupt calls: ++ */ ++ siginterrupt(SIGTERM,1); ++ siginterrupt(SIGALRM,1); ++ + /* Create a partial message table for all file descriptors. */ + num_fds = getdtablesize(); + dprintf("Allocated parts table for %d file descriptors.\n", num_fds); +@@ -1906,6 +1914,7 @@ + (void) signal(SIGTERM, SIG_DFL); + (void) alarm(0); + (void) signal(SIGALRM, endtty); ++ siginterrupt(SIGALRM,1); + #ifndef SYSV + (void) signal(SIGTTOU, SIG_IGN); + (void) sigsetmask(0); +@@ -2087,8 +2096,9 @@ + } + } + } +- (void) signal(SIGALRM, domark); ++ (void) signal(SIGALRM, domark); + (void) alarm(TIMERINTVL); ++ siginterrupt(SIGALRM,1); + } + + void debug_switch() Deleted: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch =================================================================== --- tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch 2005-01-18 07:59:09 UTC (rev 5705) +++ tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch 2005-01-18 08:30:59 UTC (rev 5706) @@ -1,249 +0,0 @@ -diff -urN sysklogd-1.4.1rh.orig/klogd.8 sysklogd-1.4.1rh/klogd.8 ---- sysklogd-1.4.1rh.orig/klogd.8 2001-07-09 07:13:11.000000000 +0300 -+++ sysklogd-1.4.1rh/klogd.8 2004-06-08 22:45:42.000000000 +0300 -@@ -3,6 +3,7 @@ - .\" Sun Jul 30 01:35:55 MET: Martin Schulze: Updates - .\" Sun Nov 19 23:22:21 MET: Martin Schulze: Updates - .\" Mon Aug 19 09:42:08 CDT 1996: Dr. G.W. Wettstein: Updates -+.\" Thu Feb 17 2000: Chris Wing: Unprivileged klogd feature - .\" - .TH KLOGD 8 "21 August, 1999" "Version 1.4" "Linux System Administration" - .SH NAME -@@ -17,7 +18,11 @@ - .RB [ " \-f " - .I fname - ] -+.RB [ " \-u " -+.I username -+] - .RB [ " \-iI " ] -+.RB [ " \-r " ] - .RB [ " \-n " ] - .RB [ " \-o " ] - .RB [ " \-p " ] -@@ -46,12 +51,25 @@ - .BI "\-f " file - Log messages to the specified filename rather than to the syslog facility. - .TP -+.BI "\-u " username -+Tells klogd to become the specified user and drop root privileges before -+starting logging. This is useful if you are paranoid about how well we wrote -+this program. -+.TP - .BI "\-i \-I" - Signal the currently executing klogd daemon. Both of these switches control - the loading/reloading of symbol information. The \-i switch signals the - daemon to reload the kernel module symbols. The \-I switch signals for a - reload of both the static kernel symbols and the kernel module symbols. - .TP -+.B "\-r" -+Reset kernel logging. You should run -+.B klogd -+with this argument after killing the daemon, if you run the daemon as a non- -+privileged user. This is because -+.B klogd -+will be unable to reset kernel logging automatically in that case. -+.TP - .B "\-n" - Avoid auto-backgrounding. This is needed especially if the - .B klogd -diff -urN sysklogd-1.4.1rh.orig/klogd.c sysklogd-1.4.1rh/klogd.c ---- sysklogd-1.4.1rh.orig/klogd.c 2002-04-17 17:49:34.000000000 +0300 -+++ sysklogd-1.4.1rh/klogd.c 2004-06-08 22:49:31.000000000 +0300 -@@ -279,6 +279,10 @@ - #define _PATH_KLOG "/proc/kmsg" - #endif - -+/* Support for running as an unprivileged user */ -+#include -+#include -+ - #define LOG_BUFFER_SIZE 4096 - #define LOG_LINE_LENGTH 1000 - -@@ -312,6 +316,9 @@ - int debugging = 0; - int symbols_twice = 0; - -+int drop_privileges = 0; -+uid_t server_uid = 0; -+gid_t server_gid = 0; - - /* Function prototypes. */ - extern int ksyslog(int type, char *buf, int len); -@@ -996,7 +1003,7 @@ - chdir ("/"); - #endif - /* Parse the command-line. */ -- while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF) -+ while ((ch = getopt(argc, argv, "c:df:u:iIk:noprsvx2")) != EOF) - switch((char)ch) - { - case '2': /* Print lines with symbols twice. */ -@@ -1012,6 +1019,31 @@ - output = optarg; - use_output++; - break; -+ case 'u': /* Run as this user */ -+ if (optarg) { -+ struct passwd *pwd; -+ -+ pwd = getpwnam(optarg); -+ if (!pwd) { -+ fprintf(stderr, "Failed to look up user %s " \ -+ "to switch to. Terminating.\n", optarg); -+ exit(1); -+ } -+ -+ drop_privileges = 1; -+ server_uid = pwd->pw_uid; -+ server_gid = pwd->pw_gid; -+ } else { -+ fprintf(stderr, "Must specify user name along " \ -+ "with -u option.\n"); -+ exit(1); -+ } -+ break; -+ case 'r': /* Reset logging */ -+ Syslog(LOG_INFO, "Resetting kernel logging."); -+ CloseLogSrc(); -+ exit(0); -+ break; - case 'i': /* Reload module symbols. */ - SignalDaemon(SIGUSR1); - return(0); -@@ -1171,6 +1203,13 @@ - } - } - -+ /* Drop privileges if a user name was specified on the command line */ -+ if (drop_privileges) { -+ setgroups(0, NULL); -+ setgid(server_gid); -+ setuid(server_uid); -+ } -+ - /* The main loop. */ - while (1) - { -diff -urN sysklogd-1.4.1rh.orig/sysklogd.8 sysklogd-1.4.1rh/sysklogd.8 ---- sysklogd-1.4.1rh.orig/sysklogd.8 2001-07-09 07:17:22.000000000 +0300 -+++ sysklogd-1.4.1rh/sysklogd.8 2004-06-08 22:45:42.000000000 +0300 -@@ -29,6 +29,9 @@ - .RB [ " \-s " - .I domainlist - ] -+.RB [ " \-u" -+.IB username -+] - .RB [ " \-v " ] - .RB [ " \-x " ] - .LP -@@ -151,6 +154,22 @@ - no domain would be cut, you will have to specify two domains like: - .BR "\-s north.de:infodrom.north.de" . - .TP -+.BI "\-u " "username" -+This causes the -+.B syslogd -+daemon to become the named user before starting up logging. This -+option is useful if you are paranoid about how well we wrote this -+program. -+ -+Note that when this option is in use, -+.B syslogd -+will open all log files as root when the daemon is first started; -+however, after a -+.B SIGHUP -+the files will be reopened as the non-privileged user. You should -+take this into account when deciding the ownership of the log -+files. -+.TP - .B "\-v" - Print version and exit. - .TP -diff -urN sysklogd-1.4.1rh.orig/syslogd.c sysklogd-1.4.1rh/syslogd.c ---- sysklogd-1.4.1rh.orig/syslogd.c 2004-05-04 01:00:45.000000000 +0300 -+++ sysklogd-1.4.1rh/syslogd.c 2004-06-08 22:52:28.000000000 +0300 -@@ -500,6 +500,10 @@ - #include - #endif - -+/* Support for running syslogd as non-root user */ -+#include -+#include -+ - #ifndef UTMP_FILE - #ifdef UTMP_FILENAME - #define UTMP_FILE UTMP_FILENAME -@@ -736,6 +740,7 @@ - char **LocalHosts = NULL; /* these hosts are logged with their hostname */ - int NoHops = 1; /* Can we bounce syslog messages through an - intermediate host. */ -+char *server_user = NULL; /* user name to run server as, instead of root */ - - extern int errno; - -@@ -830,7 +835,7 @@ - funix[i] = -1; - } - -- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:vx")) != EOF) -+ while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:u:vx")) != EOF) - switch((char)ch) { - case 'a': - if (nfunix < MAXFUNIX) -@@ -875,6 +880,15 @@ - } - StripDomains = crunch_list(optarg); - break; -+ case 'u': -+ if (optarg) -+ server_user = strdup(optarg); -+ else { -+ fprintf (stderr, "Must specify user name " \ -+ "along with -u option.\n"); -+ exit (1); -+ } -+ break; - case 'v': - printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); - exit (0); -@@ -1024,6 +1038,28 @@ - if (getpid() != ppid) - kill (ppid, SIGTERM); - #endif -+ /* -+ * Drop privileges if a user name was specified on -+ * the command line. -+ */ -+ if (server_user) { -+ struct passwd *pwd; -+ -+ pwd = getpwnam(server_user); -+ if (!pwd) { -+ dprintf("Failed to look up user %s.\n", server_user); -+ exit(1); -+ } -+ -+ /* initgroups should not require the stupid "extra group" thingy */ -+ if (initgroups(server_user, pwd->pw_gid)) { -+ dprintf("Failed to set groups for user %s.\n", server_user); -+ exit(1); -+ } -+ -+ setgid(pwd->pw_gid); -+ setuid(pwd->pw_uid); -+ } - - /* Main loop begins here. */ - for (;;) { -@@ -1179,7 +1215,7 @@ - int usage() - { - fprintf(stderr, "usage: syslogd [-drvxh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ -- " [-s domainlist] [-f conffile]\n"); -+ " [-s domainlist] [-f conffile] [-u username]\n"); - exit(1); - } - Modified: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.2/sysklogd/current/specs/sysklogd.spec =================================================================== --- tinysofa/releases/1.2/sysklogd/current/specs/sysklogd.spec 2005-01-18 07:59:09 UTC (rev 5705) +++ tinysofa/releases/1.2/sysklogd/current/specs/sysklogd.spec 2005-01-18 08:30:59 UTC (rev 5706) @@ -1,13 +1,15 @@ Summary: System logging and kernel message trapping daemons. Name: sysklogd Version: 1.4.1 -Release: 37ts -Copyright: GPL +Release: 38jh +License: GPL Group: main Source: sysklogd-%{version}rh.tar.gz Source1: syslog.init Source2: syslog.sysconfig -Patch: sysklogd-1.4.1rh-security.patch +Patch0: sysklogd-1.4.1-siginterrupt.patch +Patch1: sysklogd-1.4.1-noforward_local_address.patch +Patch2: sysklogd-1.4.1-preserve_percents.patch Prereq: coreutils initscripts filesystem %service_requires Conflicts: logrotate < 3.5.2 @@ -25,13 +27,13 @@ %prep %setup -q -n sysklogd-%{version}rh -%patch -p1 -b .security +%patch0 -p1 -b .siginterrupt +%patch1 -p1 -b .noforward_local_address +%patch2 -p1 -b .preserve_percents %build -%make \ - CFLAGS="%{optflags} -DSYSV -D_GNU_SOURCE -Wall" \ - LDFLAGS="" +%make %install @@ -99,6 +101,9 @@ %changelog +* Tue Jan 18 2005 Jaakko Heinonen 1.4.1-38jh +- new Red Hat upstream + * Thu Aug 05 2004 tsintegrate 1.4.1-37ts - current (1.4.1-37jh) integrated as 1.4.1-37ts for release 1.1 From svn at tinysofa.org Tue Jan 18 09:17:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 18 Jan 2005 04:17:06 -0500 (EST) Subject: [tinysofa-svn] r5707 - tinysofa/releases/1.2/dhcp/current/sources Message-ID: <20050118091706.E912A344138@minbar.tinysofa.org> Author: jh Date: 2005-01-18 04:17:00 -0500 (Tue, 18 Jan 2005) New Revision: 5707 Modified: tinysofa/releases/1.2/dhcp/current/sources/dhcpd.init Log: - fix insecure configtest Modified: tinysofa/releases/1.2/dhcp/current/sources/dhcpd.init =================================================================== --- tinysofa/releases/1.2/dhcp/current/sources/dhcpd.init 2005-01-18 08:30:59 UTC (rev 5706) +++ tinysofa/releases/1.2/dhcp/current/sources/dhcpd.init 2005-01-18 09:17:00 UTC (rev 5707) @@ -31,17 +31,8 @@ configtest() { - local retval TEMP=/tmp/dhcpd$$.err - - /usr/sbin/dhcpd -t 2>$TEMP - retval=$? - if [ $retval -ne 0 ] - then - cat $TEMP - rm -f $TEMP - fi - - return $retval + /usr/sbin/dhcpd -t + return $? } start() { From svn at tinysofa.org Tue Jan 18 09:47:20 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 18 Jan 2005 04:47:20 -0500 (EST) Subject: [tinysofa-svn] r5709 - in tinysofa/releases/1.2/sysklogd/current: sources specs Message-ID: <20050118094720.BD057344138@minbar.tinysofa.org> Author: jh Date: 2005-01-18 04:47:11 -0500 (Tue, 18 Jan 2005) New Revision: 5709 Added: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch Modified: tinysofa/releases/1.2/sysklogd/current/specs/sysklogd.spec Log: - add security patch back Added: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch =================================================================== --- tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch 2005-01-18 09:37:29 UTC (rev 5708) +++ tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch 2005-01-18 09:47:11 UTC (rev 5709) @@ -0,0 +1,249 @@ +diff -urN sysklogd-1.4.1rh.orig/klogd.8 sysklogd-1.4.1rh/klogd.8 +--- sysklogd-1.4.1rh.orig/klogd.8 2001-07-09 07:13:11.000000000 +0300 ++++ sysklogd-1.4.1rh/klogd.8 2004-06-08 22:45:42.000000000 +0300 +@@ -3,6 +3,7 @@ + .\" Sun Jul 30 01:35:55 MET: Martin Schulze: Updates + .\" Sun Nov 19 23:22:21 MET: Martin Schulze: Updates + .\" Mon Aug 19 09:42:08 CDT 1996: Dr. G.W. Wettstein: Updates ++.\" Thu Feb 17 2000: Chris Wing: Unprivileged klogd feature + .\" + .TH KLOGD 8 "21 August, 1999" "Version 1.4" "Linux System Administration" + .SH NAME +@@ -17,7 +18,11 @@ + .RB [ " \-f " + .I fname + ] ++.RB [ " \-u " ++.I username ++] + .RB [ " \-iI " ] ++.RB [ " \-r " ] + .RB [ " \-n " ] + .RB [ " \-o " ] + .RB [ " \-p " ] +@@ -46,12 +51,25 @@ + .BI "\-f " file + Log messages to the specified filename rather than to the syslog facility. + .TP ++.BI "\-u " username ++Tells klogd to become the specified user and drop root privileges before ++starting logging. This is useful if you are paranoid about how well we wrote ++this program. ++.TP + .BI "\-i \-I" + Signal the currently executing klogd daemon. Both of these switches control + the loading/reloading of symbol information. The \-i switch signals the + daemon to reload the kernel module symbols. The \-I switch signals for a + reload of both the static kernel symbols and the kernel module symbols. + .TP ++.B "\-r" ++Reset kernel logging. You should run ++.B klogd ++with this argument after killing the daemon, if you run the daemon as a non- ++privileged user. This is because ++.B klogd ++will be unable to reset kernel logging automatically in that case. ++.TP + .B "\-n" + Avoid auto-backgrounding. This is needed especially if the + .B klogd +diff -urN sysklogd-1.4.1rh.orig/klogd.c sysklogd-1.4.1rh/klogd.c +--- sysklogd-1.4.1rh.orig/klogd.c 2002-04-17 17:49:34.000000000 +0300 ++++ sysklogd-1.4.1rh/klogd.c 2004-06-08 22:49:31.000000000 +0300 +@@ -279,6 +279,10 @@ + #define _PATH_KLOG "/proc/kmsg" + #endif + ++/* Support for running as an unprivileged user */ ++#include ++#include ++ + #define LOG_BUFFER_SIZE 4096 + #define LOG_LINE_LENGTH 1000 + +@@ -312,6 +316,9 @@ + int debugging = 0; + int symbols_twice = 0; + ++int drop_privileges = 0; ++uid_t server_uid = 0; ++gid_t server_gid = 0; + + /* Function prototypes. */ + extern int ksyslog(int type, char *buf, int len); +@@ -996,7 +1003,7 @@ + chdir ("/"); + #endif + /* Parse the command-line. */ +- while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF) ++ while ((ch = getopt(argc, argv, "c:df:u:iIk:noprsvx2")) != EOF) + switch((char)ch) + { + case '2': /* Print lines with symbols twice. */ +@@ -1012,6 +1019,31 @@ + output = optarg; + use_output++; + break; ++ case 'u': /* Run as this user */ ++ if (optarg) { ++ struct passwd *pwd; ++ ++ pwd = getpwnam(optarg); ++ if (!pwd) { ++ fprintf(stderr, "Failed to look up user %s " \ ++ "to switch to. Terminating.\n", optarg); ++ exit(1); ++ } ++ ++ drop_privileges = 1; ++ server_uid = pwd->pw_uid; ++ server_gid = pwd->pw_gid; ++ } else { ++ fprintf(stderr, "Must specify user name along " \ ++ "with -u option.\n"); ++ exit(1); ++ } ++ break; ++ case 'r': /* Reset logging */ ++ Syslog(LOG_INFO, "Resetting kernel logging."); ++ CloseLogSrc(); ++ exit(0); ++ break; + case 'i': /* Reload module symbols. */ + SignalDaemon(SIGUSR1); + return(0); +@@ -1171,6 +1203,13 @@ + } + } + ++ /* Drop privileges if a user name was specified on the command line */ ++ if (drop_privileges) { ++ setgroups(0, NULL); ++ setgid(server_gid); ++ setuid(server_uid); ++ } ++ + /* The main loop. */ + while (1) + { +diff -urN sysklogd-1.4.1rh.orig/sysklogd.8 sysklogd-1.4.1rh/sysklogd.8 +--- sysklogd-1.4.1rh.orig/sysklogd.8 2001-07-09 07:17:22.000000000 +0300 ++++ sysklogd-1.4.1rh/sysklogd.8 2004-06-08 22:45:42.000000000 +0300 +@@ -29,6 +29,9 @@ + .RB [ " \-s " + .I domainlist + ] ++.RB [ " \-u" ++.IB username ++] + .RB [ " \-v " ] + .RB [ " \-x " ] + .LP +@@ -151,6 +154,22 @@ + no domain would be cut, you will have to specify two domains like: + .BR "\-s north.de:infodrom.north.de" . + .TP ++.BI "\-u " "username" ++This causes the ++.B syslogd ++daemon to become the named user before starting up logging. This ++option is useful if you are paranoid about how well we wrote this ++program. ++ ++Note that when this option is in use, ++.B syslogd ++will open all log files as root when the daemon is first started; ++however, after a ++.B SIGHUP ++the files will be reopened as the non-privileged user. You should ++take this into account when deciding the ownership of the log ++files. ++.TP + .B "\-v" + Print version and exit. + .TP +diff -urN sysklogd-1.4.1rh.orig/syslogd.c sysklogd-1.4.1rh/syslogd.c +--- sysklogd-1.4.1rh.orig/syslogd.c 2004-05-04 01:00:45.000000000 +0300 ++++ sysklogd-1.4.1rh/syslogd.c 2004-06-08 22:52:28.000000000 +0300 +@@ -500,6 +500,10 @@ + #include + #endif + ++/* Support for running syslogd as non-root user */ ++#include ++#include ++ + #ifndef UTMP_FILE + #ifdef UTMP_FILENAME + #define UTMP_FILE UTMP_FILENAME +@@ -736,6 +740,7 @@ + char **LocalHosts = NULL; /* these hosts are logged with their hostname */ + int NoHops = 1; /* Can we bounce syslog messages through an + intermediate host. */ ++char *server_user = NULL; /* user name to run server as, instead of root */ + + extern int errno; + +@@ -830,7 +835,7 @@ + funix[i] = -1; + } + +- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:vx")) != EOF) ++ while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:u:vx")) != EOF) + switch((char)ch) { + case 'a': + if (nfunix < MAXFUNIX) +@@ -875,6 +880,15 @@ + } + StripDomains = crunch_list(optarg); + break; ++ case 'u': ++ if (optarg) ++ server_user = strdup(optarg); ++ else { ++ fprintf (stderr, "Must specify user name " \ ++ "along with -u option.\n"); ++ exit (1); ++ } ++ break; + case 'v': + printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); + exit (0); +@@ -1024,6 +1038,28 @@ + if (getpid() != ppid) + kill (ppid, SIGTERM); + #endif ++ /* ++ * Drop privileges if a user name was specified on ++ * the command line. ++ */ ++ if (server_user) { ++ struct passwd *pwd; ++ ++ pwd = getpwnam(server_user); ++ if (!pwd) { ++ dprintf("Failed to look up user %s.\n", server_user); ++ exit(1); ++ } ++ ++ /* initgroups should not require the stupid "extra group" thingy */ ++ if (initgroups(server_user, pwd->pw_gid)) { ++ dprintf("Failed to set groups for user %s.\n", server_user); ++ exit(1); ++ } ++ ++ setgid(pwd->pw_gid); ++ setuid(pwd->pw_uid); ++ } + + /* Main loop begins here. */ + for (;;) { +@@ -1179,7 +1215,7 @@ + int usage() + { + fprintf(stderr, "usage: syslogd [-drvxh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ +- " [-s domainlist] [-f conffile]\n"); ++ " [-s domainlist] [-f conffile] [-u username]\n"); + exit(1); + } + Modified: tinysofa/releases/1.2/sysklogd/current/specs/sysklogd.spec =================================================================== --- tinysofa/releases/1.2/sysklogd/current/specs/sysklogd.spec 2005-01-18 09:37:29 UTC (rev 5708) +++ tinysofa/releases/1.2/sysklogd/current/specs/sysklogd.spec 2005-01-18 09:47:11 UTC (rev 5709) @@ -10,6 +10,8 @@ Patch0: sysklogd-1.4.1-siginterrupt.patch Patch1: sysklogd-1.4.1-noforward_local_address.patch Patch2: sysklogd-1.4.1-preserve_percents.patch +# tinysofa +Patch10: sysklogd-1.4.1rh-security.patch Prereq: coreutils initscripts filesystem %service_requires Conflicts: logrotate < 3.5.2 @@ -30,6 +32,7 @@ %patch0 -p1 -b .siginterrupt %patch1 -p1 -b .noforward_local_address %patch2 -p1 -b .preserve_percents +%patch10 -p1 -b .security~ %build From svn at tinysofa.org Tue Jan 18 19:06:41 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 18 Jan 2005 14:06:41 -0500 (EST) Subject: [tinysofa-svn] r5710 - tinysofa/releases/1.2/cpio/current/specs Message-ID: <20050118190641.88D89344138@minbar.tinysofa.org> Author: jh Date: 2005-01-18 14:06:35 -0500 (Tue, 18 Jan 2005) New Revision: 5710 Modified: tinysofa/releases/1.2/cpio/current/specs/cpio.spec Log: - disable info scripts Modified: tinysofa/releases/1.2/cpio/current/specs/cpio.spec =================================================================== --- tinysofa/releases/1.2/cpio/current/specs/cpio.spec 2005-01-18 09:47:11 UTC (rev 5709) +++ tinysofa/releases/1.2/cpio/current/specs/cpio.spec 2005-01-18 19:06:35 UTC (rev 5710) @@ -67,11 +67,11 @@ %clean_buildroot -%post -%info_post +#post +#info_post -%postun -%info_postun +#postun +#info_postun %files From svn at tinysofa.org Tue Jan 18 19:12:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 18 Jan 2005 14:12:47 -0500 (EST) Subject: [tinysofa-svn] r5711 - tinysofa/releases/1.2/openssh/current/sources Message-ID: <20050118191247.B99CF344138@minbar.tinysofa.org> Author: jh Date: 2005-01-18 14:12:41 -0500 (Tue, 18 Jan 2005) New Revision: 5711 Modified: tinysofa/releases/1.2/openssh/current/sources/sshd.init Log: - init script improvement Modified: tinysofa/releases/1.2/openssh/current/sources/sshd.init =================================================================== --- tinysofa/releases/1.2/openssh/current/sources/sshd.init 2005-01-18 19:06:35 UTC (rev 5710) +++ tinysofa/releases/1.2/openssh/current/sources/sshd.init 2005-01-18 19:12:41 UTC (rev 5711) @@ -18,6 +18,7 @@ [ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd RETVAL=0 +SSHD=/usr/sbin/sshd # Some functions to make the below more readable KEYGEN=/usr/bin/ssh-keygen @@ -97,7 +98,7 @@ fi } do_restart_sanity_check() { - sshd -t + $SSHD -t RETVAL=$? if [ ! "$RETVAL" = 0 ]; then my_failure "Configuration file or keys" @@ -116,7 +117,7 @@ echo -n "Starting sshd: " if [ ! -f $PID_FILE ] ; then - sshd $OPTIONS + $SSHD $OPTIONS RETVAL=$? if [ "$RETVAL" = "0" ] ; then my_success "sshd startup" "sshd" @@ -130,7 +131,7 @@ stop) echo -n "Shutting down sshd: " if [ -f $PID_FILE ] ; then - killproc sshd + killproc $SSHD RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd fi @@ -151,7 +152,7 @@ fi ;; status) - status sshd + status $SSHD RETVAL=$? ;; *) From svn at tinysofa.org Tue Jan 18 19:19:30 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 18 Jan 2005 14:19:30 -0500 (EST) Subject: [tinysofa-svn] r5712 - in tinysofa/releases/1.2/mkinitrd/current: sources specs Message-ID: <20050118191930.F3C1F344138@minbar.tinysofa.org> Author: jh Date: 2005-01-18 14:19:21 -0500 (Tue, 18 Jan 2005) New Revision: 5712 Modified: tinysofa/releases/1.2/mkinitrd/current/sources/mkinitrd-3.5.24-tinysofa-kernel-2.6.patch tinysofa/releases/1.2/mkinitrd/current/specs/mkinitrd.spec Log: - support pure 2.6 config Modified: tinysofa/releases/1.2/mkinitrd/current/sources/mkinitrd-3.5.24-tinysofa-kernel-2.6.patch =================================================================== --- tinysofa/releases/1.2/mkinitrd/current/sources/mkinitrd-3.5.24-tinysofa-kernel-2.6.patch 2005-01-18 19:12:41 UTC (rev 5711) +++ tinysofa/releases/1.2/mkinitrd/current/sources/mkinitrd-3.5.24-tinysofa-kernel-2.6.patch 2005-01-18 19:19:21 UTC (rev 5712) @@ -30,15 +30,3 @@ # special cases if [ "$modName" = "i2o_block" ]; then findmodule i2o_core -@@ -285,6 +290,11 @@ - kernelmajor=`echo $kernel | cut -d . -f 1,2` - if [ "$kernelmajor" == "2.6" ]; then - modulefile=/etc/modprobe.conf -+ -+ if [ ! -f $modulefile ]; then -+ echo "# autogenerated by generate-modprobe.conf" > $modulefile -+ /sbin/generate-modprobe.conf >> $modulefile -+ fi - fi - - # find a temporary directory which doesn't use tmpfs Modified: tinysofa/releases/1.2/mkinitrd/current/specs/mkinitrd.spec =================================================================== --- tinysofa/releases/1.2/mkinitrd/current/specs/mkinitrd.spec 2005-01-18 19:12:41 UTC (rev 5711) +++ tinysofa/releases/1.2/mkinitrd/current/specs/mkinitrd.spec 2005-01-18 19:19:21 UTC (rev 5712) @@ -10,15 +10,15 @@ Patch3: mkinitrd-3.5.21-tinysofa-titles.patch Patch4: mkinitrd-3.5.21-tinysofa-backwards-compat.patch Patch5: mkinitrd-3.5.24-tinysofa-kernel-2.6.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root # This needs to be PreReq'ed or system install will fail PreReq: losetup, e2fsprogs, coreutils, grep, mount, gzip, tar PreReq: mktemp >= 1.5-5tr, findutils, sed PreReq: filesystem >= 1.0, dev # depmod required by new-kernel-pkg -Requires: module-init-tools, modutils +Requires: module-init-tools BuildRequires: dietlibc, perl -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Mkinitrd creates filesystem images for use as initial ramdisk (initrd) @@ -35,6 +35,7 @@ mount the root filesystem. The mkinitrd program creates such a ramdisk using information found in the /etc/modules.conf file. + %prep %setup -q %patch1 -p1 @@ -43,22 +44,30 @@ %patch4 -p1 %patch5 -p1 + %build export CC="gcc %{?no_stack_protector}" %make + %install make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install + %clean %clean_buildroot + %files %defattr(-,root,root) /sbin/* %{_mandir}/man8/* + %changelog +* Tue Jan 18 2005 Jaakko Heinonen 3.5.24-3jh +- support pure 2.6 config + * Sat Sep 04 2004 tsintegrate 3.5.24-2ts - current (3.5.24-2gd) integrated as 3.5.24-2ts for release 1.1-U1 From svn at tinysofa.org Wed Jan 19 11:08:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 19 Jan 2005 06:08:04 -0500 (EST) Subject: [tinysofa-svn] r5713 - in tinysofa/releases/1.1/kernel/current: sources specs Message-ID: <20050119110804.59270344138@minbar.tinysofa.org> Author: jh Date: 2005-01-19 06:07:47 -0500 (Wed, 19 Jan 2005) New Revision: 5713 Added: tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-insert-vm-struct.patch Modified: tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-cmsg-validation.patch tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-mmap-updates.patch tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-netfixes.patch tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-syscall-auditing.patch tinysofa/releases/1.1/kernel/current/specs/kernel.spec Log: - fix CAN-2004-1235 CAN-2004-1237 CAN-2005-0003 (-27.0.2.EL) Modified: tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-cmsg-validation.patch =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-cmsg-validation.patch 2005-01-18 19:19:21 UTC (rev 5712) +++ tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-cmsg-validation.patch 2005-01-19 11:07:47 UTC (rev 5713) @@ -6,7 +6,7 @@ ((len) >= sizeof(struct cmsghdr32) ? (struct cmsghdr32 *)(ctl) : (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) +#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ -+ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ ((ucmlen) >= sizeof(struct cmsghdr32) && \ + (ucmlen) <= (unsigned long) \ + ((mhdr)->msg_controllen - \ + ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) @@ -33,7 +33,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) +#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ -+ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ ((ucmlen) >= sizeof(struct cmsghdr32) && \ + (ucmlen) <= (unsigned long) \ + ((mhdr)->msg_controllen - \ + ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) @@ -61,7 +61,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) +#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ -+ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ ((ucmlen) >= sizeof(struct cmsghdr32) && \ + (ucmlen) <= (unsigned long) \ + ((mhdr)->msg_controllen - \ + ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) @@ -89,7 +89,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) +#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ -+ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ ((ucmlen) >= sizeof(struct cmsghdr32) && \ + (ucmlen) <= (unsigned long) \ + ((mhdr)->msg_controllen - \ + ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) @@ -117,7 +117,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) +#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ -+ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ ((ucmlen) >= sizeof(struct cmsghdr32) && \ + (ucmlen) <= (unsigned long) \ + ((mhdr)->msg_controllen - \ + ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) @@ -163,7 +163,7 @@ (struct cmsghdr32 *)NULL) #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) +#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ -+ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ ((ucmlen) >= sizeof(struct cmsghdr32) && \ + (ucmlen) <= (unsigned long) \ + ((mhdr)->msg_controllen - \ + ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) Added: tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-insert-vm-struct.patch =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-insert-vm-struct.patch 2005-01-18 19:19:21 UTC (rev 5712) +++ tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-insert-vm-struct.patch 2005-01-19 11:07:47 UTC (rev 5713) @@ -0,0 +1,192 @@ +diff -urNp linux-1252/arch/ia64/ia32/binfmt_elf32.c linux-1260/arch/ia64/ia32/binfmt_elf32.c +--- linux-1252/arch/ia64/ia32/binfmt_elf32.c ++++ linux-1260/arch/ia64/ia32/binfmt_elf32.c +@@ -95,7 +95,11 @@ ia64_elf32_init (struct pt_regs *regs) + vma->vm_private_data = NULL; + down_write(¤t->mm->mmap_sem); + { +- insert_vm_struct(current->mm, vma); ++ if (insert_vm_struct(current->mm, vma)) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, vma); ++ return; ++ } + } + up_write(¤t->mm->mmap_sem); + } +@@ -117,7 +121,11 @@ ia64_elf32_init (struct pt_regs *regs) + vma->vm_private_data = NULL; + down_write(¤t->mm->mmap_sem); + { +- insert_vm_struct(current->mm, vma); ++ if (insert_vm_struct(current->mm, vma)) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, vma); ++ return; ++ } + } + up_write(¤t->mm->mmap_sem); + } +@@ -164,7 +172,7 @@ ia32_setup_arg_pages (struct linux_binpr + { + unsigned long stack_base; + struct vm_area_struct *mpnt; +- int i; ++ int i, ret; + + stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE; + +@@ -191,7 +199,11 @@ ia32_setup_arg_pages (struct linux_binpr + mpnt->vm_pgoff = 0; + mpnt->vm_file = NULL; + mpnt->vm_private_data = 0; +- insert_vm_struct(current->mm, mpnt); ++ if ((ret = insert_vm_struct(current->mm, mpnt))) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, mpnt); ++ return ret; ++ } + current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT; + } + +diff -urNp linux-1252/arch/ia64/mm/init.c linux-1260/arch/ia64/mm/init.c +--- linux-1252/arch/ia64/mm/init.c ++++ linux-1260/arch/ia64/mm/init.c +@@ -106,7 +106,13 @@ ia64_init_addr_space (void) + vma->vm_pgoff = 0; + vma->vm_file = NULL; + vma->vm_private_data = NULL; +- insert_vm_struct(current->mm, vma); ++ down_write(¤t->mm->mmap_sem); ++ if (insert_vm_struct(current->mm, vma)) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, vma); ++ return; ++ } ++ up_write(¤t->mm->mmap_sem); + } + + /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */ +@@ -118,7 +124,13 @@ ia64_init_addr_space (void) + vma->vm_end = PAGE_SIZE; + vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT); + vma->vm_flags = VM_READ | VM_MAYREAD | VM_IO | VM_RESERVED; +- insert_vm_struct(current->mm, vma); ++ down_write(¤t->mm->mmap_sem); ++ if (insert_vm_struct(current->mm, vma)) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, vma); ++ return; ++ } ++ up_write(¤t->mm->mmap_sem); + } + } + } +diff -urNp linux-1252/arch/s390x/kernel/exec32.c linux-1260/arch/s390x/kernel/exec32.c +--- linux-1252/arch/s390x/kernel/exec32.c ++++ linux-1260/arch/s390x/kernel/exec32.c +@@ -41,7 +41,7 @@ int setup_arg_pages32(struct linux_binpr + { + unsigned long stack_base; + struct vm_area_struct *mpnt; +- int i; ++ int i, ret; + + stack_base = STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE; + +@@ -65,7 +65,11 @@ int setup_arg_pages32(struct linux_binpr + mpnt->vm_pgoff = 0; + mpnt->vm_file = NULL; + mpnt->vm_private_data = (void *) 0; +- insert_vm_struct(current->mm, mpnt); ++ if ((ret = insert_vm_struct(current->mm, mpnt))) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, mpnt); ++ return ret; ++ } + current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT; + } + +diff -urNp linux-1252/arch/x86_64/ia32/ia32_binfmt.c linux-1260/arch/x86_64/ia32/ia32_binfmt.c +--- linux-1252/arch/x86_64/ia32/ia32_binfmt.c ++++ linux-1260/arch/x86_64/ia32/ia32_binfmt.c +@@ -284,7 +284,7 @@ int ia32_setup_arg_pages(struct linux_bi + { + unsigned long stack_base; + struct vm_area_struct *mpnt; +- int i; ++ int i, ret; + + stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE; + +@@ -312,7 +312,11 @@ int ia32_setup_arg_pages(struct linux_bi + mpnt->vm_pgoff = 0; + mpnt->vm_file = NULL; + mpnt->vm_private_data = (void *) 0; +- insert_vm_struct(current->mm, mpnt); ++ if ((ret = insert_vm_struct(current->mm, mpnt))) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, mpnt); ++ return ret; ++ } + current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT; + } + +diff -urNp linux-1252/fs/exec.c linux-1260/fs/exec.c +--- linux-1252/fs/exec.c ++++ linux-1260/fs/exec.c +@@ -337,7 +337,7 @@ int setup_arg_pages(struct linux_binprm + { + unsigned long stack_base; + struct vm_area_struct *mpnt; +- int i; ++ int i, ret; + + #ifdef __HAVE_ARCH_ALIGN_STACK + stack_base = arch_align_stack(STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE); +@@ -378,7 +378,11 @@ int setup_arg_pages(struct linux_binprm + mpnt->vm_pgoff = 0; + mpnt->vm_file = NULL; + mpnt->vm_private_data = (void *) 0; +- insert_vm_struct(current->mm, mpnt); ++ if ((ret = insert_vm_struct(current->mm, mpnt))) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, mpnt); ++ return ret; ++ } + current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT; + } + +diff -urNp linux-1252/include/linux/mm.h linux-1260/include/linux/mm.h +--- linux-1252/include/linux/mm.h ++++ linux-1260/include/linux/mm.h +@@ -732,7 +732,7 @@ extern void FASTCALL(__free_pte(pte_t pt + /* mmap.c */ + extern void lock_vma_mappings(struct vm_area_struct *); + extern void unlock_vma_mappings(struct vm_area_struct *); +-extern void insert_vm_struct(struct mm_struct *, struct vm_area_struct *); ++extern int insert_vm_struct(struct mm_struct *, struct vm_area_struct *); + extern void __insert_vm_struct(struct mm_struct *, struct vm_area_struct *); + extern void __vma_link_rb(struct mm_struct *, struct vm_area_struct *, + rb_node_t **, rb_node_t *); +diff -urNp linux-1252/mm/mmap.c linux-1260/mm/mmap.c +--- linux-1252/mm/mmap.c ++++ linux-1260/mm/mmap.c +@@ -1510,14 +1510,15 @@ void __insert_vm_struct(struct mm_struct + validate_mm(mm); + } + +-void insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma) ++int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma) + { + struct vm_area_struct * __vma, * prev; + rb_node_t ** rb_link, * rb_parent; + + __vma = find_vma_prepare(mm, vma->vm_start, &prev, &rb_link, &rb_parent); + if (__vma && __vma->vm_start < vma->vm_end) +- BUG(); ++ return -ENOMEM; + vma_link(mm, vma, prev, rb_link, rb_parent); + validate_mm(mm); ++ return 0; + } Modified: tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-mmap-updates.patch =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-mmap-updates.patch 2005-01-18 19:19:21 UTC (rev 5712) +++ tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-mmap-updates.patch 2005-01-19 11:07:47 UTC (rev 5713) @@ -1,3 +1,99 @@ +diff -urNp linux-1170/fs/binfmt_aout.c linux-1180/fs/binfmt_aout.c +--- linux-1170/fs/binfmt_aout.c ++++ linux-1180/fs/binfmt_aout.c +@@ -45,7 +45,7 @@ static void set_brk(unsigned long start, + end = PAGE_ALIGN(end); + if (end <= start) + return; +- do_brk(start, end - start); ++ do_brk_locked(start, end - start); + } + + /* +@@ -338,7 +338,7 @@ static int load_aout_binary(struct linux + map_size = ex.a_text+ex.a_data; + #endif + +- error = do_brk(text_addr & PAGE_MASK, map_size); ++ error = do_brk_locked(text_addr & PAGE_MASK, map_size); + if (error != (text_addr & PAGE_MASK)) { + send_sig(SIGKILL, current, 0); + return error; +@@ -372,7 +372,7 @@ static int load_aout_binary(struct linux + + if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) { + loff_t pos = fd_offset; +- do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); ++ do_brk_locked(N_TXTADDR(ex), ex.a_text+ex.a_data); + bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex), + ex.a_text+ex.a_data, &pos); + flush_icache_range((unsigned long) N_TXTADDR(ex), +@@ -469,7 +469,7 @@ static int load_aout_library(struct file + error_time = jiffies; + } + +- do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); ++ do_brk_locked(start_addr, ex.a_text + ex.a_data + ex.a_bss); + + file->f_op->read(file, (char *)start_addr, + ex.a_text + ex.a_data, &pos); +@@ -493,7 +493,7 @@ static int load_aout_library(struct file + len = PAGE_ALIGN(ex.a_text + ex.a_data); + bss = ex.a_text + ex.a_data + ex.a_bss; + if (bss > len) { +- error = do_brk(start_addr + len, bss - len); ++ error = do_brk_locked(start_addr + len, bss - len); + retval = error; + if (error != start_addr + len) + goto out; +diff -urNp linux-1170/fs/binfmt_elf.c linux-1180/fs/binfmt_elf.c +--- linux-1170/fs/binfmt_elf.c ++++ linux-1180/fs/binfmt_elf.c +@@ -85,7 +85,7 @@ static int set_brk(unsigned long start, + start = ELF_PAGEALIGN(start); + end = ELF_PAGEALIGN(end); + if (end > start) { +- unsigned long addr = do_brk(start, end - start); ++ unsigned long addr = do_brk_locked(start, end - start); + if (BAD_ADDR(addr)) + return addr; + } +@@ -410,7 +410,7 @@ elf_type, total_size); + + /* Map the last of the bss segment */ + if (last_bss > elf_bss) { +- error = do_brk(elf_bss, last_bss - elf_bss); ++ error = do_brk_locked(elf_bss, last_bss - elf_bss); + if (BAD_ADDR(error)) + goto out_close; + } +@@ -450,7 +450,7 @@ static unsigned long load_aout_interp(st + goto out; + } + +- do_brk(0, text_data); ++ do_brk_locked(0, text_data); + if (!interpreter->f_op || !interpreter->f_op->read) + goto out; + if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0) +@@ -458,7 +458,7 @@ static unsigned long load_aout_interp(st + flush_icache_range((unsigned long)addr, + (unsigned long)addr + text_data); + +- do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1), ++ do_brk_locked(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1), + interp_ex->a_bss); + elf_entry = interp_ex->a_entry; + +@@ -1023,7 +1023,7 @@ static int load_elf_library(struct file + len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1); + bss = elf_phdata->p_memsz + elf_phdata->p_vaddr; + if (bss > len) +- do_brk(len, bss - len); ++ do_brk_locked(len, bss - len); + error = 0; + + out_free_ph: diff -urNp linux-1170/include/linux/mm.h linux-1180/include/linux/mm.h --- linux-1170/include/linux/mm.h +++ linux-1180/include/linux/mm.h @@ -11,6 +107,14 @@ extern void exit_mmap(struct mm_struct *); extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); +@@ -739,6 +740,7 @@ out: + extern int do_munmap(struct mm_struct *, unsigned long, size_t, int acct); + + extern unsigned long do_brk(unsigned long, unsigned long); ++extern unsigned long do_brk_locked(unsigned long, unsigned long); + + #ifdef __i386__ + extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); diff -urNp linux-1170/kernel/fork.c linux-1180/kernel/fork.c --- linux-1170/kernel/fork.c +++ linux-1180/kernel/fork.c @@ -59,6 +163,17 @@ out: flush_tlb_mm(current->mm); return retval; +diff -urNp linux-1170/kernel/ksyms.c linux-1180/kernel/ksyms.c +--- linux-1170/kernel/ksyms.c ++++ linux-1180/kernel/ksyms.c +@@ -104,6 +104,7 @@ EXPORT_SYMBOL(__stop___kallsyms); + EXPORT_SYMBOL(do_mmap_pgoff); + EXPORT_SYMBOL(do_munmap); + EXPORT_SYMBOL(do_brk); ++EXPORT_SYMBOL(do_brk_locked); + EXPORT_SYMBOL(exit_mm); + EXPORT_SYMBOL(exit_files); + EXPORT_SYMBOL(exit_fs); diff -urNp linux-1170/mm/filemap.c linux-1180/mm/filemap.c --- linux-1170/mm/filemap.c +++ linux-1180/mm/filemap.c @@ -127,16 +242,19 @@ grow = (vma->vm_start - address) >> PAGE_SHIFT; /* Overcommit.. */ -@@ -1410,22 +1428,6 @@ out: +@@ -1410,22 +1428,19 @@ out: return addr; } -/* Build the RB tree corresponding to the VMA list. */ -void build_mmap_rb(struct mm_struct * mm) --{ ++/* locking version of do_brk. */ ++unsigned long do_brk_locked(unsigned long addr, unsigned long len) + { - struct vm_area_struct * vma; - rb_node_t ** rb_link, * rb_parent; -- ++ unsigned long ret; + - mm->mm_rb = RB_ROOT; - rb_link = &mm->mm_rb.rb_node; - rb_parent = NULL; @@ -145,8 +263,14 @@ - rb_parent = &vma->vm_rb; - rb_link = &rb_parent->rb_right; - } --} -- ++ down_write(¤t->mm->mmap_sem); ++ ret = do_brk(addr, len); ++ up_write(¤t->mm->mmap_sem); ++ ++ return ret; + } + ++ /* Release all mmaps. */ void exit_mmap(struct mm_struct * mm) { Modified: tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-netfixes.patch =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-netfixes.patch 2005-01-18 19:19:21 UTC (rev 5712) +++ tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-netfixes.patch 2005-01-19 11:07:47 UTC (rev 5713) @@ -3458,6 +3458,22 @@ if (tcp_may_update_window(tp, ack, ack_seq, nwin)) { flag |= FLAG_WIN_UPDATE; +diff -urNp linux-2060/net/ipv4/tcp_ipv4.c linux-2070/net/ipv4/tcp_ipv4.c +--- linux-2060/net/ipv4/tcp_ipv4.c ++++ linux-2070/net/ipv4/tcp_ipv4.c +@@ -1034,11 +1034,7 @@ void tcp_v4_err(struct sk_buff *skb, u32 + + switch (type) { + case ICMP_SOURCE_QUENCH: +- /* This is deprecated, but if someone generated it, +- * we have no reasons to ignore it. +- */ +- if (sk->lock.users == 0) +- tcp_enter_cwr(tp); ++ /* Just silently ignore these. */ + goto out; + case ICMP_PARAMETERPROB: + err = EPROTO; diff -urNp linux-2060/net/ipv4/tcp_minisocks.c linux-2070/net/ipv4/tcp_minisocks.c --- linux-2060/net/ipv4/tcp_minisocks.c +++ linux-2070/net/ipv4/tcp_minisocks.c Modified: tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-syscall-auditing.patch =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-syscall-auditing.patch 2005-01-18 19:19:21 UTC (rev 5712) +++ tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-syscall-auditing.patch 2005-01-19 11:07:47 UTC (rev 5713) @@ -117,7 +117,7 @@ diff -urNp linux-8240/arch/ia64/config.in linux-8250/arch/ia64/config.in --- linux-8240/arch/ia64/config.in +++ linux-8250/arch/ia64/config.in -@@ -130,6 +130,8 @@ bool 'Sysctl support' CONFIG_SYSCTL +@@ -131,6 +131,8 @@ bool 'Sysctl support' CONFIG_SYSCTL tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC @@ -986,7 +986,7 @@ diff -urNp linux-8240/arch/x86_64/ia32/ia32entry.S linux-8250/arch/x86_64/ia32/ia32entry.S --- linux-8240/arch/x86_64/ia32/ia32entry.S +++ linux-8250/arch/x86_64/ia32/ia32entry.S -@@ -56,7 +56,7 @@ ENTRY(ia32_syscall) +@@ -57,7 +57,7 @@ ENTRY(ia32_syscall) cld SAVE_ARGS GET_CURRENT(%r10) @@ -995,7 +995,7 @@ jne ia32_tracesys cmpl $(IA32_NR_syscalls),%eax jae ia32_badsys -@@ -69,7 +69,7 @@ ia32_tracesys: +@@ -70,7 +70,7 @@ ia32_tracesys: SAVE_REST movq $-ENOSYS,RAX(%rsp) movq %rsp,%rdi /* &pt_regs -> arg1 */ @@ -1004,7 +1004,7 @@ LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */ addq $ARGOFFSET,%rsp cmpl $(IA32_NR_syscalls),%eax -@@ -80,7 +80,7 @@ ia32_tracesys_end: +@@ -81,7 +81,7 @@ ia32_tracesys_end: movq %rax,RAX-ARGOFFSET(%rsp) 1: SAVE_REST movq %rsp,%rdi /* &pt_regs -> arg1 */ @@ -4231,7 +4231,7 @@ diff -urNp linux-8240/drivers/audit/filter.c linux-8250/drivers/audit/filter.c --- linux-8240/drivers/audit/filter.c +++ linux-8250/drivers/audit/filter.c -@@ -0,0 +1,817 @@ +@@ -0,0 +1,821 @@ +/* + * filter.c - system call filtering for the audit subsystem + * @@ -4671,6 +4671,10 @@ + return ERR_PTR(-ENOENT); + + dentry = parent_target->at_path.dentry; ++ ++ if (dentry == NULL) ++ return ERR_PTR(-ENOENT); ++ + while (!(inode = dentry->d_inode)) { + up = dentry->d_parent; + if (dentry == up) @@ -8840,7 +8844,7 @@ diff -urNp linux-8240/kernel/ksyms.c linux-8250/kernel/ksyms.c --- linux-8240/kernel/ksyms.c +++ linux-8250/kernel/ksyms.c -@@ -112,6 +112,7 @@ EXPORT_SYMBOL(exit_files); +@@ -113,6 +113,7 @@ EXPORT_SYMBOL(exit_files); EXPORT_SYMBOL(exit_fs); EXPORT_SYMBOL(exit_sighand); EXPORT_SYMBOL(unshare_files); Modified: tinysofa/releases/1.1/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.1/kernel/current/specs/kernel.spec 2005-01-18 19:19:21 UTC (rev 5712) +++ tinysofa/releases/1.1/kernel/current/specs/kernel.spec 2005-01-19 11:07:47 UTC (rev 5713) @@ -126,7 +126,7 @@ Group: main License: GPLv2 Version: %{kversion} -Release: 8ts +Release: 9jh Epoch: 1 ExclusiveArch: %{all_x86} %{all_x86_64} s390 s390x %{all_ppc64} ia64 ExclusiveOS: Linux @@ -355,6 +355,7 @@ Patch1250: linux-2.4.21-bootmem-hash-alloc.patch Patch1251: linux-2.4.21-odirect-with-bufio.patch Patch1252: linux-2.4.21-page-pin-counts.patch +Patch1260: linux-2.4.21-insert-vm-struct.patch # # Patches 2000 to 5000 are reserved for the network protocol subsystem @@ -1113,7 +1114,10 @@ # page pin counts for rawio/O_DIRECT usage %patch1252 -p1 +# vma overlap checking with insert_vm_struct() +%patch1260 -p1 + # # Patches 2000 to 5000 are reserved for network protocol updates # @@ -2323,6 +2327,9 @@ %endif %changelog +* Wed Jan 19 2005 Jaakko Heinonen 2.4.21-9jh +- fix CAN-2004-1235 CAN-2004-1237 CAN-2005-0003 (-27.0.2.EL) + * Tue Jan 04 2005 tsintegrate 2.4.21-8ts - current (2.4.21-8jh) integrated as 2.4.21-8ts for release 1.1-U3 From svn at tinysofa.org Wed Jan 19 18:41:49 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 19 Jan 2005 13:41:49 -0500 (EST) Subject: [tinysofa-svn] r5714 - tinysofa/releases/1.2/mkinitrd/current/specs Message-ID: <20050119184149.12801344138@minbar.tinysofa.org> Author: jh Date: 2005-01-19 13:41:42 -0500 (Wed, 19 Jan 2005) New Revision: 5714 Modified: tinysofa/releases/1.2/mkinitrd/current/specs/mkinitrd.spec Log: - correct release number Modified: tinysofa/releases/1.2/mkinitrd/current/specs/mkinitrd.spec =================================================================== --- tinysofa/releases/1.2/mkinitrd/current/specs/mkinitrd.spec 2005-01-19 11:07:47 UTC (rev 5713) +++ tinysofa/releases/1.2/mkinitrd/current/specs/mkinitrd.spec 2005-01-19 18:41:42 UTC (rev 5714) @@ -1,7 +1,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd Version: 3.5.24 -Release: 2ts +Release: 3jh License: GPL Group: main Source: mkinitrd-%{version}.tar.bz2 From svn at tinysofa.org Wed Jan 19 18:56:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 19 Jan 2005 13:56:38 -0500 (EST) Subject: [tinysofa-svn] r5715 - in contrib/1.1: . perl-dbd-mysql perl-dbd-mysql/current perl-dbd-mysql/current/sources perl-dbd-mysql/current/specs Message-ID: <20050119185638.C69D4344138@minbar.tinysofa.org> Author: gda Date: 2005-01-19 13:56:18 -0500 (Wed, 19 Jan 2005) New Revision: 5715 Added: contrib/1.1/perl-dbd-mysql/ contrib/1.1/perl-dbd-mysql/current/ contrib/1.1/perl-dbd-mysql/current/sources/ contrib/1.1/perl-dbd-mysql/current/sources/DBD-mysql-2.9004.tar.gz contrib/1.1/perl-dbd-mysql/current/specs/ contrib/1.1/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec contrib/1.1/perl-dbd-mysql/pristine/ contrib/1.1/perl-dbd-mysql/releases/ Log: new in contrib Added: contrib/1.1/perl-dbd-mysql/current/sources/DBD-mysql-2.9004.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.1/perl-dbd-mysql/current/sources/DBD-mysql-2.9004.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.1/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec =================================================================== --- contrib/1.1/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec 2005-01-19 18:41:42 UTC (rev 5714) +++ contrib/1.1/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec 2005-01-19 18:56:18 UTC (rev 5715) @@ -0,0 +1,54 @@ +%define perlname DBD-mysql + +Summary: MySQL driver for the Perl5 Database Interface (DBI) +Name: perl-dbd-mysql +Version: 2.9004 +Release: 1gd +License: Artistic, GPL +Group: contrib +Source: %{perlname}-%{version}.tar.gz +URL: http://www.cpan.org/ +Requires: perl = %{perl_version} mysql-libs perl-dbi openssl +BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version} +BuildRequires: mysql-devel perl-dbi openssl-devel +BuildRoot: %{_tmppath}/%{name}-%{version} + + +%description +MySQL driver for the Perl5 Database Interface (DBI) + + +%prep +%setup -q -n %{perlname}-%{version} + +%build +%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor %{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 INSTALL.html ChangeLog README MANIFEST +%doc MANIFEST.SKIP TODO + + +%changelog +* Wed Jan 19 2004 Gerald Dachs 2.9004-1gd +- initial build + From svn at tinysofa.org Wed Jan 19 19:11:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 19 Jan 2005 14:11:21 -0500 (EST) Subject: [tinysofa-svn] r5716 - in contrib/1.1: . perl-dbd-pg perl-dbd-pg/current perl-dbd-pg/current/sources perl-dbd-pg/current/specs Message-ID: <20050119191121.D42D8344138@minbar.tinysofa.org> Author: gda Date: 2005-01-19 14:10:56 -0500 (Wed, 19 Jan 2005) New Revision: 5716 Added: contrib/1.1/perl-dbd-pg/ contrib/1.1/perl-dbd-pg/current/ contrib/1.1/perl-dbd-pg/current/sources/ contrib/1.1/perl-dbd-pg/current/sources/DBD-Pg-1.32.tar.gz contrib/1.1/perl-dbd-pg/current/specs/ contrib/1.1/perl-dbd-pg/current/specs/perl-dbd-pg.spec contrib/1.1/perl-dbd-pg/pristine/ contrib/1.1/perl-dbd-pg/releases/ Log: new in contrib Added: contrib/1.1/perl-dbd-pg/current/sources/DBD-Pg-1.32.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.1/perl-dbd-pg/current/sources/DBD-Pg-1.32.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.1/perl-dbd-pg/current/specs/perl-dbd-pg.spec =================================================================== --- contrib/1.1/perl-dbd-pg/current/specs/perl-dbd-pg.spec 2005-01-19 18:56:18 UTC (rev 5715) +++ contrib/1.1/perl-dbd-pg/current/specs/perl-dbd-pg.spec 2005-01-19 19:10:56 UTC (rev 5716) @@ -0,0 +1,52 @@ +%define perlname DBD-Pg + +Summary: PostgreSQL database driver for the DBI module +Name: perl-dbd-pg +Version: 1.32 +Release: 1gd +License: Artistic, GPL +Group: contrib +Source: %{perlname}-%{version}.tar.gz +URL: http://www.cpan.org/ +Requires: perl = %{perl_version} perl-dbi postgresql-libs +BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version} perl-dbi +BuildRequires: postgresql-devel +BuildRoot: %{_tmppath}/%{name}-%{version} + + +%description +PostgreSQL database driver for the DBI module + +%prep +%setup -q -n %{perlname}-%{version} + + +%build +%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor %{name}-%{version}-filelist +find %{buildroot} -type f -print |\ +%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist + +%clean +%clean_buildroot + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) +%doc Changes MANIFEST README README.win32 TODO + +%changelog +* Wed Jan 19 2005 Gerald Dachs 1.32-1gd +- initial build + From svn at tinysofa.org Wed Jan 19 19:29:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 19 Jan 2005 14:29:50 -0500 (EST) Subject: [tinysofa-svn] r5717 - in contrib/1.1/xpdf/current: sources specs Message-ID: <20050119192950.020CA344138@minbar.tinysofa.org> Author: gda Date: 2005-01-19 14:29:40 -0500 (Wed, 19 Jan 2005) New Revision: 5717 Added: contrib/1.1/xpdf/current/sources/xpdf-3.00pl3.patch Modified: contrib/1.1/xpdf/current/specs/xpdf.spec Log: fixes CAN-2005-0064 Added: contrib/1.1/xpdf/current/sources/xpdf-3.00pl3.patch =================================================================== --- contrib/1.1/xpdf/current/sources/xpdf-3.00pl3.patch 2005-01-19 19:10:56 UTC (rev 5716) +++ contrib/1.1/xpdf/current/sources/xpdf-3.00pl3.patch 2005-01-19 19:29:40 UTC (rev 5717) @@ -0,0 +1,14 @@ +*** XRef.cc.orig Wed Jan 12 17:10:53 2005 +--- XRef.cc Wed Jan 12 17:11:22 2005 +*************** +*** 793,798 **** +--- 793,801 ---- + } else { + keyLength = 5; + } ++ if (keyLength > 16) { ++ keyLength = 16; ++ } + permFlags = permissions.getInt(); + if (encVersion >= 1 && encVersion <= 2 && + encRevision >= 2 && encRevision <= 3) { Modified: contrib/1.1/xpdf/current/specs/xpdf.spec =================================================================== --- contrib/1.1/xpdf/current/specs/xpdf.spec 2005-01-19 19:10:56 UTC (rev 5716) +++ contrib/1.1/xpdf/current/specs/xpdf.spec 2005-01-19 19:29:40 UTC (rev 5717) @@ -7,7 +7,7 @@ Summary: A PDF file viewer for the X Window System. Name: xpdf Version: 3.00 -Release: 4gd +Release: 6gd License: GPL Epoch: 0 Url: http://www.foolabs.com/xpdf/ @@ -37,6 +37,7 @@ Patch100: xpdf-3.00-overflow.patch Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.00pl1.patch Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.00pl2.patch +Patch103: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.00pl3.patch Requires: xorg-x11-deprecated-libs @@ -127,6 +128,7 @@ cd xpdf %patch101 %patch102 +%patch103 cd - @@ -243,6 +245,9 @@ %lang(ko) %{_datadir}/xpdf/korean %changelog +* Wed Jan 19 2005 Gerald Dachs 3.00-6gd +- update to 3.00pl3 with vendor patch, fixes CAN-2005-0064 + * Thu Dec 23 2004 Jaakko Heinonen 3.00-5jh - update to 3.00pl2 with vendor patches, fixes CAN-2004-1125 From svn at tinysofa.org Wed Jan 19 20:15:15 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 19 Jan 2005 15:15:15 -0500 (EST) Subject: [tinysofa-svn] r5718 - in tinysofa/releases/1.2/anaconda/current: sources specs Message-ID: <20050119201515.0F40D344138@minbar.tinysofa.org> Author: jh Date: 2005-01-19 15:14:26 -0500 (Wed, 19 Jan 2005) New Revision: 5718 Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-isys.patch tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch tinysofa/releases/1.2/anaconda/current/sources/anaconda-booty-whrandom.patch Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec Log: - more patches to make it work with 2.6 kernel and python 2.4 Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-isys.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-isys.patch 2005-01-19 19:29:40 UTC (rev 5717) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-isys.patch 2005-01-19 20:14:26 UTC (rev 5718) @@ -0,0 +1,11 @@ +--- ./isys/isys.c.orig 2005-01-18 19:41:43.088604599 +0200 ++++ ./isys/isys.c 2005-01-18 19:42:36.801192777 +0200 +@@ -298,7 +298,7 @@ + + /* XXX - msw */ + #ifndef LOOP_CHANGE_FD +-#define LOOP_CHANGE_FD 0x4C04 ++#define LOOP_CHANGE_FD 0x4C06 /* XXX: this is different on 2.4 vs. 2.6 */ + #endif + + static PyObject * doLoChangeFd(PyObject * s, PyObject * args) { Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch 2005-01-19 19:29:40 UTC (rev 5717) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch 2005-01-19 20:14:26 UTC (rev 5718) @@ -0,0 +1,12 @@ +--- ./packages.py.orig 2005-01-19 21:15:47.158628192 +0200 ++++ ./packages.py 2005-01-19 21:17:09.288591600 +0200 +@@ -674,6 +674,9 @@ + if os.access("/tmp/modules.conf", os.R_OK): + iutil.copyFile("/tmp/modules.conf", + instPath + "/etc/modules.conf") ++ if os.access("/tmp/modprobe.conf", os.R_OK): ++ iutil.copyFile("/tmp/modprobe.conf", ++ instPath + "/etc/modprobe.conf") + + # make a /etc/mtab so mkinitrd can handle certain hw (usb) correctly + f = open(instPath + "/etc/mtab", "w+") Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-booty-whrandom.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-booty-whrandom.patch 2005-01-19 19:29:40 UTC (rev 5717) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-booty-whrandom.patch 2005-01-19 20:14:26 UTC (rev 5718) @@ -0,0 +1,66 @@ +diff -urN anaconda-9.1.old/bootloader.py anaconda-9.1/bootloader.py +--- anaconda-9.1.old/bootloader.py 2005-01-17 22:29:16.000000000 +0200 ++++ anaconda-9.1/bootloader.py 2005-01-18 13:53:22.392623454 +0200 +@@ -19,7 +19,7 @@ + import partedUtils + import os + import crypt +-import whrandom ++import random + import language + import iutil + import string +diff -urN anaconda-9.1.old/booty-0.40/bootloaderInfo.py anaconda-9.1/booty-0.40/bootloaderInfo.py +--- anaconda-9.1.old/booty-0.40/bootloaderInfo.py 2005-01-17 22:29:17.000000000 +0200 ++++ anaconda-9.1/booty-0.40/bootloaderInfo.py 2005-01-18 13:53:22.502593947 +0200 +@@ -17,7 +17,7 @@ + + import os, sys + import crypt +-import whrandom ++import random + import butil + import string + +@@ -628,7 +628,7 @@ + saltLen = 8 + + for i in range(saltLen): +- salt = salt + whrandom.choice (string.letters + ++ salt = salt + random.choice (string.letters + + string.digits + './') + + self.password = crypt.crypt (val, salt) +diff -urN anaconda-9.1.old/users.py anaconda-9.1/users.py +--- anaconda-9.1.old/users.py 2005-01-17 22:29:16.000000000 +0200 ++++ anaconda-9.1/users.py 2005-01-18 13:53:22.357632842 +0200 +@@ -15,7 +15,7 @@ + # + + import iutil +-import whrandom ++import random + import crypt + import os + import string +@@ -75,9 +75,9 @@ + self.crypt = password + self.pure = None + else: +- salt = (whrandom.choice (string.letters + ++ salt = (random.choice (string.letters + + string.digits + './') + +- whrandom.choice (string.letters + ++ random.choice (string.letters + + string.digits + './')) + self.crypt = crypt.crypt (password, salt) + self.pure = password +@@ -111,7 +111,7 @@ + saltLen = 2 + + for i in range(saltLen): +- salt = salt + whrandom.choice (string.letters + ++ salt = salt + random.choice (string.letters + + string.digits + './') + + return crypt.crypt (password, salt) Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec 2005-01-19 19:29:40 UTC (rev 5717) +++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec 2005-01-19 20:14:26 UTC (rev 5718) @@ -29,6 +29,8 @@ Patch12: anaconda-9.1-scripts-tar.patch Patch13: anaconda-9.1-probe.patch Patch14: anaconda-9.1-iutil.patch +Patch15: anaconda-9.1-isys.patch +Patch16: anaconda-9.1-modprobe.conf.patch # booty patches Patch100: booty-0.38-tinysofa.patch Patch101: booty-0.38-tinysofa-splash.patch @@ -37,6 +39,8 @@ Patch104: booty-0.40-bootloader.patch # rhpl patches Patch200: rhpl-0.145-tinysofa-keytables.patch +# common patches +Patch1000: anaconda-booty-whrandom.patch BuildPreReq: pump-devel >= 0.8.15, kudzu-devel >= 1.1.0, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, libxml2-python, zlib-devel, elfutils-devel, beecrypt-devel %ifarch i386 BuildRequires: dietlibc @@ -84,6 +88,8 @@ %patch12 -p1 -b .scripts-tar~ %patch13 -p1 -b .probe~ %patch14 -p1 -b .iutil~ +%patch15 -p1 -b .isys~ +%patch16 -p1 -b .modprobe.conf~ find rhpl* booty* -type f|xargs perl -pi -e 's/python2.3/python%{py_version}/g' find . -type f|xargs perl -pi -e 's/python2.2/python%{py_version}/g' @@ -104,7 +110,9 @@ %patch200 -p1 popd +%patch1000 -p1 -b .whrandom~ + %build make -C bogl make -C rhpl-%{rhpl_version} From svn at tinysofa.org Thu Jan 20 16:23:07 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 20 Jan 2005 11:23:07 -0500 (EST) Subject: [tinysofa-svn] r5719 - in tinysofa/releases/1.2/iptables/current: sources specs Message-ID: <20050120162307.3A0893440E7@minbar.tinysofa.org> Author: jh Date: 2005-01-20 11:22:55 -0500 (Thu, 20 Jan 2005) New Revision: 5719 Modified: tinysofa/releases/1.2/iptables/current/sources/iptables.init tinysofa/releases/1.2/iptables/current/sources/iptables.sysconfig-sample tinysofa/releases/1.2/iptables/current/sources/iptables6.init tinysofa/releases/1.2/iptables/current/specs/iptables.spec Log: - change default target to DROP on restart - set default targets on service start - add reload target to init scripts Modified: tinysofa/releases/1.2/iptables/current/sources/iptables.init =================================================================== --- tinysofa/releases/1.2/iptables/current/sources/iptables.init 2005-01-19 20:14:26 UTC (rev 5718) +++ tinysofa/releases/1.2/iptables/current/sources/iptables.init 2005-01-20 16:22:55 UTC (rev 5719) @@ -5,6 +5,7 @@ # description: Iptables is a network firewall. # # Erlend Midttun, +# Jaakko Heinonen, # Get config if [ -f /etc/init.d/functions ]; then @@ -51,70 +52,87 @@ exit 4 fi -case "$1" in - start) - # Load modules - echo -n "Loading iptables modules: " - /sbin/modprobe ip_tables 2>/dev/null >/dev/null - echo -n "." - for i in `grep -v '^#' $MODCONFFILE`; do - /sbin/modprobe $i 2>/dev/null >/dev/null - echo -n "." +flush() +{ + target=$1 + + if [ -z "$target" ]; then + target="DROP" + fi + + NOTE="Resetting default rules to $target: " + echo -n $NOTE + # filter table + for chain in INPUT FORWARD OUTPUT; do + $iptables -t filter -P $chain $target || failed="true" done + + # nat table + for chain in PREROUTING POSTROUTING OUTPUT; do + $iptables -t nat -P $chain $target || failed="true" + done + + # mangle table + for chain in PREROUTING INPUT FORWARD OUTPUT POSTROUTING; do + $iptables -t mangle -P $chain $target || failed="true" + done + + [ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE" echo + NOTE="Flushing current rules and chains" + echo -n $NOTE + for table in filter nat mangle; do + $iptables -t $table -F || failed="true" + $iptables -t $table -X || failed="true" + done + [ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE" + echo +} + +load_rules() +{ # Load new rules NOTE="Loading new rules" echo -n $NOTE iptables-restore < $SYSCONFFILE [ "$?" = "0" ] && success "$NOTE" || failure "$NOTE" echo "" +} + +case "$1" in + start) + # Load modules + echo -n "Loading iptables modules: " + /sbin/modprobe ip_tables 2>/dev/null >/dev/null + echo -n "." + for i in `grep -v '^#' $MODCONFFILE`; do + /sbin/modprobe $i 2>/dev/null >/dev/null + echo -n "." + done + echo + + flush + load_rules ;; stop) - NOTE="Flushing current rules and chains" - echo -n $NOTE - for table in filter nat mangle; do - $iptables -t $table -F || failed="true" - $iptables -t $table -X || failed="true" - done - [ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE" - echo - - NOTE="Resetting default rules to ACCEPT: " - echo -n $NOTE - # filter table - for chain in INPUT FORWARD OUTPUT; do - $iptables -t filter -P $chain ACCEPT || failed="true" - done - - # nat table - for chain in PREROUTING POSTROUTING OUTPUT; do - $iptables -t nat -P $chain ACCEPT || failed="true" - done - - # mangle table - for chain in PREROUTING INPUT FORWARD OUTPUT POSTROUTING; do - $iptables -t mangle -P $chain ACCEPT || failed="true" - done + flush ACCEPT - [ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE" - echo - - # Unload modules - echo -n "Unloading iptables modules: " - for i in `grep -v '^#' $MODCONFFILE`; do - /sbin/rmmod $i 2>/dev/null >/dev/null - echo -n "." - done - /sbin/rmmod ip_tables 2>/dev/null >/dev/null - echo -n "." - echo + # Unload modules + echo -n "Unloading iptables modules: " + for i in `grep -v '^#' $MODCONFFILE`; do + /sbin/rmmod $i 2>/dev/null >/dev/null + echo -n "." + done + /sbin/rmmod ip_tables 2>/dev/null >/dev/null + echo -n "." + echo ;; - restart) - $0 stop - $0 start + restart|reload) + flush DROP + load_rules ;; save) @@ -126,7 +144,7 @@ ;; *) - echo "Usage: $0 {start|stop|restart|save}" + echo "Usage: $0 {start|stop|restart|reload|save}" exit 1 ;; esac Modified: tinysofa/releases/1.2/iptables/current/sources/iptables.sysconfig-sample =================================================================== --- tinysofa/releases/1.2/iptables/current/sources/iptables.sysconfig-sample 2005-01-19 20:14:26 UTC (rev 5718) +++ tinysofa/releases/1.2/iptables/current/sources/iptables.sysconfig-sample 2005-01-20 16:22:55 UTC (rev 5719) @@ -1,17 +1,17 @@ *mangle -:PREROUTING ACCEPT [1:576] -:INPUT ACCEPT [1:576] +:PREROUTING ACCEPT [0:0] +:INPUT ACCEPT [0:0] :FORWARD ACCEPT [0:0] :OUTPUT ACCEPT [0:0] :POSTROUTING ACCEPT [0:0] COMMIT *nat -:PREROUTING ACCEPT [2:1152] +:PREROUTING ACCEPT [0:0] :POSTROUTING ACCEPT [0:0] :OUTPUT ACCEPT [0:0] COMMIT *filter -:INPUT ACCEPT [6:3456] +:INPUT ACCEPT [0:0] :FORWARD ACCEPT [0:0] :OUTPUT ACCEPT [0:0] COMMIT Modified: tinysofa/releases/1.2/iptables/current/sources/iptables6.init =================================================================== --- tinysofa/releases/1.2/iptables/current/sources/iptables6.init 2005-01-19 20:14:26 UTC (rev 5718) +++ tinysofa/releases/1.2/iptables/current/sources/iptables6.init 2005-01-20 16:22:55 UTC (rev 5719) @@ -5,6 +5,7 @@ # description: Iptables6 is a network firewall. # # Erlend Midttun, +# Jaakko Heinonen, # Get config if [ -f /etc/init.d/functions ]; then @@ -51,54 +52,73 @@ exit 4 fi -case "$1" in - start) +flush() +{ + target=$1 - # Load modules - echo "Loading ipv6 modules" - /sbin/modprobe ipv6 - echo -n "Loading ip6tables modules: " - /sbin/modprobe ip6_tables 2>/dev/null >/dev/null - echo -n "." - for i in `grep -v '^#' $MODCONFFILE`; do - /sbin/modprobe $i 2>/dev/null >/dev/null - echo -n "." + if [ -z "$target" ]; then + target="DROP" + fi + + NOTE="Resetting default rules to $target: " + echo -n $NOTE + # filter table + for chain in INPUT FORWARD OUTPUT; do + $ip6tables -t filter -P $chain $target || failed="true" done + + # nat table + for chain in PREROUTING POSTROUTING OUTPUT; do + $ip6tables -t nat -P $chain $target || failed="true" + done + + # mangle table + for chain in PREROUTING INPUT FORWARD OUTPUT POSTROUTING; do + $ip6tables -t mangle -P $chain $target || failed="true" + done + + [ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE" echo + NOTE="Flushing current rules and chains" + echo -n $NOTE + for table in filter nat mangle; do + $ip6tables -t $table -F || failed="true" + $ip6tables -t $table -X || failed="true" + done + [ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE" + echo +} + +load_rules() +{ # Load new rules NOTE="Loading new rules" echo -n $NOTE ip6tables-restore < $SYSCONFFILE [ "$?" = "0" ] && success "$NOTE" || failure "$NOTE" echo "" +} + +case "$1" in + start) + # Load modules + echo -n "Loading iptables modules: " + /sbin/modprobe ip_tables 2>/dev/null >/dev/null + echo -n "." + for i in `grep -v '^#' $MODCONFFILE`; do + /sbin/modprobe $i 2>/dev/null >/dev/null + echo -n "." + done + echo + + flush + load_rules ;; stop) - NOTE="Flushing current rules and chains" - echo -n $NOTE - for table in filter mangle; do - $ip6tables -t $table -F || failed="true" - $ip6tables -t $table -X || failed="true" - done - [ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE" - echo - - NOTE="Resetting default rules to ACCEPT: " - echo -n $NOTE - # filter table - for chain in INPUT FORWARD OUTPUT; do - $ip6tables -t filter -P $chain ACCEPT || failed="true" - done - - # mangle table - for chain in PREROUTING INPUT FORWARD OUTPUT POSTROUTING; do - $ip6tables -t mangle -P $chain ACCEPT || failed="true" - done + flush ACCEPT - [ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE" - echo - # Unload modules echo -n "Unloading iptables modules: " for i in `grep -v '^#' $MODCONFFILE`; do @@ -109,9 +129,9 @@ echo -n "." echo ;; - restart) - $0 stop - $0 start + restart|reload) + flush DROP + load_rules ;; save) NOTE="Saving rules to file" @@ -120,8 +140,9 @@ [ "$?" = "0" ] && success $NOTE || failure $NOTE echo "" ;; + *) - echo "Usage: $0 {start|stop|restart|save}" + echo "Usage: $0 {start|stop|restart|reload|save}" exit 1 ;; esac Modified: tinysofa/releases/1.2/iptables/current/specs/iptables.spec =================================================================== --- tinysofa/releases/1.2/iptables/current/specs/iptables.spec 2005-01-19 20:14:26 UTC (rev 5718) +++ tinysofa/releases/1.2/iptables/current/specs/iptables.spec 2005-01-20 16:22:55 UTC (rev 5719) @@ -1,7 +1,7 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities. Version: 1.2.11 -Release: 1ts +Release: 2jh Source: http://www.netfilter.org/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables6.init @@ -107,6 +107,11 @@ %changelog +* Thu Jan 20 2005 Jaakko Heinonen 1.2.12-2jh +- change default target to DROP on restart +- set default targets on service start +- add reload target to init scripts + * Tue Jan 04 2005 tsintegrate 1.2.11-1ts - current (1.2.11-1jh) integrated as 1.2.11-1ts for release 1.1-U3 From svn at tinysofa.org Thu Jan 20 21:53:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 20 Jan 2005 16:53:11 -0500 (EST) Subject: [tinysofa-svn] r5720 - in tinysofa/releases/1.2/squid/current: sources specs Message-ID: <20050120215311.7EB2C3440E7@minbar.tinysofa.org> Author: jh Date: 2005-01-20 16:53:02 -0500 (Thu, 20 Jan 2005) New Revision: 5720 Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-ldap_spaces.patch Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec Log: - fix a LDAP implementation username vulnerability Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-ldap_spaces.patch =================================================================== --- tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-ldap_spaces.patch 2005-01-20 16:22:55 UTC (rev 5719) +++ tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-ldap_spaces.patch 2005-01-20 21:53:02 UTC (rev 5720) @@ -0,0 +1,75 @@ +Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c +diff -c squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.14 squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.15 +*** squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.14 Tue Aug 10 03:39:29 2004 +--- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c Sun Jan 16 21:24:14 2005 +*************** +*** 30,35 **** +--- 30,39 ---- + * or (at your option) any later version. + * + * Changes: ++ * 2005-01-07: Henrik Nordstrom ++ * - Added some sanity checks on login names to avoid ++ * users bypassing equality checks by exploring the ++ * overly helpful match capabilities of LDAP + * 2004-07-17: Henrik Nordstrom + * - Corrected non-persistent mode to only issue one + * ldap_bind per connection. +*************** +*** 83,88 **** +--- 87,93 ---- + #include + #include + #include ++ #include + + #include "util.h" + +*************** +*** 261,266 **** +--- 266,297 ---- + return ld; + } + ++ /* Make a sanity check on the username to reject oddly typed names */ ++ static int ++ validUsername(const char *user) ++ { ++ const unsigned char *p = user; ++ ++ /* Leading whitespace? */ ++ if (isspace(p[0])) ++ return 0; ++ while(p[0] && p[1]) { ++ if (isspace(p[0])) { ++ /* More than one consequitive space? */ ++ if (isspace(p[1])) ++ return 0; ++ /* or odd space type character used? */ ++ if (p[0] != ' ') ++ return 0; ++ } ++ p++; ++ } ++ /* Trailing whitespace? */ ++ if (isspace(p[0])) ++ return 0; ++ return 1; ++ } ++ + int + main(int argc, char **argv) + { +*************** +*** 481,486 **** +--- 512,521 ---- + } + rfc1738_unescape(user); + rfc1738_unescape(passwd); ++ if (!validUsername(user)) { ++ printf("ERR\n"); ++ continue; ++ } + tryagain = (ld != NULL); + recover: + if (ld == NULL && persistent) Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec =================================================================== --- tinysofa/releases/1.2/squid/current/specs/squid.spec 2005-01-20 16:22:55 UTC (rev 5719) +++ tinysofa/releases/1.2/squid/current/specs/squid.spec 2005-01-20 21:53:02 UTC (rev 5720) @@ -4,7 +4,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE7 -Release: 3jh +Release: 4jh Epoch: 0 License: GPL Group: extra @@ -24,6 +24,7 @@ Patch7: squid-2.5.STABLE7-fakeauth_auth.patch Patch8: squid-2.5.STABLE7-wccp_denial_of_service.patch Patch9: squid-2.5.STABLE7-gopher_html_parsing.patch +Patch10: squid-2.5.STABLE7-ldap_spaces.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: logrotate coreutils /usr/bin/find @@ -56,6 +57,7 @@ %patch7 -p1 -b .fakeauth_auth %patch8 -p1 -b .wccp_denial_of_service %patch9 -p1 -b .gopher_html_parsing +%patch10 -p1 -b .ldap_spaces %build @@ -281,6 +283,9 @@ %changelog +* Thu Jan 20 2005 Jaakko Heinonen 2.5.STABLE7-4jh +- fix a LDAP implementation username vulnerability + * Sat Jan 15 2005 Jaakko Heinonen 2.5.STABLE7-3jh - fix An error in the handling of invalid field values in "WCCP_I_SEE_YOU" - messages From svn at tinysofa.org Fri Jan 21 19:39:36 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 21 Jan 2005 14:39:36 -0500 (EST) Subject: [tinysofa-svn] r5721 - in tinysofa/releases/1.2/dump/current: sources specs Message-ID: <20050121193936.9928D344130@minbar.tinysofa.org> Author: jh Date: 2005-01-21 14:39:21 -0500 (Fri, 21 Jan 2005) New Revision: 5721 Added: tinysofa/releases/1.2/dump/current/sources/dump-0.4b39.tar.gz Removed: tinysofa/releases/1.2/dump/current/sources/dump-0.4b36.tar.gz Modified: tinysofa/releases/1.2/dump/current/specs/dump.spec Log: - 0.4b39 Deleted: tinysofa/releases/1.2/dump/current/sources/dump-0.4b36.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/dump/current/sources/dump-0.4b39.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/dump/current/sources/dump-0.4b39.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/dump/current/specs/dump.spec =================================================================== --- tinysofa/releases/1.2/dump/current/specs/dump.spec 2005-01-20 21:53:02 UTC (rev 5720) +++ tinysofa/releases/1.2/dump/current/specs/dump.spec 2005-01-21 19:39:21 UTC (rev 5721) @@ -1,14 +1,14 @@ Summary: Programs for backing up and restoring filesystems. Name: dump -Version: 0.4b36 -Release: 2ts +Version: 0.4b39 +Release: 1jh License: BSD Group: main Source: http://download.sourceforge.net/dump/dump-%{version}.tar.gz Requires: rmt BuildRequires: e2fsprogs >= 1.15, e2fsprogs-devel >= 1.15 BuildRequires: libtermcap-devel, readline-devel -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The dump package contains both dump and restore. Dump examines files in @@ -31,35 +31,35 @@ like dump (a filesystem backup program), restore (a program for restoring files from a backup) and tar (an archiving program). + %prep %setup -q %build %configure --with-binmode=0755 \ - --with-manowner=root \ - --with-mangrp=root \ - --with-manmode=0644 \ - --enable-rmt + --with-manowner=root \ + --with-mangrp=root \ + --with-manmode=0644 \ + --enable-rmt +%make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts" -make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts" %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/sbin -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 +%{__mkdir_p} \ + %{buildroot}/sbin \ + %{buildroot}%{_mandir}/man8 make install \ - SBINDIR=$RPM_BUILD_ROOT/sbin \ + SBINDIR=%{buildroot}/sbin \ MANDIR=${RPM_BUILD_ROOT}%{_mandir}/man8 \ BINOWNER=$(id -un) \ BINGRP=$(id -gn) \ MANOWNER=$(id -un) \ MANGRP=$(id -gn) -{ cd $RPM_BUILD_ROOT - strip ./sbin/* || : +{ cd %{buildroot} ln -sf dump ./sbin/rdump ln -sf restore ./sbin/rrestore chmod ug-s ./sbin/rmt @@ -68,9 +68,11 @@ ln -sf ../sbin/rmt ./etc/rmt } + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files %defattr(-,root,root) %doc CHANGES COPYRIGHT KNOWNBUGS README THANKS TODO INSTALL dump.lsm @@ -90,7 +92,11 @@ /etc/rmt %{_mandir}/man8/rmt.8* + %changelog +* Fri Jan 21 2005 Jaakko Heinonen 0.4b39-1jh +- 0.4b39 + * Thu Aug 05 2004 tsintegrate 0.4b36-2ts - current (0.4b36-2jh) integrated as 0.4b36-2ts for release 1.1 From svn at tinysofa.org Sat Jan 22 09:11:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 22 Jan 2005 04:11:31 -0500 (EST) Subject: [tinysofa-svn] r5723 - tinysofa/releases/1.2/sysklogd/current/sources Message-ID: <20050122091131.41665344137@minbar.tinysofa.org> Author: jh Date: 2005-01-22 04:11:24 -0500 (Sat, 22 Jan 2005) New Revision: 5723 Added: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-security.patch Log: - readd the security patch Added: tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-security.patch =================================================================== --- tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-security.patch 2005-01-22 08:53:25 UTC (rev 5722) +++ tinysofa/releases/1.2/sysklogd/current/sources/sysklogd-1.4.1-security.patch 2005-01-22 09:11:24 UTC (rev 5723) @@ -0,0 +1,248 @@ +diff -Nur sysklogd-1.4.1.orig/klogd.8 sysklogd-1.4.1/klogd.8 +--- sysklogd-1.4.1.orig/klogd.8 Sun Mar 11 20:35:51 2001 ++++ sysklogd-1.4.1/klogd.8 Fri Mar 16 14:11:38 2001 +@@ -3,6 +3,7 @@ + .\" Sun Jul 30 01:35:55 MET: Martin Schulze: Updates + .\" Sun Nov 19 23:22:21 MET: Martin Schulze: Updates + .\" Mon Aug 19 09:42:08 CDT 1996: Dr. G.W. Wettstein: Updates ++.\" Thu Feb 17 2000: Chris Wing: Unprivileged klogd feature + .\" + .TH KLOGD 8 "21 August, 1999" "Version 1.4" "Linux System Administration" + .SH NAME +@@ -17,7 +18,11 @@ + .RB [ " \-f " + .I fname + ] ++.RB [ " \-u " ++.I username ++] + .RB [ " \-iI " ] ++.RB [ " \-r " ] + .RB [ " \-n " ] + .RB [ " \-o " ] + .RB [ " \-p " ] +@@ -46,11 +51,24 @@ + .BI "\-f " file + Log messages to the specified filename rather than to the syslog facility. + .TP ++.BI "\-u " username ++Tells klogd to become the specified user and drop root privileges before ++starting logging. This is useful if you are paranoid about how well we wrote ++this program. ++.TP + .BI "\-i \-I" + Signal the currently executing klogd daemon. Both of these switches control + the loading/reloading of symbol information. The \-i switch signals the + daemon to reload the kernel module symbols. The \-I switch signals for a + reload of both the static kernel symbols and the kernel module symbols. ++.TP ++.B "\-r" ++Reset kernel logging. You should run ++.B klogd ++with this argument after killing the daemon, if you run the daemon as a non- ++privileged user. This is because ++.B klogd ++will be unable to reset kernel logging automatically in that case. + .TP + .B "\-n" + Avoid auto-backgrounding. This is needed especially if the +diff -Nur sysklogd-1.4.1.orig/klogd.c sysklogd-1.4.1/klogd.c +--- sysklogd-1.4.1.orig/klogd.c Sun Mar 11 20:40:10 2001 ++++ sysklogd-1.4.1/klogd.c Fri Mar 16 14:38:52 2001 +@@ -275,6 +275,10 @@ + #define ksyslog klogctl + #endif + ++/* Support for running as an unprivileged user */ ++#include ++#include ++ + #define LOG_BUFFER_SIZE 4096 + #define LOG_LINE_LENGTH 1000 + +@@ -308,6 +312,9 @@ + int debugging = 0; + int symbols_twice = 0; + ++int drop_privileges = 0; ++uid_t server_uid = 0; ++gid_t server_gid = 0; + + /* Function prototypes. */ + extern int ksyslog(int type, char *buf, int len); +@@ -994,7 +1001,7 @@ + chdir ("/"); + #endif + /* Parse the command-line. */ +- while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF) ++ while ((ch = getopt(argc, argv, "c:df:u:iIk:noprsvx2")) != EOF) + switch((char)ch) + { + case '2': /* Print lines with symbols twice. */ +@@ -1010,6 +1017,31 @@ + output = optarg; + use_output++; + break; ++ case 'u': /* Run as this user */ ++ if (optarg) { ++ struct passwd *pwd; ++ ++ pwd = getpwnam(optarg); ++ if (!pwd) { ++ fprintf(stderr, "Failed to look up user %s " \ ++ "to switch to. Terminating.\n", optarg); ++ exit(1); ++ } ++ ++ drop_privileges = 1; ++ server_uid = pwd->pw_uid; ++ server_gid = pwd->pw_gid; ++ } else { ++ fprintf(stderr, "Must specify user name along " \ ++ "with -u option.\n"); ++ exit(1); ++ } ++ break; ++ case 'r': /* Reset logging */ ++ Syslog(LOG_INFO, "Resetting kernel logging."); ++ CloseLogSrc(); ++ exit(0); ++ break; + case 'i': /* Reload module symbols. */ + SignalDaemon(SIGUSR1); + return(0); +@@ -1161,6 +1193,13 @@ + if (symbol_lookup) { + InitKsyms(symfile); + InitMsyms(); ++ } ++ ++ /* Drop privileges if a user name was specified on the command line */ ++ if (drop_privileges) { ++ setgroups(0, NULL); ++ setgid(server_gid); ++ setuid(server_uid); + } + + /* The main loop. */ +diff -Nur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8 +--- sysklogd-1.4.1.orig/sysklogd.8 Sun Mar 11 20:35:51 2001 ++++ sysklogd-1.4.1/sysklogd.8 Fri Mar 16 14:40:16 2001 +@@ -29,6 +29,9 @@ + .RB [ " \-s " + .I domainlist + ] ++.RB [ " \-u" ++.IB username ++] + .RB [ " \-v " ] + .LP + .SH DESCRIPTION +@@ -149,6 +152,22 @@ + is specified and the host logging resolves to satu.infodrom.north.de + no domain would be cut, you will have to specify two domains like: + .BR "\-s north.de:infodrom.north.de" . ++.TP ++.BI "\-u " "username" ++This causes the ++.B syslogd ++daemon to become the named user before starting up logging. This ++option is useful if you are paranoid about how well we wrote this ++program. ++ ++Note that when this option is in use, ++.B syslogd ++will open all log files as root when the daemon is first started; ++however, after a ++.B SIGHUP ++the files will be reopened as the non-privileged user. You should ++take this into account when deciding the ownership of the log ++files. + .TP + .B "\-v" + Print version and exit. +diff -Nur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c +--- sysklogd-1.4.1.orig/syslogd.c Sun Mar 11 20:40:10 2001 ++++ sysklogd-1.4.1/syslogd.c Fri Mar 16 14:44:02 2001 +@@ -500,6 +500,10 @@ + #include + #endif + ++/* Support for running syslogd as non-root user */ ++#include ++#include ++ + #ifndef UTMP_FILE + #ifdef UTMP_FILENAME + #define UTMP_FILE UTMP_FILENAME +@@ -735,6 +739,7 @@ + char **LocalHosts = NULL; /* these hosts are logged with their hostname */ + int NoHops = 1; /* Can we bounce syslog messages through an + intermediate host. */ ++char *server_user = NULL; /* user name to run server as, instead of root */ + + extern int errno; + +@@ -829,7 +834,7 @@ + funix[i] = -1; + } + +- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF) ++ while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:u:v")) != EOF) + switch((char)ch) { + case 'a': + if (nfunix < MAXFUNIX) +@@ -874,6 +879,15 @@ + } + StripDomains = crunch_list(optarg); + break; ++ case 'u': ++ if (optarg) ++ server_user = strdup(optarg); ++ else { ++ fprintf (stderr, "Must specify user name " \ ++ "along with -u option.\n"); ++ exit (1); ++ } ++ break; + case 'v': + printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); + exit (0); +@@ -1020,6 +1034,28 @@ + if (getpid() != ppid) + kill (ppid, SIGTERM); + #endif ++ /* ++ * Drop privileges if a user name was specified on ++ * the command line. ++ */ ++ if (server_user) { ++ struct passwd *pwd; ++ ++ pwd = getpwnam(server_user); ++ if (!pwd) { ++ dprintf("Failed to look up user %s.\n", server_user); ++ exit(1); ++ } ++ ++ /* initgroups should not require the stupid "extra group" thingy */ ++ if (initgroups(server_user, pwd->pw_gid)) { ++ dprintf("Failed to set groups for user %s.\n", server_user); ++ exit(1); ++ } ++ ++ setgid(pwd->pw_gid); ++ setuid(pwd->pw_uid); ++ } + + /* Main loop begins here. */ + for (;;) { +@@ -1175,7 +1211,7 @@ + int usage() + { + fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ +- " [-s domainlist] [-f conffile]\n"); ++ " [-s domainlist] [-f conffile] [-u username]\n"); + exit(1); + } + From svn at tinysofa.org Sat Jan 22 15:02:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 22 Jan 2005 10:02:34 -0500 (EST) Subject: [tinysofa-svn] r5724 - tinysofa/releases/1.2 Message-ID: <20050122150234.29616344137@minbar.tinysofa.org> Author: jh Date: 2005-01-22 10:02:24 -0500 (Sat, 22 Jan 2005) New Revision: 5724 Added: tinysofa/releases/1.2/perl-dbd-mysql/ Log: - copy to 1.2 Copied: tinysofa/releases/1.2/perl-dbd-mysql (from rev 5723, contrib/1.1/perl-dbd-mysql) From svn at tinysofa.org Sat Jan 22 15:03:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 22 Jan 2005 10:03:03 -0500 (EST) Subject: [tinysofa-svn] r5725 - tinysofa/releases/1.2 Message-ID: <20050122150303.4B9F7344137@minbar.tinysofa.org> Author: jh Date: 2005-01-22 10:02:53 -0500 (Sat, 22 Jan 2005) New Revision: 5725 Added: tinysofa/releases/1.2/perl-dbd-pg/ Log: - copy to 1.2 Copied: tinysofa/releases/1.2/perl-dbd-pg (from rev 5724, contrib/1.1/perl-dbd-pg) From svn at tinysofa.org Sat Jan 22 15:09:22 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 22 Jan 2005 10:09:22 -0500 (EST) Subject: [tinysofa-svn] r5726 - in tinysofa/releases/1.2: perl-dbd-mysql/current/specs perl-dbd-pg/current/specs Message-ID: <20050122150922.19183344137@minbar.tinysofa.org> Author: jh Date: 2005-01-22 10:09:10 -0500 (Sat, 22 Jan 2005) New Revision: 5726 Modified: tinysofa/releases/1.2/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec tinysofa/releases/1.2/perl-dbd-pg/current/specs/perl-dbd-pg.spec Log: - change group Modified: tinysofa/releases/1.2/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec =================================================================== --- tinysofa/releases/1.2/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec 2005-01-22 15:02:53 UTC (rev 5725) +++ tinysofa/releases/1.2/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec 2005-01-22 15:09:10 UTC (rev 5726) @@ -5,7 +5,7 @@ Version: 2.9004 Release: 1gd License: Artistic, GPL -Group: contrib +Group: extra Source: %{perlname}-%{version}.tar.gz URL: http://www.cpan.org/ Requires: perl = %{perl_version} mysql-libs perl-dbi openssl Modified: tinysofa/releases/1.2/perl-dbd-pg/current/specs/perl-dbd-pg.spec =================================================================== --- tinysofa/releases/1.2/perl-dbd-pg/current/specs/perl-dbd-pg.spec 2005-01-22 15:02:53 UTC (rev 5725) +++ tinysofa/releases/1.2/perl-dbd-pg/current/specs/perl-dbd-pg.spec 2005-01-22 15:09:10 UTC (rev 5726) @@ -5,7 +5,7 @@ Version: 1.32 Release: 1gd License: Artistic, GPL -Group: contrib +Group: extra Source: %{perlname}-%{version}.tar.gz URL: http://www.cpan.org/ Requires: perl = %{perl_version} perl-dbi postgresql-libs From svn at tinysofa.org Sat Jan 22 15:26:35 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 22 Jan 2005 10:26:35 -0500 (EST) Subject: [tinysofa-svn] r5727 - tinysofa/releases/1.2/perl-dbd-mysql/current/specs Message-ID: <20050122152635.4B81B344137@minbar.tinysofa.org> Author: jh Date: 2005-01-22 10:26:29 -0500 (Sat, 22 Jan 2005) New Revision: 5727 Modified: tinysofa/releases/1.2/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec Log: - don't run test Modified: tinysofa/releases/1.2/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec =================================================================== --- tinysofa/releases/1.2/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec 2005-01-22 15:09:10 UTC (rev 5726) +++ tinysofa/releases/1.2/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec 2005-01-22 15:26:29 UTC (rev 5727) @@ -24,7 +24,8 @@ %build %{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor Author: jh Date: 2005-01-23 07:34:30 -0500 (Sun, 23 Jan 2005) New Revision: 5728 Added: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.1-200501222316.tar.gz Removed: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.1-200501141323.tar.gz Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - new upstream - adds support for +l mode - fixes segfault bug - smarter learning Deleted: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.1-200501141323.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.1-200501222316.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.1-200501222316.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-22 15:26:29 UTC (rev 5727) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-23 12:34:30 UTC (rev 5728) @@ -2,8 +2,8 @@ Summary: grsecurity user space utilities and policies Name: grsecurity Version: 2.1.1 -Release: 0.pre.1jh -Source0: gradm-2.1.1-200501141323.tar.gz +Release: 0.pre.2jh +Source0: gradm-2.1.1-200501222316.tar.gz Source1: grsec.init Source2: policies-%{policies_date}.tar Patch0: gradm-2.0.1-dummypw.patch @@ -77,7 +77,7 @@ %files -f files.list %defattr(-,root,root) %dev(c, 1, 12) %attr(0622,root,root) /dev/grsec -%dir %{_sysconfdir}/grsec +%dir %attr(0700,root,root) %{_sysconfdir}/grsec %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/grsec/policy %config(noreplace) %{_sysconfdir}/grsec/learn_config %ghost %config(noreplace) %{_sysconfdir}/grsec/pw From svn at tinysofa.org Sun Jan 23 16:06:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 23 Jan 2005 11:06:45 -0500 (EST) Subject: [tinysofa-svn] r5729 - in tinysofa/releases/1.2/kernel/current: sources specs Message-ID: <20050123160645.8A581344137@minbar.tinysofa.org> Author: jh Date: 2005-01-23 11:06:33 -0500 (Sun, 23 Jan 2005) New Revision: 5729 Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586-smp.config tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586.config tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-tinysofa-grsec.patch tinysofa/releases/1.2/kernel/current/specs/kernel.spec Log: - update grsecurity configuration - update grsec patch Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586-smp.config =================================================================== --- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586-smp.config 2005-01-23 12:34:30 UTC (rev 5728) +++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586-smp.config 2005-01-23 16:06:33 UTC (rev 5729) @@ -2668,9 +2668,9 @@ # # Address Space Protection # -CONFIG_GRKERNSEC_KMEM=y -CONFIG_GRKERNSEC_IO=y -CONFIG_GRKERNSEC_PROC_MEMMAP=y +# CONFIG_GRKERNSEC_KMEM is not set +# CONFIG_GRKERNSEC_IO is not set +# CONFIG_GRKERNSEC_PROC_MEMMAP is not set CONFIG_GRKERNSEC_BRUTE=y # CONFIG_GRKERNSEC_HIDESYM is not set Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586.config =================================================================== --- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586.config 2005-01-23 12:34:30 UTC (rev 5728) +++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586.config 2005-01-23 16:06:33 UTC (rev 5729) @@ -2669,9 +2669,9 @@ # # Address Space Protection # -CONFIG_GRKERNSEC_KMEM=y -CONFIG_GRKERNSEC_IO=y -CONFIG_GRKERNSEC_PROC_MEMMAP=y +# CONFIG_GRKERNSEC_KMEM is not set +# CONFIG_GRKERNSEC_IO is not set +# CONFIG_GRKERNSEC_PROC_MEMMAP is not set CONFIG_GRKERNSEC_BRUTE=y # CONFIG_GRKERNSEC_HIDESYM is not set Modified: tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-tinysofa-grsec.patch =================================================================== --- tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-tinysofa-grsec.patch 2005-01-23 12:34:30 UTC (rev 5728) +++ tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-tinysofa-grsec.patch 2005-01-23 16:06:33 UTC (rev 5729) @@ -1499,438 +1499,6 @@ #include static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs); -@@ -85,15 +91,30 @@ - - static int set_brk(unsigned long start, unsigned long end) - { -+ unsigned long e = end, retval; -+ - start = ELF_PAGEALIGN(start); - end = ELF_PAGEALIGN(end); -+ -+ down_write(¤t->mm->mmap_sem); - if (end > start) { -- unsigned long addr = do_brk(start, end - start); -- if (BAD_ADDR(addr)) -- return addr; -+ retval = do_brk(start, end - start); -+ if (BAD_ADDR(retval)) -+ goto out; -+ -+#ifdef CONFIG_PAX_RANDEXEC -+ if (current->mm->flags & MF_PAX_RANDEXEC) -+ retval = __do_mmap_pgoff(NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start); -+ if (BAD_ADDR(retval)) -+ goto out; -+#endif -+ - } -- current->mm->start_brk = current->mm->brk = end; -- return 0; -+ current->mm->start_brk = current->mm->brk = e; -+ retval = 0UL; -+out: -+ up_write(¤t->mm->mmap_sem); -+ return retval; - } - - -@@ -335,6 +356,7 @@ - unsigned long error = ~0UL; - unsigned long total_size; - int retval, i, size; -+ unsigned long task_size = TASK_SIZE; - - /* First of all, some simple consistency checks */ - if (interp_elf_ex->e_type != ET_EXEC && -@@ -376,6 +398,11 @@ - if (!total_size) - goto out_close; - -+#ifdef CONFIG_PAX_SEGMEXEC -+ if (current->mm->flags & MF_PAX_SEGMEXEC) -+ task_size = SEGMEXEC_TASK_SIZE; -+#endif -+ - eppnt = elf_phdata; - for (i=0; ie_phnum; i++, eppnt++) { - if (eppnt->p_type == PT_LOAD) { -@@ -410,8 +437,8 @@ - * <= p_memsize so it is only necessary to check p_memsz. - */ - k = load_addr + eppnt->p_vaddr; -- if (k > TASK_SIZE || eppnt->p_filesz > eppnt->p_memsz || -- eppnt->p_memsz > TASK_SIZE || TASK_SIZE - eppnt->p_memsz < k) { -+ if (k > task_size || eppnt->p_filesz > eppnt->p_memsz || -+ eppnt->p_memsz > task_size || task_size - eppnt->p_memsz < k) { - error = -ENOMEM; - goto out_close; - } -@@ -501,6 +528,227 @@ - return elf_entry; - } - -+#if (defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS)) && defined(CONFIG_PAX_SOFTMODE) -+static unsigned long pax_parse_softmode(const struct elf_phdr * const elf_phdata) -+{ -+ unsigned long pax_flags = 0UL; -+ -+#ifdef CONFIG_PAX_PAGEEXEC -+ if (elf_phdata->p_flags & PF_PAGEEXEC) -+ pax_flags |= MF_PAX_PAGEEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_SEGMEXEC -+ if (elf_phdata->p_flags & PF_SEGMEXEC) -+ pax_flags |= MF_PAX_SEGMEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_DEFAULT_PAGEEXEC -+ if (pax_flags & MF_PAX_PAGEEXEC) -+ pax_flags &= ~MF_PAX_SEGMEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_DEFAULT_SEGMEXEC -+ if (pax_flags & MF_PAX_SEGMEXEC) -+ pax_flags &= ~MF_PAX_PAGEEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_EMUTRAMP -+ if (elf_phdata->p_flags & PF_EMUTRAMP) -+ pax_flags |= MF_PAX_EMUTRAMP; -+#endif -+ -+#ifdef CONFIG_PAX_MPROTECT -+ if (elf_phdata->p_flags & PF_MPROTECT) -+ pax_flags |= MF_PAX_MPROTECT; -+#endif -+ -+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK) -+ -+#ifdef CONFIG_PAX_SOFTMODE -+ if (pax_aslr) -+#endif -+ -+ if (elf_phdata->p_flags & PF_RANDMMAP) -+ pax_flags |= MF_PAX_RANDMMAP; -+#endif -+ -+#ifdef CONFIG_PAX_RANDEXEC -+ -+#ifdef CONFIG_PAX_SOFTMODE -+ if (pax_aslr) -+#endif -+ -+ if (elf_phdata->p_flags & PF_RANDEXEC) -+ pax_flags |= MF_PAX_RANDEXEC; -+#endif -+ -+ return pax_flags; -+} -+#endif -+ -+#ifdef CONFIG_PAX_PT_PAX_FLAGS -+static unsigned long pax_parse_hardmode(const struct elf_phdr * const elf_phdata) -+{ -+ unsigned long pax_flags = 0UL; -+ -+#ifdef CONFIG_PAX_PAGEEXEC -+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC)) -+ pax_flags |= MF_PAX_PAGEEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_SEGMEXEC -+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC)) -+ pax_flags |= MF_PAX_SEGMEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_DEFAULT_PAGEEXEC -+ if (pax_flags & MF_PAX_PAGEEXEC) -+ pax_flags &= ~MF_PAX_SEGMEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_DEFAULT_SEGMEXEC -+ if (pax_flags & MF_PAX_SEGMEXEC) -+ pax_flags &= ~MF_PAX_PAGEEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_EMUTRAMP -+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP)) -+ pax_flags |= MF_PAX_EMUTRAMP; -+#endif -+ -+#ifdef CONFIG_PAX_MPROTECT -+ if (!(elf_phdata->p_flags & PF_NOMPROTECT)) -+ pax_flags |= MF_PAX_MPROTECT; -+#endif -+ -+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK) -+ -+#ifdef CONFIG_PAX_SOFTMODE -+ if (pax_aslr) -+#endif -+ -+ if (!(elf_phdata->p_flags & PF_NORANDMMAP)) -+ pax_flags |= MF_PAX_RANDMMAP; -+#endif -+ -+#ifdef CONFIG_PAX_RANDEXEC -+ -+#ifdef CONFIG_PAX_SOFTMODE -+ if (pax_aslr) -+#endif -+ -+ if (!(elf_phdata->p_flags & PF_NORANDEXEC)) -+ pax_flags |= MF_PAX_RANDEXEC; -+#endif -+ -+ return pax_flags; -+} -+#endif -+ -+#ifdef CONFIG_PAX_EI_PAX -+static int pax_parse_ei_pax(const struct elfhdr * const elf_ex) -+{ -+ unsigned long pax_flags = 0UL; -+ -+#ifdef CONFIG_PAX_PAGEEXEC -+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC)) -+ pax_flags |= MF_PAX_PAGEEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_SEGMEXEC -+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC)) -+ pax_flags |= MF_PAX_SEGMEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_DEFAULT_PAGEEXEC -+ if (pax_flags & MF_PAX_PAGEEXEC) -+ pax_flags &= ~MF_PAX_SEGMEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_DEFAULT_SEGMEXEC -+ if (pax_flags & MF_PAX_SEGMEXEC) -+ pax_flags &= ~MF_PAX_PAGEEXEC; -+#endif -+ -+#ifdef CONFIG_PAX_EMUTRAMP -+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP)) -+ pax_flags |= MF_PAX_EMUTRAMP; -+#endif -+ -+#ifdef CONFIG_PAX_MPROTECT -+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT)) -+ pax_flags |= MF_PAX_MPROTECT; -+#endif -+ -+#ifdef CONFIG_PAX_ASLR -+ -+#ifdef CONFIG_PAX_SOFTMODE -+ if (pax_aslr) -+#endif -+ -+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP)) -+ pax_flags |= MF_PAX_RANDMMAP; -+#endif -+ -+#ifdef CONFIG_PAX_RANDEXEC -+ -+#ifdef CONFIG_PAX_SOFTMODE -+ if (pax_aslr) -+#endif -+ -+ if ((elf_ex->e_ident[EI_PAX] & EF_PAX_RANDEXEC) && (elf_ex->e_type == ET_EXEC) && (pax_flags & MF_PAX_MPROTECT)) -+ pax_flags |= MF_PAX_RANDEXEC; -+#endif -+ -+ return pax_flags; -+} -+#endif -+ -+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) -+static int pax_parse_elf_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata) -+{ -+ unsigned long pax_flags = 0UL; -+ -+#ifdef CONFIG_PAX_PT_PAX_FLAGS -+ unsigned long i; -+#endif -+ -+#ifdef CONFIG_PAX_EI_PAX -+ pax_flags = pax_parse_ei_pax(elf_ex); -+#endif -+ -+#ifdef CONFIG_PAX_PT_PAX_FLAGS -+ for (i = 0UL; i < elf_ex->e_phnum; i++) -+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) { -+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) || -+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) || -+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) || -+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) || -+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)) || -+ ((elf_phdata[i].p_flags & PF_RANDEXEC) && ((elf_phdata[i].p_flags & PF_NORANDEXEC) || elf_ex->e_type == ET_DYN || !(elf_phdata[i].p_flags & PF_MPROTECT))) || -+ (!(elf_phdata[i].p_flags & PF_NORANDEXEC) && (elf_ex->e_type == ET_DYN || (elf_phdata[i].p_flags & PF_NOMPROTECT)))) -+ return -EINVAL; -+ -+#ifdef CONFIG_PAX_SOFTMODE -+ if (pax_softmode) -+ pax_flags = pax_parse_softmode(&elf_phdata[i]); -+ else -+#endif -+ -+ pax_flags = pax_parse_hardmode(&elf_phdata[i]); -+ break; -+ } -+#endif -+ -+ if (0 > pax_check_flags(&pax_flags)) -+ return -EINVAL; -+ -+ current->mm->flags |= pax_flags; -+ return 0; -+} -+#endif -+ - /* - * These are the functions used to load ELF style executables and shared - * libraries. There is no binary dependent code anywhere else. -@@ -537,6 +785,12 @@ - struct elfhdr interp_elf_ex; - struct exec interp_ex; - } *loc; -+ unsigned long task_size = TASK_SIZE; -+ -+#ifdef CONFIG_PAX_RANDEXEC -+ unsigned long load_addr_random = 0UL; -+ unsigned long load_bias_random = 0UL; -+#endif - - loc = kmalloc(sizeof(*loc), GFP_KERNEL); - if (!loc) { -@@ -792,8 +1046,69 @@ - current->mm->end_code = 0; - current->mm->mmap = NULL; - current->flags &= ~PF_FORKNOEXEC; -+ -+#ifdef CONFIG_PAX_DLRESOLVE -+ current->mm->call_dl_resolve = 0UL; -+#endif -+ -+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT) -+ current->mm->call_syscall = 0UL; -+#endif -+ -+#ifdef CONFIG_PAX_ASLR -+ current->mm->delta_mmap = 0UL; -+ current->mm->delta_exec = 0UL; -+ current->mm->delta_stack = 0UL; -+#endif -+ - current->mm->def_flags = def_flags; - -+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) -+ if (0 > pax_parse_elf_flags(&loc->elf_ex, elf_phdata)) { -+ send_sig(SIGKILL, current, 0); -+ goto out_free_dentry; -+ } -+#endif -+ -+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS -+ pax_set_initial_flags(bprm); -+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS) -+ if (pax_set_initial_flags_func) -+ (pax_set_initial_flags_func)(bprm); -+#endif -+ -+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT -+ if (current->mm->flags & MF_PAX_PAGEEXEC) -+ current->mm->context.user_cs_limit = PAGE_SIZE; -+#endif -+ -+#ifdef CONFIG_PAX_SEGMEXEC -+ if (current->mm->flags & MF_PAX_SEGMEXEC) { -+ int cpu = get_cpu(); -+ -+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE; -+ current->mm->context.user_cs_limit = -SEGMEXEC_TASK_SIZE; -+ set_user_cs(current->mm, cpu); -+ put_cpu(); -+ task_size = SEGMEXEC_TASK_SIZE; -+ } -+#endif -+ -+#ifdef CONFIG_PAX_ASLR -+ if (current->mm->flags & MF_PAX_RANDMMAP) { -+#define pax_delta_mask(delta, lsb, len) (((delta) & ((1UL << (len)) - 1)) << (lsb)) -+ -+ current->mm->delta_mmap = pax_delta_mask(pax_get_random_long(), PAX_DELTA_MMAP_LSB(current), PAX_DELTA_MMAP_LEN(current)); -+ current->mm->delta_exec = pax_delta_mask(pax_get_random_long(), PAX_DELTA_EXEC_LSB(current), PAX_DELTA_EXEC_LEN(current)); -+ current->mm->delta_stack = pax_delta_mask(pax_get_random_long(), PAX_DELTA_STACK_LSB(current), PAX_DELTA_STACK_LEN(current)); -+ } -+#endif -+ -+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) -+ if (current->mm->flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) -+ executable_stack = EXSTACK_DEFAULT; -+#endif -+ - /* Do this immediately, since STACK_TOP as used in setup_arg_pages - may depend on the personality. */ - SET_PERSONALITY(loc->elf_ex, ibcs2_interpreter); -@@ -878,6 +1193,11 @@ - load_addr += load_bias; - reloc_func_desc = load_bias; - } -+ -+#ifdef CONFIG_PAX_RANDEXEC -+ current->mm->delta_exec = load_addr_random - load_addr; -+#endif -+ - } - k = elf_ppnt->p_vaddr; - if (k < start_code) start_code = k; -@@ -888,9 +1208,9 @@ - * allowed task size. Note that p_filesz must always be - * <= p_memsz so it is only necessary to check p_memsz. - */ -- if (k > TASK_SIZE || elf_ppnt->p_filesz > elf_ppnt->p_memsz || -- elf_ppnt->p_memsz > TASK_SIZE || -- TASK_SIZE - elf_ppnt->p_memsz < k) { -+ if (k > task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz || -+ elf_ppnt->p_memsz > task_size || -+ task_size - elf_ppnt->p_memsz < k) { - /* set_brk can never work. Avoid overflows. */ - send_sig(SIGKILL, current, 0); - goto out_free_dentry; -@@ -917,6 +1237,16 @@ - start_data += load_bias; - end_data += load_bias; - -+#ifdef CONFIG_PAX_RANDMMAP -+ -+#ifdef CONFIG_PAX_SOFTMODE -+ if (pax_aslr) -+#endif -+ -+ elf_brk += PAGE_SIZE + pax_delta_mask(pax_get_random_long(), 4, PAGE_SHIFT); -+#undef pax_delta_mask -+#endif -+ - /* Calling set_brk effectively mmaps the pages that we need - * for the bss and break sections. We must do this before - * mapping in the interpreter, to make sure it doesn't wind -@@ -1167,9 +1497,11 @@ - if (vma->vm_flags & (VM_IO | VM_SHARED | VM_RESERVED)) - return 0; - -+#if 0 - /* If it hasn't been written to, don't write it out */ - if (!vma->anon_vma) - return 0; -+#endif - - return 1; - } @@ -1222,8 +1554,11 @@ #undef DUMP_SEEK Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-01-23 12:34:30 UTC (rev 5728) +++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-01-23 16:06:33 UTC (rev 5729) @@ -43,7 +43,7 @@ Group: System Environment/Kernel License: GPLv2 Version: %{rpmversion} -Release: 2jh +Release: 3jh ExclusiveArch: noarch %{all_x86} x86_64 ExclusiveOS: Linux Provides: kernel = %{version} From svn at tinysofa.org Sun Jan 23 17:20:27 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 23 Jan 2005 12:20:27 -0500 (EST) Subject: [tinysofa-svn] r5730 - in tinysofa/releases/1.2/initscripts/current: sources specs Message-ID: <20050123172027.0444734413A@minbar.tinysofa.org> Author: jh Date: 2005-01-23 12:20:18 -0500 (Sun, 23 Jan 2005) New Revision: 5730 Added: tinysofa/releases/1.2/initscripts/current/sources/sysctl.grsec Modified: tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec Log: - add grsecurity options to sysctl.conf Added: tinysofa/releases/1.2/initscripts/current/sources/sysctl.grsec =================================================================== --- tinysofa/releases/1.2/initscripts/current/sources/sysctl.grsec 2005-01-23 16:06:33 UTC (rev 5729) +++ tinysofa/releases/1.2/initscripts/current/sources/sysctl.grsec 2005-01-23 17:20:18 UTC (rev 5730) @@ -0,0 +1,61 @@ + +# Grsecurity options + +# prevent non-root users to be able to use dmesg(8) +kernel.grsecurity.dmesg = 1 + +# destroy System V IPC shared memory when no one is attached to it +kernel.grsecurity.destroy_unused_shm = 1 + +# prevent users from writing to FIFOs they don't own in +# world-writable +t directories +kernel.grsecurity.fifo_restrictions = 1 + +# prevent users from following symlinks owned by other users in +# world-writable +t directories +kernel.grsecurity.linking_restrictions = 1 + +# hide processes from outside of the chroot +kernel.grsecurity.chroot_findtask = 1 + +# deny sysctl in chroot +kernel.grsecurity.chroot_deny_sysctl = 1 + +# deny module insertion, raw i/o, system and net admin tasks, rebooting +# the system, modifying immutable files, modifying IPC owned by another +# and changing the system time in chroot +kernel.grsecurity.chroot_caps = 0 + +# restrict priority changes in chroot +kernel.grsecurity.chroot_restrict_nice = 0 + +# deny mknod in chroot +kernel.grsecurity.chroot_deny_mknod = 0 + +# deny (f)chmod +s in chroot +kernel.grsecurity.chroot_deny_chmod = 0 + +# enforce chdir("/") on all chroots +kernel.grsecurity.chroot_enforce_chdir = 0 + +# deny pivot_root in chroot +kernel.grsecurity.chroot_deny_pivot = 0 + +# deny double-chroots +kernel.grsecurity.chroot_deny_chroot = 0 + +# deny fchdir out of chroot +kernel.grsecurity.chroot_deny_fchdir = 1 + +# deny mounts in chroot +kernel.grsecurity.chroot_deny_mount = 0 + +# deny access to abstract AF_UNIX sockets out of chroot +kernel.grsecurity.chroot_deny_unix = 0 + +# deny shmat() out of chroot +kernel.grsecurity.chroot_deny_shmat = 0 + +# make these grsecurity options permanent until next reboot +kernel.grsecurity.grsec_lock = 0 + Modified: tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-01-23 16:06:33 UTC (rev 5729) +++ tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-01-23 17:20:18 UTC (rev 5730) @@ -3,8 +3,9 @@ Version: 7.31.9 License: GPL Group: main -Release: 10jh +Release: 11jh Source: initscripts-%{version}.tar.bz2 +Source1: sysctl.grsec URL: http://rhlinux.redhat.com/initscripts/ Patch0: initscripts-s390.patch Patch1: initscripts-7.31.9-tinysofa.patch @@ -75,7 +76,9 @@ # Add modules that should be loaded during boot, one per line: __EOF__ +cat %{SOURCE1} >> $RPM_BUILD_ROOT/etc/sysctl.conf + %pre /usr/sbin/groupadd -g 22 -r -f utmp @@ -212,6 +215,9 @@ %changelog +* Sun Jan 23 2005 Jaakko Heinonen 7.31.9-11jh +- add grsecurity options to sysctl.conf + * Mon Jan 10 2005 Jaakko Heinonen 7.31.9-10jh - change usbdevfs -> usbfs (gda) From svn at tinysofa.org Sun Jan 23 18:49:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 23 Jan 2005 13:49:45 -0500 (EST) Subject: [tinysofa-svn] r5731 - in tinysofa/releases/1.2/ppp/current: sources specs Message-ID: <20050123184945.5C29A344137@minbar.tinysofa.org> Author: gda Date: 2005-01-23 13:49:19 -0500 (Sun, 23 Jan 2005) New Revision: 5731 Added: tinysofa/releases/1.2/ppp/current/sources/libpcap-0.7.2.tar.gz tinysofa/releases/1.2/ppp/current/sources/ppp-2.4.2-libpcap-0.7.2.patch Modified: tinysofa/releases/1.2/ppp/current/specs/ppp.spec Log: fixed active filter support Added: tinysofa/releases/1.2/ppp/current/sources/libpcap-0.7.2.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/ppp/current/sources/libpcap-0.7.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.2/ppp/current/sources/ppp-2.4.2-libpcap-0.7.2.patch =================================================================== --- tinysofa/releases/1.2/ppp/current/sources/ppp-2.4.2-libpcap-0.7.2.patch 2005-01-23 17:20:18 UTC (rev 5730) +++ tinysofa/releases/1.2/ppp/current/sources/ppp-2.4.2-libpcap-0.7.2.patch 2005-01-23 18:49:19 UTC (rev 5731) @@ -0,0 +1,13 @@ +--- ppp-2.4.2/pppd/Makefile.linux.orig 2005-01-23 19:13:16.755324672 +0100 ++++ ppp-2.4.2/pppd/Makefile.linux 2005-01-23 19:23:19.451700896 +0100 +@@ -171,8 +171,8 @@ + endif + + ifdef FILTER +-LIBS += -lpcap +-CFLAGS += -DPPP_FILTER -I/usr/include/pcap ++LIBS += -L../libpcap-0.7.2 -lpcap ++CFLAGS += -DPPP_FILTER -I../libpcap-0.7.2 -I../libpcap-0.7.2/bpf + endif + + ifdef HAVE_INET6 Modified: tinysofa/releases/1.2/ppp/current/specs/ppp.spec =================================================================== --- tinysofa/releases/1.2/ppp/current/specs/ppp.spec 2005-01-23 17:20:18 UTC (rev 5730) +++ tinysofa/releases/1.2/ppp/current/specs/ppp.spec 2005-01-23 18:49:19 UTC (rev 5731) @@ -1,12 +1,13 @@ Summary: The PPP (Point-to-Point Protocol) daemon. Name: ppp Version: 2.4.2 -Release: 1ts +Release: 2gd License: distributable Group: extra Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz Source1: ppp-2.3.5-pamd.conf Source2: ppp.logrotate +Source3: libpcap-0.7.2.tar.gz Patch0: ppp-2.4.2-make.patch Patch1: ppp-2.3.6-sample.patch Patch2: ppp-2.4.2-libutil.patch @@ -17,9 +18,10 @@ Patch7: ppp-2.4.2-pie.patch Patch8: ppp-2.4.2-fix.patch Patch9: ppp-2.4.2-fix64.patch +Patch10: ppp-2.4.2-libpcap-0.7.2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: pam-devel, libpcap +BuildPrereq: pam-devel, bison, flex, gawk Requires: glibc >= 2.0.6, /etc/pam.d/system-auth, logrotate %description @@ -30,7 +32,7 @@ organization over a modem and phone line. %prep -%setup -q +%setup -q -a 3 %patch0 -p1 -b .make %patch1 -p1 -b .sample # patch 2 depends on the -lutil in patch 0 @@ -38,16 +40,26 @@ %patch3 -p1 -b .varargs # patch 4 depends on the -lutil in patch 0 %patch4 -p1 -b .lib64 -%patch5 -p1 -b .bpf +#%patch5 -p1 -b .bpf %patch6 -p1 -b .dontwriteetc %patch7 -p1 -b .pie %patch8 -p1 -b .fix %patch9 -p1 -b .fix64 +%patch10 -p1 -b .libpcap-0.7.2 find . -type f -name "*.sample" | xargs rm -f %build +(cd libpcap-0.7.2 +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%configure \ + --includedir=%{_includedir}/pcap \ + --enable-ipv6 \ + --enable-yydebug +%make +) + ./configure make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC" @@ -105,6 +117,9 @@ %changelog +* Sun Jan 23 2005 Gerald Dachs 2.4.2-2gd +- built pppd with included libpcap-0.7.2 for active filter support + * Sat Sep 04 2004 tsintegrate 2.4.2-1ts - current (2.4.2-1jh) integrated as 2.4.2-1ts for release 1.1-U1 From svn at tinysofa.org Sun Jan 23 18:55:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 23 Jan 2005 13:55:03 -0500 (EST) Subject: [tinysofa-svn] r5732 - tinysofa/releases/1.2/sysklogd/current/sources Message-ID: <20050123185503.1310634413A@minbar.tinysofa.org> Author: gda Date: 2005-01-23 13:54:56 -0500 (Sun, 23 Jan 2005) New Revision: 5732 Modified: tinysofa/releases/1.2/sysklogd/current/sources/syslog.sysconfig Log: fixed typo Modified: tinysofa/releases/1.2/sysklogd/current/sources/syslog.sysconfig =================================================================== --- tinysofa/releases/1.2/sysklogd/current/sources/syslog.sysconfig 2005-01-23 18:49:19 UTC (rev 5731) +++ tinysofa/releases/1.2/sysklogd/current/sources/syslog.sysconfig 2005-01-23 18:54:56 UTC (rev 5732) @@ -28,5 +28,5 @@ # Options to pass to the klogd daemon # "-c 4" changes the printk level so that its messages don't # show up in the console. For example, firewall messages -KLOGD_OPTS="-x" +KLOGD_OPTIONS="-x" From svn at tinysofa.org Sun Jan 23 19:47:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 23 Jan 2005 14:47:39 -0500 (EST) Subject: [tinysofa-svn] r5733 - in tinysofa/releases/1.2/grsecurity/current: sources specs Message-ID: <20050123194739.D1D46344137@minbar.tinysofa.org> Author: jh Date: 2005-01-23 14:47:28 -0500 (Sun, 23 Jan 2005) New Revision: 5733 Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050123.tar Removed: tinysofa/releases/1.2/grsecurity/current/sources/policies-20041229.tar tinysofa/releases/1.2/grsecurity/current/sources/policies-20050102.tar Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - update policies (this is first really useful configuration) Deleted: tinysofa/releases/1.2/grsecurity/current/sources/policies-20041229.tar =================================================================== (Binary files differ) Deleted: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050102.tar =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050123.tar =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050123.tar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-23 18:54:56 UTC (rev 5732) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-23 19:47:28 UTC (rev 5733) @@ -1,8 +1,8 @@ -%define policies_date 20050102 +%define policies_date 20050123 Summary: grsecurity user space utilities and policies Name: grsecurity Version: 2.1.1 -Release: 0.pre.2jh +Release: 0.pre.3jh Source0: gradm-2.1.1-200501222316.tar.gz Source1: grsec.init Source2: policies-%{policies_date}.tar From svn at tinysofa.org Mon Jan 24 09:39:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 04:39:37 -0500 (EST) Subject: [tinysofa-svn] r5734 - tinysofa/releases/1.2/libuser/current/specs Message-ID: <20050124093937.78FD13440E7@minbar.tinysofa.org> Author: jh Date: 2005-01-24 04:39:31 -0500 (Mon, 24 Jan 2005) New Revision: 5734 Modified: tinysofa/releases/1.2/libuser/current/specs/libuser.spec Log: - add missing defattr Modified: tinysofa/releases/1.2/libuser/current/specs/libuser.spec =================================================================== --- tinysofa/releases/1.2/libuser/current/specs/libuser.spec 2005-01-23 19:47:28 UTC (rev 5733) +++ tinysofa/releases/1.2/libuser/current/specs/libuser.spec 2005-01-24 09:39:31 UTC (rev 5734) @@ -100,6 +100,7 @@ %attr(0755,root,root) %{_sbindir}/* %files python +%defattr(-,root,root) %doc python/modules.txt %attr(0755,root,root) %{py_sitedir}/* From svn at tinysofa.org Mon Jan 24 12:31:36 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 07:31:36 -0500 (EST) Subject: [tinysofa-svn] r5735 - in contrib/1.1/mach/current: sources specs Message-ID: <20050124123136.3B4F43440E7@minbar.tinysofa.org> Author: jh Date: 2005-01-24 07:31:24 -0500 (Mon, 24 Jan 2005) New Revision: 5735 Added: contrib/1.1/mach/current/sources/tinysofa-1.2 Modified: contrib/1.1/mach/current/sources/tinysofa-1.1 contrib/1.1/mach/current/specs/mach.spec Log: - add configuration for tinysofa classic server 1.2 - fix a typo in 1.1 config Modified: contrib/1.1/mach/current/sources/tinysofa-1.1 =================================================================== --- contrib/1.1/mach/current/sources/tinysofa-1.1 2005-01-24 09:39:31 UTC (rev 5734) +++ contrib/1.1/mach/current/sources/tinysofa-1.1 2005-01-24 12:31:24 UTC (rev 5735) @@ -17,8 +17,8 @@ 'dir': 'tinysofa-1.1', 'minimal': 'bash glibc', 'base': 'coreutils findutils openssh-server openssh initscripts pam ' + - 'fcron openssl zlib dev glibc-locales glibc-i18n-en_US ', + - 'tcp_wrappers' + 'fcron openssl zlib dev glibc-locales glibc-i18n-en_US ' + + 'tcp_wrappers', 'build': 'dev rpm-devel rpm-build make gcc tar gzip patch ' + 'unzip bzip2 diffutils cpio elfutils', } Added: contrib/1.1/mach/current/sources/tinysofa-1.2 =================================================================== --- contrib/1.1/mach/current/sources/tinysofa-1.2 2005-01-24 09:39:31 UTC (rev 5734) +++ contrib/1.1/mach/current/sources/tinysofa-1.2 2005-01-24 12:31:24 UTC (rev 5735) @@ -0,0 +1,30 @@ +# mach dist configuration -*- python -*- + +# tinysofa-1.2: configuration for tinysofa + +# each distro flavour has an aptsources line describing where to get each +# kind of package from +# each actual dist has a packages dict for bootstrap packages and +# a sourceslist dict referencing aptsources lines to use + +### +aptsources['tinysofa-1.2'] = { + 'os': 'rpm file:///mnt/cdrom tinysofa all', +} + +# +packages['tinysofa-1.2'] = { + 'dir': 'tinysofa-1.2', + 'minimal': 'bash glibc', + 'base': 'coreutils findutils openssh-server openssh initscripts pam ' + + 'fcron openssl zlib dev glibc-locales glibc-i18n-en_US ' + + 'tcp_wrappers', + 'build': 'dev rpm-devel rpm-build make gcc tar gzip patch ' + + 'unzip bzip2 diffutils cpio elfutils', +} +sourceslist['tinysofa-1.2'] = { + 'tinysofa-1.1': ('os', ) +} +config['tinysofa-1.2'] = {} +aliases['tinysofa-1.2'] = ('ts12', 'ts-1.2', ) + Modified: contrib/1.1/mach/current/specs/mach.spec =================================================================== --- contrib/1.1/mach/current/specs/mach.spec 2005-01-24 09:39:31 UTC (rev 5734) +++ contrib/1.1/mach/current/specs/mach.spec 2005-01-24 12:31:24 UTC (rev 5735) @@ -2,7 +2,7 @@ Name: mach Version: 0.4.6 -Release: 11jh +Release: 12jh Summary: make a chroot buildsystem Group: contrib License: GPL @@ -10,6 +10,7 @@ Source: http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.gz Source1: tinysofa-1.1 Source2: tinysofa-2.0 +Source3: tinysofa-1.2 Patch0: mach-0.4.6-tinysofa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -61,6 +62,7 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mach/dist.d install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mach/dist.d +install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mach/dist.d sed -i "s/'-%{default_flavor}'/'%{default_flavor}'/" \ $RPM_BUILD_ROOT%{_sysconfdir}/mach/conf @@ -115,6 +117,10 @@ %changelog +* Mon Jan 24 2005 Jaakko Heinonen 0.4.6-12jh +- add configuration for tinysofa classic server 1.2 +- fix a typo in 1.1 config + * Wed Dec 15 2004 Jaakko Heinonen 0.4.6-11jh - add tcp_wrappers to tinysofa-1.1 base installation From svn at tinysofa.org Mon Jan 24 15:18:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 10:18:34 -0500 (EST) Subject: [tinysofa-svn] r5736 - tinysofa/releases/1.2/anaconda/current/specs Message-ID: <20050124151834.DF53B34413F@minbar.tinysofa.org> Author: jh Date: 2005-01-24 10:18:21 -0500 (Mon, 24 Jan 2005) New Revision: 5736 Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec Log: - fix x86 dietlibc BR Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec 2005-01-24 12:31:24 UTC (rev 5735) +++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec 2005-01-24 15:18:21 UTC (rev 5736) @@ -42,7 +42,7 @@ # common patches Patch1000: anaconda-booty-whrandom.patch BuildPreReq: pump-devel >= 0.8.15, kudzu-devel >= 1.1.0, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, libxml2-python, zlib-devel, elfutils-devel, beecrypt-devel -%ifarch i386 +%ifarch %{ix86} BuildRequires: dietlibc %endif BuildRequires: perl, findutils, glibc-i18n-en_US From svn at tinysofa.org Mon Jan 24 19:59:26 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 14:59:26 -0500 (EST) Subject: [tinysofa-svn] r5737 - in tinysofa/releases/1.2/dhcp/current: sources specs Message-ID: <20050124195926.98E1F34413F@minbar.tinysofa.org> Author: jh Date: 2005-01-24 14:59:14 -0500 (Mon, 24 Jan 2005) New Revision: 5737 Added: tinysofa/releases/1.2/dhcp/current/sources/dhcp-3.0.1-pie.patch Removed: tinysofa/releases/1.2/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch Modified: tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec Log: - build also dhclient with pie Copied: tinysofa/releases/1.2/dhcp/current/sources/dhcp-3.0.1-pie.patch (from rev 5725, tinysofa/releases/1.2/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch) =================================================================== --- tinysofa/releases/1.2/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch 2005-01-22 15:02:53 UTC (rev 5725) +++ tinysofa/releases/1.2/dhcp/current/sources/dhcp-3.0.1-pie.patch 2005-01-24 19:59:14 UTC (rev 5737) @@ -0,0 +1,20 @@ +--- dhcp-3.0.1/client/Makefile.dist.pie 2005-01-24 21:55:57.000000000 +0200 ++++ dhcp-3.0.1/client/Makefile.dist 2004-06-10 20:59:11.000000000 +0300 +@@ -128,6 +128,6 @@ + + + dhclient: $(OBJS) $(DHCPLIB) +- $(CC) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPLIB) $(LIBS) ++ $(CC) $(LFLAGS) -pie -o $(PROG) $(OBJS) $(DHCPLIB) $(LIBS) + + # Dependencies (semi-automatically-generated) +--- dhcp-3.0.1/server/Makefile.dist.pie 2004-06-10 20:59:50.000000000 +0300 ++++ dhcp-3.0.1/server/Makefile.dist 2005-01-24 21:53:45.000000000 +0200 +@@ -103,6 +103,6 @@ + -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5 + + dhcpd: $(OBJS) $(COBJ) $(DHCPLIB) +- $(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) ++ $(CC) $(LFLAGS) -pie -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) + + # Dependencies (semi-automatically-generated) Deleted: tinysofa/releases/1.2/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch =================================================================== --- tinysofa/releases/1.2/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch 2005-01-24 15:18:21 UTC (rev 5736) +++ tinysofa/releases/1.2/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch 2005-01-24 19:59:14 UTC (rev 5737) @@ -1,10 +0,0 @@ ---- dhcp-3.0.1rc12/server/Makefile.dist.pie 2002-11-17 03:29:30.000000000 +0100 -+++ dhcp-3.0.1rc12/server/Makefile.dist 2004-05-17 16:13:30.085925200 +0200 -@@ -98,6 +98,6 @@ - -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5 - - dhcpd: $(OBJS) $(COBJ) $(DHCPLIB) -- $(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) -+ $(CC) $(LFLAGS) -pie -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) - - # Dependencies (semi-automatically-generated) Modified: tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec =================================================================== --- tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec 2005-01-24 15:18:21 UTC (rev 5736) +++ tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec 2005-01-24 19:59:14 UTC (rev 5737) @@ -20,7 +20,7 @@ Patch114: dhcp-3.0pl2-initialize.patch Patch115: dhcp-3.0.1rc13-ts-script.patch Patch116: dhcp-3.0.1rc12-staticroutes.patch -Patch117: dhcp-3.0.1rc12-pie.patch +Patch117: dhcp-3.0.1-pie.patch Patch118: dhcp-3.0.1rc12-inherit-leases.patch Obsoletes: dhcpd BuildRoot: %{_tmppath}/%{name}-%{version}-root From svn at tinysofa.org Mon Jan 24 20:38:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 15:38:34 -0500 (EST) Subject: [tinysofa-svn] r5739 - in contrib/1.1/squirrelmail/current: sources specs Message-ID: <20050124203834.51FC3344141@minbar.tinysofa.org> Author: gda Date: 2005-01-24 15:37:52 -0500 (Mon, 24 Jan 2005) New Revision: 5739 Added: contrib/1.1/squirrelmail/current/sources/squirrelmail-1.4.4.tar.bz2 Removed: contrib/1.1/squirrelmail/current/sources/sm143a-xss.diff contrib/1.1/squirrelmail/current/sources/squirrelmail-1.4.3a.tar.bz2 Modified: contrib/1.1/squirrelmail/current/specs/squirrelmail.spec Log: new version Deleted: contrib/1.1/squirrelmail/current/sources/sm143a-xss.diff =================================================================== --- contrib/1.1/squirrelmail/current/sources/sm143a-xss.diff 2005-01-24 20:36:50 UTC (rev 5738) +++ contrib/1.1/squirrelmail/current/sources/sm143a-xss.diff 2005-01-24 20:37:52 UTC (rev 5739) @@ -1,28 +0,0 @@ -diff -urN functions/mime.php functions/mime.php ---- functions/mime.php 2004-05-23 19:14:11.000000000 +0300 -+++ functions/mime.php 2004-11-03 19:16:50.000000000 +0200 -@@ -602,13 +602,22 @@ - } - $iLastMatch = $i; - $j = $i; -- $ret .= $res[1]; -+ if ($htmlsave) { -+ $ret .= htmlspecialchars($res[1]); -+ } else { -+ $ret .= $res[1]; -+ } - $encoding = ucfirst($res[3]); - switch ($encoding) - { - case 'B': - $replace = base64_decode($res[4]); -- $ret .= charset_decode($res[2],$replace); -+ if ($utfencode) { -+ $replace = charset_decode($res[2],$replace); -+ } elseif ($htmlsave) { -+ $replace = htmlspecialchars($replace); -+ } -+ $ret .= $replace; - break; - case 'Q': - $replace = str_replace('_', ' ', $res[4]); Deleted: contrib/1.1/squirrelmail/current/sources/squirrelmail-1.4.3a.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.1/squirrelmail/current/sources/squirrelmail-1.4.4.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/squirrelmail/current/sources/squirrelmail-1.4.4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/squirrelmail/current/specs/squirrelmail.spec =================================================================== --- contrib/1.1/squirrelmail/current/specs/squirrelmail.spec 2005-01-24 20:36:50 UTC (rev 5738) +++ contrib/1.1/squirrelmail/current/specs/squirrelmail.spec 2005-01-24 20:37:52 UTC (rev 5739) @@ -1,14 +1,13 @@ Summary: SquirrelMail webmail client Name: squirrelmail -Version: 1.4.3a -Release: 2gd +Version: 1.4.4 +Release: 1gd License: GPL URL: http://www.squirrelmail.org/ Vendor: squirrelmail.org Group: contrib Source: %{name}-%{version}.tar.bz2 Source1: config.php.tinysofa -Patch: sm143a-xss.diff BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Requires: httpd, php4 >= 4.0.4, perl, tmpwatch >= 2.8, aspell @@ -25,7 +24,6 @@ %prep %setup -q -%patch -p0 %{__rm} -f plugins/make_archive.pl # Rearrange the documentation @@ -134,6 +132,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Mon Jan 24 2005 Gerald Dachs 1.4.4-1gd +- 1.4.4 + * Thu Dec 16 2004 Gerald Dachs 1.4.3a-2gd - applied security patch - changed config From svn at tinysofa.org Mon Jan 24 20:55:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 15:55:47 -0500 (EST) Subject: [tinysofa-svn] r5740 - tinysofa/releases/1.2 Message-ID: <20050124205547.90DA2344140@minbar.tinysofa.org> Author: jh Date: 2005-01-24 15:55:34 -0500 (Mon, 24 Jan 2005) New Revision: 5740 Added: tinysofa/releases/1.2/kernel-utils/ Log: - copy kernel-utils from contrib Copied: tinysofa/releases/1.2/kernel-utils (from rev 5739, contrib/1.1/kernel-utils26) From svn at tinysofa.org Mon Jan 24 20:56:35 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 15:56:35 -0500 (EST) Subject: [tinysofa-svn] r5741 - in contrib/1.1/squirrelmail/current: sources specs Message-ID: <20050124205635.B4E8D344140@minbar.tinysofa.org> Author: gda Date: 2005-01-24 15:53:31 -0500 (Mon, 24 Jan 2005) New Revision: 5741 Added: contrib/1.1/squirrelmail/current/sources/all_locales-1.4.4-20050122.tar.bz2 Modified: contrib/1.1/squirrelmail/current/specs/squirrelmail.spec Log: now with locales Added: contrib/1.1/squirrelmail/current/sources/all_locales-1.4.4-20050122.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/squirrelmail/current/sources/all_locales-1.4.4-20050122.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/squirrelmail/current/specs/squirrelmail.spec =================================================================== --- contrib/1.1/squirrelmail/current/specs/squirrelmail.spec 2005-01-24 20:55:34 UTC (rev 5740) +++ contrib/1.1/squirrelmail/current/specs/squirrelmail.spec 2005-01-24 20:53:31 UTC (rev 5741) @@ -1,13 +1,16 @@ +%define locale_stamp 20050122 + Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.4 -Release: 1gd +Release: 2gd License: GPL URL: http://www.squirrelmail.org/ Vendor: squirrelmail.org Group: contrib Source: %{name}-%{version}.tar.bz2 -Source1: config.php.tinysofa +Source1: all_locales-%{version}-%{locale_stamp}.tar.bz2 +Source2: config.php.tinysofa BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Requires: httpd, php4 >= 4.0.4, perl, tmpwatch >= 2.8, aspell @@ -23,7 +26,7 @@ address books, and folder manipulation. %prep -%setup -q +%setup -q -a 1 %{__rm} -f plugins/make_archive.pl # Rearrange the documentation @@ -43,7 +46,7 @@ # Fixup various files echo "left_refresh=300" >> data/default_pref -cp %{SOURCE1} contrib/RPM/ +cp %{SOURCE2} contrib/RPM/ for f in contrib/RPM/squirrelmail.cron contrib/RPM/config.php.tinysofa; do %{__perl} -pi \ -e "s|__ATTDIR__|%{_localstatedir}/spool/squirrelmail/attach/|g;" \ @@ -132,6 +135,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Mon Jan 24 2005 Gerald Dachs 1.4.4-2gd +- this time with locales + * Mon Jan 24 2005 Gerald Dachs 1.4.4-1gd - 1.4.4 From svn at tinysofa.org Mon Jan 24 20:57:05 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 15:57:05 -0500 (EST) Subject: [tinysofa-svn] r5742 - in tinysofa/releases/1.2/kernel/current: sources specs Message-ID: <20050124205705.B853C344140@minbar.tinysofa.org> Author: jh Date: 2005-01-24 15:56:56 -0500 (Mon, 24 Jan 2005) New Revision: 5742 Modified: tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-tinysofa-grsec.patch tinysofa/releases/1.2/kernel/current/specs/kernel.spec Log: - allow keyboard ioctls for users (for start_unicode) - require kernel-utils instead of kernel-utils26 Modified: tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-tinysofa-grsec.patch =================================================================== --- tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-tinysofa-grsec.patch 2005-01-24 20:53:31 UTC (rev 5741) +++ tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-tinysofa-grsec.patch 2005-01-24 20:56:56 UTC (rev 5742) @@ -12021,7 +12021,7 @@ if (!perm) return -EPERM; + -+#ifdef CONFIG_GRKERNSEC ++#if defined(CONFIG_GRKERNSEC) && 0 /*tinysofa, we need this for start_unicode*/ + if (!capable(CAP_SYS_TTY_CONFIG)) + return -EPERM; +#endif @@ -12033,7 +12033,7 @@ goto reterr; } -+#ifdef CONFIG_GRKERNSEC ++#if defined(CONFIG_GRKERNSEC) && 0 /*tinysofa, we need this for start_unicode*/ + if (!capable(CAP_SYS_TTY_CONFIG)) { + return -EPERM; + goto reterr; Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-01-24 20:53:31 UTC (rev 5741) +++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-01-24 20:56:56 UTC (rev 5742) @@ -58,7 +58,7 @@ # List the packages used during the kernel build # BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar -BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, kernel-utils26 +BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, kernel-utils BuildRequires: gcc, binutils >= 2.12, tinysofa-rpm-config BuildConflicts: rhbuildsys(DiskFree) < 500Mb From svn at tinysofa.org Mon Jan 24 20:36:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 15:36:59 -0500 (EST) Subject: [tinysofa-svn] r5738 - in tinysofa/releases/1.2/postfix/current: sources specs Message-ID: <20050124203659.7A1EF344140@minbar.tinysofa.org> Author: jh Date: 2005-01-24 15:36:50 -0500 (Mon, 24 Jan 2005) New Revision: 5738 Removed: tinysofa/releases/1.2/postfix/current/sources/postfix-2.1.1-pie.patch Modified: tinysofa/releases/1.2/postfix/current/specs/postfix.spec Log: - build all executables as pie Deleted: tinysofa/releases/1.2/postfix/current/sources/postfix-2.1.1-pie.patch =================================================================== --- tinysofa/releases/1.2/postfix/current/sources/postfix-2.1.1-pie.patch 2005-01-24 19:59:14 UTC (rev 5737) +++ tinysofa/releases/1.2/postfix/current/sources/postfix-2.1.1-pie.patch 2005-01-24 20:36:50 UTC (rev 5738) @@ -1,11 +0,0 @@ ---- postfix-2.1.1/src/postfix/Makefile.in.pie 2004-06-04 14:55:46.425016044 +0200 -+++ postfix-2.1.1/src/postfix/Makefile.in 2004-06-04 14:55:47.644849406 +0200 -@@ -14,7 +14,7 @@ - .c.o:; $(CC) $(CFLAGS) -c $*.c - - $(PROG): $(OBJS) $(LIBS) -- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) -+ $(CC) $(CFLAGS) -o $@ -pie $(OBJS) $(LIBS) $(SYSLIBS) - - Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs && cat $?) >$@ Modified: tinysofa/releases/1.2/postfix/current/specs/postfix.spec =================================================================== --- tinysofa/releases/1.2/postfix/current/specs/postfix.spec 2005-01-24 19:59:14 UTC (rev 5737) +++ tinysofa/releases/1.2/postfix/current/specs/postfix.spec 2005-01-24 20:36:50 UTC (rev 5738) @@ -37,8 +37,7 @@ Patch14: postfix-2.0.13-smtpd-sasl.patch Patch15: postfix-2.0.13-sasl-postfix.patch Patch16: postfix-2.0.19-sql-libs.patch -Patch17: postfix-2.1.1-pie.patch -Patch18: postfix-2.0.20-vda.patch +Patch17: postfix-2.0.20-vda.patch URL: http://www.postfix.org BuildRoot: %{_tmppath}/%{name}-%{version}-root %service_requires @@ -123,13 +122,12 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 -%patch17 -p1 -b .pie~ -%patch18 -p1 -b .vda~ +%patch17 -p1 -b .vda~ %build make makefiles \ - DEBUG="" \ + DEBUG="-g" \ OPT="-O3" \ CCARGS="$RPM_OPT_FLAGS -fPIC -I/usr/include \ -DHAS_SSL -I/usr/include/openssl \ @@ -138,8 +136,8 @@ -DHAS_MYSQL -I/usr/include/mysql \ -DHAS_PGSQL -I/usr/include/postgresql \ -DHAS_LDAP \ - -DHAS_PCRE -I/usr/include/pcre \ - " AUXLIBS="-lssl -lcrypto -lsasl2 -lz -lpam -lpthread" + -DHAS_PCRE -I/usr/include/pcre" \ + AUXLIBS="-pie -lssl -lcrypto -lsasl2 -lz -lpam -lpthread" cd lib for i in dns global master util; do ln -fs lib$i.a libpostfix-$i.so.1; From svn at tinysofa.org Mon Jan 24 21:27:42 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 24 Jan 2005 16:27:42 -0500 (EST) Subject: [tinysofa-svn] r5743 - in tinysofa/releases/1.2/kernel-utils/current: sources specs Message-ID: <20050124212742.13D4E344140@minbar.tinysofa.org> Author: jh Date: 2005-01-24 16:27:22 -0500 (Mon, 24 Jan 2005) New Revision: 5743 Added: tinysofa/releases/1.2/kernel-utils/current/sources/smartd.init tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils.spec Removed: tinysofa/releases/1.2/kernel-utils/current/sources/smartmontools-tinysofa.patch tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils26.spec Modified: tinysofa/releases/1.2/kernel-utils/current/sources/cpuspeed.init tinysofa/releases/1.2/kernel-utils/current/sources/irqbalance.init tinysofa/releases/1.2/kernel-utils/current/sources/readahead.init tinysofa/releases/1.2/kernel-utils/current/sources/readahead_early.init Log: - adapt for 1.2 - add try-restart targets Modified: tinysofa/releases/1.2/kernel-utils/current/sources/cpuspeed.init =================================================================== --- tinysofa/releases/1.2/kernel-utils/current/sources/cpuspeed.init 2005-01-24 20:56:56 UTC (rev 5742) +++ tinysofa/releases/1.2/kernel-utils/current/sources/cpuspeed.init 2005-01-24 21:27:22 UTC (rev 5743) @@ -1,11 +1,11 @@ #!/bin/sh # Startup script for cpuspeed # -# chkconfig: 12345 06 99 +# chkconfig: - 06 99 # description: Run dynamic CPU speed daemon # Source function library. -. /etc/rc.d/init.d/functions +. /etc/init.d/functions [ -f /usr/sbin/cpuspeed ] || exit 0 @@ -65,7 +65,7 @@ stop start ;; - condrestart) + condrestart|try-restart) if test "x`pidof cpuspeed`" != x; then stop start @@ -73,7 +73,7 @@ ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart|status}" + echo $"Usage: $0 {start|stop|restart|try-restart|status}" exit 1 esac Modified: tinysofa/releases/1.2/kernel-utils/current/sources/irqbalance.init =================================================================== --- tinysofa/releases/1.2/kernel-utils/current/sources/irqbalance.init 2005-01-24 20:56:56 UTC (rev 5742) +++ tinysofa/releases/1.2/kernel-utils/current/sources/irqbalance.init 2005-01-24 21:27:22 UTC (rev 5743) @@ -2,7 +2,7 @@ # # irqbalance Start/Stop irq balancing daemon # -# chkconfig: 345 13 87 +# chkconfig: - 13 87 # description: The irqbalance daemon will distribute interrupts across \ # the cpus on a multiprocessor system with the purpose of \ # spreading the load. \ @@ -80,11 +80,11 @@ restart|reload) restart ;; - condrestart) + condrestart|try-restart) [ -f /var/lock/subsys/irqbalance ] && restart || : ;; *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" + echo $"Usage: $0 {start|stop|status|restart|reload|try-restart}" exit 1 esac Modified: tinysofa/releases/1.2/kernel-utils/current/sources/readahead.init =================================================================== --- tinysofa/releases/1.2/kernel-utils/current/sources/readahead.init 2005-01-24 20:56:56 UTC (rev 5742) +++ tinysofa/releases/1.2/kernel-utils/current/sources/readahead.init 2005-01-24 21:27:22 UTC (rev 5743) @@ -13,7 +13,7 @@ [ -x /usr/sbin/readahead ] || exit 0 # Source function library. -. /etc/rc.d/init.d/functions +. /etc/init.d/functions start() { echo -n $"Starting background readahead: " @@ -38,12 +38,12 @@ stop start ;; - condrestart) + condrestart|try-restart) ;; reload) ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + echo $"Usage: $0 {start|stop|status|restart|try-restart|reload}" ;; esac exit $RETVAL Modified: tinysofa/releases/1.2/kernel-utils/current/sources/readahead_early.init =================================================================== --- tinysofa/releases/1.2/kernel-utils/current/sources/readahead_early.init 2005-01-24 20:56:56 UTC (rev 5742) +++ tinysofa/releases/1.2/kernel-utils/current/sources/readahead_early.init 2005-01-24 21:27:22 UTC (rev 5743) @@ -13,7 +13,7 @@ [ -x /usr/sbin/readahead ] || exit 0 # Source function library. -. /etc/rc.d/init.d/functions +. /etc/init.d/functions start() { echo -n $"Starting background readahead: " @@ -38,12 +38,12 @@ stop start ;; - condrestart) + condrestart|try-restart) ;; reload) ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + echo $"Usage: $0 {start|stop|status|restart|try-restart|reload}" ;; esac exit $RETVAL Added: tinysofa/releases/1.2/kernel-utils/current/sources/smartd.init =================================================================== --- tinysofa/releases/1.2/kernel-utils/current/sources/smartd.init 2005-01-24 20:56:56 UTC (rev 5742) +++ tinysofa/releases/1.2/kernel-utils/current/sources/smartd.init 2005-01-24 21:27:22 UTC (rev 5743) @@ -0,0 +1,64 @@ +#!/bin/sh +# smartmontools init file for smartd +# Copyright (C) 2002-4 Bruce Allen +# modified for tinysofa enterprise server + +# chkconfig: 2345 40 40 +# description: Self Monitoring and Reporting Technology (SMART) Daemon +# processname: smartd + +# Source function library +. /etc/init.d/functions + +# Source configuration file. This should define the shell variable smartd_opts +[ -r /etc/sysconfig/smartmontools ] && . /etc/sysconfig/smartmontools + +PATH=/sbin:/usr/sbin:$PATH +RETVAL=0 + +prog=smartd + +case "$1" in + start) + echo -n $"Starting $prog: " + daemon $prog $smartd_opts + touch ${INITLOCK:-/mnt/lockdev}/${prog} + echo + ;; + stop) + echo -n $"Shutting down $prog: " + killproc $prog + rm -f ${INITLOCK:-/mnt/lockdev}/${prog} + echo + ;; + reload) + echo -n $"Reloading $prog daemon configuration: " + killproc $prog -HUP + RETVAL=$? + echo + ;; + report) + echo -n $"Checking SMART devices now: " + killproc $prog -USR1 + RETVAL=$? + echo + ;; + restart) + $0 stop + $0 start + ;; + status) + status $prog + ;; + try-restart|condrestart) + if status $prog > /dev/null; then + $0 stop + $0 start + fi + ;; + *) + echo $"Usage: $0 {start|stop|reload|report|try-restart|restart|status}" + RETVAL=1 +esac + +exit $RETVAL Property changes on: tinysofa/releases/1.2/kernel-utils/current/sources/smartd.init ___________________________________________________________________ Name: svn:executable + * Deleted: tinysofa/releases/1.2/kernel-utils/current/sources/smartmontools-tinysofa.patch =================================================================== --- tinysofa/releases/1.2/kernel-utils/current/sources/smartmontools-tinysofa.patch 2005-01-24 20:56:56 UTC (rev 5742) +++ tinysofa/releases/1.2/kernel-utils/current/sources/smartmontools-tinysofa.patch 2005-01-24 21:27:22 UTC (rev 5743) @@ -1,12 +0,0 @@ -diff -urN kernel-utils-2.4/smartmontools-5.30/smartd.initd.in kernel-utils-2.4.smartd-tinysofa/smartmontools-5.30/smartd.initd.in ---- kernel-utils-2.4/smartmontools-5.30/smartd.initd.in 2004-03-06 01:55:14.000000000 +1100 -+++ kernel-utils-2.4.smartd-tinysofa/smartmontools-5.30/smartd.initd.in 2004-06-28 13:24:29.324116632 +1000 -@@ -45,7 +45,7 @@ - } - - # Red Hat or Yellow Dog or Mandrake --if [ -f /etc/redhat-release -o -f /etc/yellowdog-release -o -f /etc/mandrake-release ] ; then -+if [ -f /etc/redhat-release -o -f /etc/yellowdog-release -o -f /etc/mandrake-release -o -f /etc/tinysofa-release ] ; then - - # Source function library - . /etc/rc.d/init.d/functions Copied: tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils.spec (from rev 5742, tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils26.spec) =================================================================== --- tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils26.spec 2005-01-24 20:56:56 UTC (rev 5742) +++ tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils.spec 2005-01-24 21:27:22 UTC (rev 5743) @@ -0,0 +1,372 @@ +Summary: Kernel and Hardware related utilities +Name: kernel-utils +Version: 2.4 +Release: 1gd +Group: main +License: GPL/OSL +Source0: microcode_ctl-1.06.tar.gz +Source1: microcode_ctl.init +Source20: smartmontools-5.30.tar.gz +Source21: smartd.init +Source30: smartd.conf +Source40: rng-tools-1.1.tar.gz +Source50: x86info-1.12b.tgz +Source60: longrun-0.9.tar.bz2 +Source90: irqbalance-0.09.tar.gz +Source91: irqbalance.init +Source92: irqbalance.sysconfig +Source100: hardlink.c +Source110: http://carlthompson.net/dl/cpuspeed/cpuspeed-1.1.tar.gz +Source111: cpuspeed.init +Source120: readahead.c +Source121: readahead.init +Source122: readahead.files +Source123: readahead_early.init +Source124: readahead.early.files +Buildroot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/chkconfig /sbin/service +Requires: coreutils +BuildPreReq: readline-devel ncurses-devel automake autoconf +BuildPreReq: gcc-c++ gettext + +%ifarch {ix86} +Obsoletes: microcode_ctl +%endif +Patch1: microcode_ctl.patch +Patch2: smartmontools-smartd.patch +Patch3: cpuspeed.patch +Patch4: irqbalance-pie.patch +Patch5: longrun-0.9-14.patch + +%description +kernel-utils contains several utilities that can be used to control +the kernel or your machines hardware. Included are +* microcode_ctl - updates the microcode on Intel cpus +* smartctl - monitor the health of your disks + + +%prep +%setup -q -c -a 0 -a 20 -a 40 -a 50 -a60 -a90 -a110 + +%patch1 +# %patch2 -p0 +%patch3 -p0 +%patch4 -p1 +%patch5 -p0 + + +%build +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_mandir} +mkdir -p %{buildroot}%{_initrddir} +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig + +%ifarch %{ix86} +cd microcode_ctl-1.06 +make CFLAGS="$RPM_OPT_FLAGS" +cd .. +%endif + +cd rng-tools-1.1 +%configure +make +cd .. + +cd cpuspeed-1.1 +make CFLAGS="$RPM_OPT_FLAGS -fpie -pie -Wl,-z,relro,-z,now" +cd .. + +%install +mkdir -p %{buildroot}%{_mandir}/man{1,8} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig + +%ifarch %{ix86} +cd microcode_ctl-1.06 + +make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \ + INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=%{_sysconfdir} MICDIR=%{_sysconfdir}/firmware install clean + +cd ../x86info-1.12b +make +install x86info %{buildroot}%{_sbindir}/x86info +install x86info.1 %{buildroot}%{_mandir}/man1/ + +cd ../longrun +make +install longrun %{buildroot}%{_sbindir} +install longrun.1 %{buildroot}%{_mandir}/man1 +cd .. + +%endif + +cd cpuspeed-1.1 +install cpuspeed %{buildroot}%{_sbindir} +install %{SOURCE111} %{buildroot}%{_initrddir}/cpuspeed +install cpuspeed.conf %{buildroot}%{_sysconfdir}/cpuspeed.conf +cd .. + +cd smartmontools-5.30 +%configure +make CFLAGS="$RPM_OPT_FLAGS -fpie -pie -Wl,-z,relro,-z,now" DESTDIR=$RPM_BUILD_ROOT initddir=%{_initrddir} smartd smartctl install +cp %{SOURCE21} %{buildroot}%{_initrddir}/smartd +cp %{SOURCE30} %{buildroot}%{_sysconfdir}/smartd.conf + +cd ../irqbalance +make +install irqbalance %{buildroot}%{_sbindir} +install %{SOURCE91} %{buildroot}%{_initrddir}/irqbalance +install %{SOURCE92} %{buildroot}%{_sysconfdir}/sysconfig/irqbalance + +cd ../rng-tools-1.1 +make DESTDIR=$RPM_BUILD_ROOT install + +gcc -Wall -O2 -g %{SOURCE100} -o %{buildroot}%{_sbindir}/hardlink +gcc -Wall -O2 -g %{SOURCE120} -o %{buildroot}%{_sbindir}/readahead +install %{SOURCE121} %{buildroot}%{_initrddir}/readahead +install %{SOURCE122} %{buildroot}%{_sysconfdir}/readahead.files +install %{SOURCE123} %{buildroot}%{_initrddir}/readahead_early +install %{SOURCE124} %{buildroot}%{_sysconfdir}/readahead.early.files + +chmod -R a-s %{buildroot} + + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root) +%ifarch %{ix86} +%{_initrddir}/microcode_ctl +%{_sysconfdir}/firmware/* +/sbin/microcode_ctl +%{_sbindir}/x86info +%{_sbindir}/longrun +%endif +%{_sbindir}/cpuspeed +%{_initrddir}/cpuspeed +%attr(0644,root,root) %config %{_sysconfdir}/cpuspeed.conf +%attr(0644,root,root) %{_sysconfdir}/readahead.files +%attr(0644,root,root) %{_sysconfdir}/readahead.early.files +%{_sbindir}/irqbalance +%{_sbindir}/hardlink +%{_sbindir}/readahead +%attr(0644,root,root) %{_mandir}/*/* +%{_sbindir}/smartd +%{_sbindir}/smartctl +%{_initrddir}/smartd +%{_initrddir}/irqbalance +%{_initrddir}/readahead +%{_initrddir}/readahead_early +%attr(0644,root,root) %{_sysconfdir}/sysconfig/irqbalance +%doc /usr/share/doc/smartmontools-5.30 +%config %{_sysconfdir}/smartd.conf +%{_bindir}/rngtest +%{_sbindir}/rngd + + +%preun +%ifarch %{ix86} x86_64 + %service_preun irqbalance + %service_preun microcode_ctl +%endif +%service_preun smartd +%service_preun readahead +%service_preun readahead_early +%service_preun cpuspeed + +%postun +%ifarch %{ix86} x86_64 + %service_postun irqbalance + #service_postun microcode_ctl +%endif +%service_postun smartd +%service_postun readahead +%service_postun readahead_early +%service_postun cpuspeed + +%post +%service_post smartd +%service_post readahead +%service_post readahead_early +%service_post cpuspeed +%ifarch %{ix86} + %service_post irqbalance + %service_post microcode_ctl +%endif + + +%changelog +* Mon Jan 24 2005 Jaakko Heinonen +- adapt for 1.2 +- add try-restart targets + +* Mon Sep 13 2004 tsintegrate 2.4-1gd +- current (2.4-1gd) integrated as 2.4-1gd + +* Wed Aug 18 2004 Gerald Dachs 2.4-1gd +- taken from ts 2.0, changed to ts 1.1 +- renamed to from kernel-utils to kernel-utils26, because + of conflict with kernel-utils from kernel 2.4 + +* Tue Jun 29 2004 Arjan van de Ven +- add rng-tools + +* Mon Jun 21 2004 Alan Cox +- Fix #107453 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue May 11 2004 Arjan van de Ven +- remove dmidecode; the 2.6 kernel exports the info in sysfs +- include cpuspeed on all architectures + +* Fri May 07 2004 Arjan van de Ven +- fix for bug 122677 (cpuspeed initscript borkage) + +* Mon May 03 2004 Arjan van de Ven +- add fix for bug 120522 +* Sun May 02 2004 Arjan van de Ven +- update smartmontools to prevent amd64 from segfaulting + +* Sat Apr 17 2004 Arjan van de Ven +- make cpuspeed initscript honor locking + +* Thu Apr 08 2004 Arjan van de Ven +- fix bug #120347 + +* Tue Mar 30 2004 Karsten Hopp 2.4-9.1 +- fix permissions of config files and man pages (#116243) + +* Sat Mar 20 2004 Arjan van de Ven +- add patch from warren to make cpuspeed less verbose during boot + +* Sun Jan 18 2004 Arjan van de Ven +- add readahead + +* Wed Dec 10 2003 Arjan van de Ven +- make irqbalance a PIE executable + +* Sun Nov 09 2003 Arjan van de Ven +- add cpuspeed + +* Mon Oct 20 2003 Arjan van de Ven 2.4.8-39 +- update smartmontools to version 5.21 + +* Thu Oct 16 2003 Arjan van de Ven 2.4.8-38 +- add /usr/bin/hardlink + +* Mon Sep 08 2003 Arjan van de Ven 2.4.8-36 +- update smartmontools to a 64 bit clean version +- update irqbalance + +* Thu Aug 21 2003 Arjan van de Ven 2.4.8-35 +- update dmidecode + +* Tue Jul 29 2003 Arjan van de Ven 2.4-8.33 +- disable smartd by default + +* Thu Jul 03 2003 Arjan van de Ven +- clean up the spec a bit +- drop cpqarray monitor; too many dependencies for the use it gets + +* Mon Jun 02 2003 Arjan van de Ven +- switch to smartmontools for SMART monitoring + +* Fri May 02 2003 Arjan van de Ven +- add chstk for setting non-exec stack flags + +* Wed Jan 22 2003 Michael K. Johnson 2.4-8.28 +- /etc/sysconfig/irqbalance to set --oneshot from config file + +* Sun Jan 19 2003 Arjan van de Ven 2.4-8.26 +- updated irqbalance code + +* Sat Jan 18 2003 Arjan van de Ven 2.4-8.23 +- add initial irqbalance code + +* Thu Jan 16 2003 Bill Nottingham 2.4-8.22 +- fix %%post/%%preun on non-x86 + +* Tue Jan 7 2003 Nalin Dahyabhai 2.4-8.21 +- Rebuild + +* Fri Dec 13 2002 Elliot Lee 2.4-8.20 +- Build on all archs + +* Thu Dec 12 2002 Michael K. Johnson 2.4-8.19 +- added report-acpi-bug script + +* Tue Dec 03 2002 Arjan van de Ven 2.4-8.18 +- update x86info to version 1.11 +- include pmtools for acpi disasm + +* Fri Nov 15 2002 Michael K. Johnson 2.4-8.17 +- HP hasn't said it is shipping hammer, so no need for cpqarrayd on hammer +- uml is x86-only for now -- should probably move to its own package +- deal with new net-snmp additional #include requirements + +* Thu Nov 14 2002 Michael K. Johnson 2.4-8.15 +- Added acpidmp for x86 only for now (has x86-specific bits in it) +- Updated package cruft removal + +* Thu Sep 12 2002 Guy Streeter 2.4-8.14 +- No eepro100-diag for ppc. + +* Fri Aug 23 2002 Elliot Lee 2.4-8.13 +- Don't cop out of building uml_net on ia64 - instead, remove usage of + (effect-free) SA_NOCLDWAIT if not defined. +- Include all the uml tools (+ jailtest/uml_moo/uml_switch/uml_watchdog) + +* Fri Aug 23 2002 Arjan van de Ven 2.4-8.12 +- add uml tools + +* Wed Aug 21 2002 Elliot Lee 2.4-8.11 +- Remove ExclusiveArch: i386 (since it builds everywhere) +- Include smartd/smartctl man pages + +* Wed Jul 31 2002 Arjan van de Ven +- added longrun uitility + +* Thu Jun 27 2002 Elliot Lee 2.4-8.7 +- Patch31 for net-snmp + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Michael K. Johnson +- include the man pages + +* Sat Mar 30 2002 Arjan van de Ven +- change initorder to not shut services down after NFS has shut down + to allow /usr to be NFS mounted + +* Wed Mar 20 2002 Arjan van de Ven +- fix microcode_ctl to work on smp + +* Thu Mar 14 2002 Bill Nottingham 2.4-5 +- don't run things by default + +* Wed Feb 6 2002 Tim Powers 2.4-3.6.2 +- fix %%post sciptlet typo + +* Mon Feb 04 2002 Arjan van de Ven +- fail gracefully in microcode_ctl if firmware isn't downloaded + +* Mon Jan 28 2002 Arjan van de Ven +- added x86info + +* Tue Jan 15 2002 Bill Nottingham +- move eepro100-diag from kudzu to here + +* Fri Jan 11 2002 Arjan van de Ven +- added cpqarrayd for monitoring cpqarray drives too + from http://starbreeze.knoware.nl/~hugo/compaq/ + +* Mon Jan 07 2002 Arjan van de Ven +- added smartsuite for monitoring disk health status + +* Fri Dec 07 2001 Arjan van de Ven +- Initial packaging Deleted: tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils26.spec =================================================================== --- tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils26.spec 2005-01-24 20:56:56 UTC (rev 5742) +++ tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils26.spec 2005-01-24 21:27:22 UTC (rev 5743) @@ -1,366 +0,0 @@ -Summary: Kernel and Hardware related utilities -Name: kernel-utils26 -Version: 2.4 -Release: 1gd -Group: contrib -License: GPL/OSL -Source0: microcode_ctl-1.06.tar.gz -Source1: microcode_ctl.init -Source20: smartmontools-5.30.tar.gz -Source30: smartd.conf -Source40: rng-tools-1.1.tar.gz -Source50: x86info-1.12b.tgz -Source60: longrun-0.9.tar.bz2 -Source90: irqbalance-0.09.tar.gz -Source91: irqbalance.init -Source92: irqbalance.sysconfig -Source100: hardlink.c -Source110: http://carlthompson.net/dl/cpuspeed/cpuspeed-1.1.tar.gz -Source111: cpuspeed.init -Source120: readahead.c -Source121: readahead.init -Source122: readahead.files -Source123: readahead_early.init -Source124: readahead.early.files -Buildroot: %{_tmppath}/%{name}-%{version}-root -Prereq: /sbin/chkconfig /sbin/service -Requires: coreutils -BuildPreReq: readline-devel ncurses-devel automake autoconf -BuildPreReq: gcc-c++ gettext - -%ifarch {ix86} -Obsoletes: microcode_ctl -%endif -Patch1: microcode_ctl.patch -Patch2: smartmontools-smartd.patch -Patch3: cpuspeed.patch -Patch4: irqbalance-pie.patch -Patch5: longrun-0.9-14.patch -Patch6: smartmontools-tinysofa.patch - -%description -kernel-utils contains several utilities that can be used to control -the kernel or your machines hardware. Included are -* microcode_ctl - updates the microcode on Intel cpus -* smartctl - monitor the health of your disks - - -%prep -%setup -q -c -a 0 -a 20 -a 40 -a 50 -a60 -a90 -a110 - -%patch1 -# %patch2 -p0 -%patch3 -p0 -%patch4 -p1 -%patch5 -p0 -%patch6 -p1 - -%build -rm -rf $RPM_BUILD_ROOT - -mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{_mandir} -mkdir -p %{buildroot}%{_initrddir} -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig - -%ifarch %{ix86} -cd microcode_ctl-1.06 -make CFLAGS="$RPM_OPT_FLAGS" -cd .. -%endif - -cd rng-tools-1.1 -%configure -make -cd .. - -cd cpuspeed-1.1 -make CFLAGS="$RPM_OPT_FLAGS -fpie -pie -Wl,-z,relro,-z,now" -cd .. - -%install -mkdir -p %{buildroot}%{_mandir}/man{1,8} -mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig - -%ifarch %{ix86} -cd microcode_ctl-1.06 - -make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \ - INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=%{_sysconfdir} MICDIR=%{_sysconfdir}/firmware install clean - -cd ../x86info-1.12b -make -install x86info %{buildroot}%{_sbindir}/x86info -install x86info.1 %{buildroot}%{_mandir}/man1/ - -cd ../longrun -make -install longrun %{buildroot}%{_sbindir} -install longrun.1 %{buildroot}%{_mandir}/man1 -cd .. - -%endif - -cd cpuspeed-1.1 -install cpuspeed %{buildroot}%{_sbindir} -install %{SOURCE111} %{buildroot}%{_initrddir}/cpuspeed -install cpuspeed.conf %{buildroot}%{_sysconfdir}/cpuspeed.conf -cd .. - -cd smartmontools-5.30 -%configure -make CFLAGS="$RPM_OPT_FLAGS -fpie -pie -Wl,-z,relro,-z,now" DESTDIR=$RPM_BUILD_ROOT initddir=%{_initrddir} smartd smartctl install -cp %{SOURCE30} %{buildroot}%{_sysconfdir}/smartd.conf - -cd ../irqbalance -make -install irqbalance %{buildroot}%{_sbindir} -install %{SOURCE91} %{buildroot}%{_initrddir}/irqbalance -install %{SOURCE92} %{buildroot}%{_sysconfdir}/sysconfig/irqbalance - -cd ../rng-tools-1.1 -make DESTDIR=$RPM_BUILD_ROOT install - -gcc -Wall -O2 -g %{SOURCE100} -o %{buildroot}%{_sbindir}/hardlink -gcc -Wall -O2 -g %{SOURCE120} -o %{buildroot}%{_sbindir}/readahead -install %{SOURCE121} %{buildroot}%{_initrddir}/readahead -install %{SOURCE122} %{buildroot}%{_sysconfdir}/readahead.files -install %{SOURCE123} %{buildroot}%{_initrddir}/readahead_early -install %{SOURCE124} %{buildroot}%{_sysconfdir}/readahead.early.files - -chmod -R a-s %{buildroot} - -%clean -%clean_buildroot - -%files -%defattr(-,root,root) -%ifarch %{ix86} -%{_initrddir}/microcode_ctl -%{_sysconfdir}/firmware/* -/sbin/microcode_ctl -%{_sbindir}/x86info -%{_sbindir}/longrun -%endif -%{_sbindir}/cpuspeed -%{_initrddir}/cpuspeed -%attr(0644,root,root) %config %{_sysconfdir}/cpuspeed.conf -%attr(0644,root,root) %{_sysconfdir}/readahead.files -%attr(0644,root,root) %{_sysconfdir}/readahead.early.files -%{_sbindir}/irqbalance -%{_sbindir}/hardlink -%{_sbindir}/readahead -%attr(0644,root,root) %{_mandir}/*/* -%{_sbindir}/smartd -%{_sbindir}/smartctl -%{_initrddir}/smartd -%{_initrddir}/irqbalance -%{_initrddir}/readahead -%{_initrddir}/readahead_early -%attr(0644,root,root) %{_sysconfdir}/sysconfig/irqbalance -%doc /usr/share/doc/smartmontools-5.30 -%config %{_sysconfdir}/smartd.conf -%{_bindir}/rngtest -%{_sbindir}/rngd - - -%preun -%ifarch %{ix86} x86_64 - %service_preun irqbalance - %service_preun microcode_ctl -%endif -%service_preun smartd -%service_preun readahead -%service_preun readahead_early -%service_preun cpuspeed - -%postun -%ifarch %{ix86} x86_64 - %service_postun irqbalance - %service_postun microcode_ctl -%endif -%service_postun smartd -%service_postun readahead -%service_postun readahead_early -%service_postun cpuspeed - -%post -%service_post smartd -%service_post readahead -%service_post readahead_early -%service_post cpuspeed -%ifarch %{ix86} - %service_post irqbalance - %service_post microcode_ctl -%endif - -%changelog -* Mon Sep 13 2004 tsintegrate 2.4-1gd -- current (2.4-1gd) integrated as 2.4-1gd - -* Wed Aug 18 2004 Gerald Dachs 2.4-1gd -- taken from ts 2.0, changed to ts 1.1 -- renamed to from kernel-utils to kernel-utils26, because - of conflict with kernel-utils from kernel 2.4 - -* Tue Jun 29 2004 Arjan van de Ven -- add rng-tools - -* Mon Jun 21 2004 Alan Cox -- Fix #107453 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue May 11 2004 Arjan van de Ven -- remove dmidecode; the 2.6 kernel exports the info in sysfs -- include cpuspeed on all architectures - -* Fri May 07 2004 Arjan van de Ven -- fix for bug 122677 (cpuspeed initscript borkage) - -* Mon May 03 2004 Arjan van de Ven -- add fix for bug 120522 -* Sun May 02 2004 Arjan van de Ven -- update smartmontools to prevent amd64 from segfaulting - -* Sat Apr 17 2004 Arjan van de Ven -- make cpuspeed initscript honor locking - -* Thu Apr 08 2004 Arjan van de Ven -- fix bug #120347 - -* Tue Mar 30 2004 Karsten Hopp 2.4-9.1 -- fix permissions of config files and man pages (#116243) - -* Sat Mar 20 2004 Arjan van de Ven -- add patch from warren to make cpuspeed less verbose during boot - -* Sun Jan 18 2004 Arjan van de Ven -- add readahead - -* Wed Dec 10 2003 Arjan van de Ven -- make irqbalance a PIE executable - -* Sun Nov 09 2003 Arjan van de Ven -- add cpuspeed - -* Mon Oct 20 2003 Arjan van de Ven 2.4.8-39 -- update smartmontools to version 5.21 - -* Thu Oct 16 2003 Arjan van de Ven 2.4.8-38 -- add /usr/bin/hardlink - -* Mon Sep 08 2003 Arjan van de Ven 2.4.8-36 -- update smartmontools to a 64 bit clean version -- update irqbalance - -* Thu Aug 21 2003 Arjan van de Ven 2.4.8-35 -- update dmidecode - -* Tue Jul 29 2003 Arjan van de Ven 2.4-8.33 -- disable smartd by default - -* Thu Jul 03 2003 Arjan van de Ven -- clean up the spec a bit -- drop cpqarray monitor; too many dependencies for the use it gets - -* Mon Jun 02 2003 Arjan van de Ven -- switch to smartmontools for SMART monitoring - -* Fri May 02 2003 Arjan van de Ven -- add chstk for setting non-exec stack flags - -* Wed Jan 22 2003 Michael K. Johnson 2.4-8.28 -- /etc/sysconfig/irqbalance to set --oneshot from config file - -* Sun Jan 19 2003 Arjan van de Ven 2.4-8.26 -- updated irqbalance code - -* Sat Jan 18 2003 Arjan van de Ven 2.4-8.23 -- add initial irqbalance code - -* Thu Jan 16 2003 Bill Nottingham 2.4-8.22 -- fix %%post/%%preun on non-x86 - -* Tue Jan 7 2003 Nalin Dahyabhai 2.4-8.21 -- Rebuild - -* Fri Dec 13 2002 Elliot Lee 2.4-8.20 -- Build on all archs - -* Thu Dec 12 2002 Michael K. Johnson 2.4-8.19 -- added report-acpi-bug script - -* Tue Dec 03 2002 Arjan van de Ven 2.4-8.18 -- update x86info to version 1.11 -- include pmtools for acpi disasm - -* Fri Nov 15 2002 Michael K. Johnson 2.4-8.17 -- HP hasn't said it is shipping hammer, so no need for cpqarrayd on hammer -- uml is x86-only for now -- should probably move to its own package -- deal with new net-snmp additional #include requirements - -* Thu Nov 14 2002 Michael K. Johnson 2.4-8.15 -- Added acpidmp for x86 only for now (has x86-specific bits in it) -- Updated package cruft removal - -* Thu Sep 12 2002 Guy Streeter 2.4-8.14 -- No eepro100-diag for ppc. - -* Fri Aug 23 2002 Elliot Lee 2.4-8.13 -- Don't cop out of building uml_net on ia64 - instead, remove usage of - (effect-free) SA_NOCLDWAIT if not defined. -- Include all the uml tools (+ jailtest/uml_moo/uml_switch/uml_watchdog) - -* Fri Aug 23 2002 Arjan van de Ven 2.4-8.12 -- add uml tools - -* Wed Aug 21 2002 Elliot Lee 2.4-8.11 -- Remove ExclusiveArch: i386 (since it builds everywhere) -- Include smartd/smartctl man pages - -* Wed Jul 31 2002 Arjan van de Ven -- added longrun uitility - -* Thu Jun 27 2002 Elliot Lee 2.4-8.7 -- Patch31 for net-snmp - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Thu Jun 20 2002 Michael K. Johnson -- include the man pages - -* Sat Mar 30 2002 Arjan van de Ven -- change initorder to not shut services down after NFS has shut down - to allow /usr to be NFS mounted - -* Wed Mar 20 2002 Arjan van de Ven -- fix microcode_ctl to work on smp - -* Thu Mar 14 2002 Bill Nottingham 2.4-5 -- don't run things by default - -* Wed Feb 6 2002 Tim Powers 2.4-3.6.2 -- fix %%post sciptlet typo - -* Mon Feb 04 2002 Arjan van de Ven -- fail gracefully in microcode_ctl if firmware isn't downloaded - -* Mon Jan 28 2002 Arjan van de Ven -- added x86info - -* Tue Jan 15 2002 Bill Nottingham -- move eepro100-diag from kudzu to here - -* Fri Jan 11 2002 Arjan van de Ven -- added cpqarrayd for monitoring cpqarray drives too - from http://starbreeze.knoware.nl/~hugo/compaq/ - -* Mon Jan 07 2002 Arjan van de Ven -- added smartsuite for monitoring disk health status - -* Fri Dec 07 2001 Arjan van de Ven -- Initial packaging From svn at tinysofa.org Tue Jan 25 06:37:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 25 Jan 2005 01:37:14 -0500 (EST) Subject: [tinysofa-svn] r5745 - in tinysofa/releases/1.2/grsecurity/current: sources specs Message-ID: <20050125063714.C605734413F@minbar.tinysofa.org> Author: jh Date: 2005-01-25 01:37:05 -0500 (Tue, 25 Jan 2005) New Revision: 5745 Added: tinysofa/releases/1.2/grsecurity/current/sources/rbac.txt Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - add rbac.txt document - it's now 2.1.1 final Added: tinysofa/releases/1.2/grsecurity/current/sources/rbac.txt =================================================================== --- tinysofa/releases/1.2/grsecurity/current/sources/rbac.txt 2005-01-25 05:43:49 UTC (rev 5744) +++ tinysofa/releases/1.2/grsecurity/current/sources/rbac.txt 2005-01-25 06:37:05 UTC (rev 5745) @@ -0,0 +1,155 @@ +Role flags: + +[A] This role is an administrative role, thus it has special privilege + normal roles do not have. In particular, this role bypasses the + additional ptrace restrictions +[N] Don't require authentication for this role. To access + the role, use gradm -n +[s] This role is a special role, meaning it does not belong to a + user or group, and does not require an enforced secure policy + base to be included in the ruleset +[u] This role is a user role +[g] This role is a group role +[G] This role can use gradm to authenticate to the kernel + A policy for gradm will automatically be added to the role +[T] Enable TPE for this role +[l] Enable learning for this role + +a role can only be one of user, group, or special + +role_allow_ip IP/optional netmask +eg: role_allow_ip 192.168.1.0/24 +You can have as many of these per role as you want +They restrict the use of a role to a list of IPs. If a user +is on the system that would normally get the role does not +belong to those lists of IPs, the system falls back through +its method of determining a role for the user + +Role hierarchy +user -> group -> default +First a user role attempts to match, if one is not found, +a group role attempts to match, if one is not found, +the default role is used. + +role_transitions ... +eg: role_transitions www_admin dns_admin + +Role transitions specify which special roles a given role is allowed +to authenticate to. This applies to special roles that do not +require password authentication as well. If a user tries to +authenticate to a role that is not within his transition table, he +will receive a permission denied error + +---------------------------------------------------------------------------- + +Subject modes: + +[h] This process is hidden and only viewable by processes with the v mode. +[v] This process can view hidden processes. +[p] This process is protected; it can only be killed by processes with + the k mode. +[k] This process can kill protected processes +[l] Enables learning mode for this process +[d] Protect the /proc//fd and /proc//mem entries for processes + in this subject. +[b] Enable process accounting for processes in this subject. + +[P] DISABLES the PAGEEXEC feature of PaX on this subject +[S] DISABLES the SEGMEXEC feature of PaX on this subject +[M] DISABLES the MPROTECT feature of PaX on this subject +[R] DISABLES the RANDMMAP feature of PaX on this subject +[G] ENABLES the EMUTRAMP feature of PaX on this subject +[X] ENABLES the RANDEXEC feature of PaX on this subject +[O] Override the mmap() and ptrace() checks for this subject +[A] Protect the shared memory of this subject. No other processes but + processes contained within this subject may access the shared memory + of this subject +[K] When processes belonging to this subject generate an alert, + kill the process +[C] When processes belonging to this subject generate an alert, + kill the process and all processes belonging to the IP of the attacker + (if there was an IP attached to the process) +[T] Ensures this process can never execute any trojaned code +[o] Override ACL inheritance for this process. +[r] relax ptrace restrictions (allows process to ptrace processes + other than its own descendants) +[i] enable inheritance-based learning for this subject, causing + all accesses of this subject and anything it executes to be placed + in this subject, and inheritance flags added to executable objects + in this subject + +---------------------------------------------------------------------------- + +Object modes: + +[r] This object can be opened for reading. +[w] This object can be opened for writing or appending. +[x] This object can be executed (or mmapd with PROT_EXEC into a task). +[a] This object can be opened for appending. +[h] This object is hidden. +[t] This object can be ptraced, but cannot modify the running task. + This is referred to as a read-only ptrace. +[s] Logs will be suppressed for denied access to this object. +[i] This mode only applies to binaries. When the object is executed, + it inherits the ACL of the subject in which it was contained. +[m] allow creation of setuid/setgid files/directories + and modification of files/directories to be setuid/setgid +[M] audit the setuid/setgid creation/modification +[c] allow creation of the file/directory +[C] audit the creation +[d] allow deletion of the file/directory +[D] audit the deletion +[p] reject all ptraces to this object +[l] allow a hardlink at this path + (hardlinking requires at a minimum c and l modes, and the target + link cannot have any greater permission than the source file) +[L] audit link creation +[R] Audit successful reads to this object +[W] Audit successful writes to this object +[X] Audit successful execs of this object +[A] Audit successful appends to this object +[F] Audit successful finds of this object +[I] Audit successful ACL inherits of this object + +---------------------------------------------------------------------------- +A feature of the ACL system is the support of the wildcards * and ? in ACL +objects. The ?*? character matches zero or more characters, while ??? matches +exactly one character. Depending on how these globbing characters are used, +they have different effects. +---------------------------------------------------------------------------- +user/group transitions: +You may now specify what users and groups a given subject can +transition to. This can be done on an inclusive or exclusive basis. + +Examples: +subject /bin/su +user_transition_allow root spender +group_transition_allow root spender +subject /bin/su +user_transition_deny evilhacker +subject /bin/su +group_transition_deny evilhacker1 evilhacker2 + +Domains: +With domains you can combine users that don't share a common +GID as well as groups so that they share a single policy +Domains work just like roles, with the only exception being that +the line starting with "role" is replaced with one of the following: +domain somedomainname u user1 user2 user3 user4 ... usern +domain somedomainname g group1 group2 group3 group4 ... groupn + +New learning system: +To learn on a given subject: add l (the letter l, not the number 1) +to the subject mode +To learn on a given role, add l to the role mode +For both of these, to enable learning, enable the system like: +gradm -L /etc/grsec/learning.logs -E +and then generate the rules after disabling the system after the +learning phase with: +gradm -L /etc/grsec/learning.logs -O /etc/grsec/policy +To use full system learning, enable the system like: +gradm -F -L /etc/grsec/learning.logs +and then generate the rules after disabling the system after the +learning phase with: +gradm -F -L /etc/grsec/learning.logs -O /etc/grsec/policy +---------------------------------------------------------------------------- Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-25 05:43:49 UTC (rev 5744) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-25 06:37:05 UTC (rev 5745) @@ -2,10 +2,11 @@ Summary: grsecurity user space utilities and policies Name: grsecurity Version: 2.1.1 -Release: 0.pre.3jh +Release: 1jh Source0: gradm-2.1.1-200501222316.tar.gz Source1: grsec.init Source2: policies-%{policies_date}.tar +Source3: rbac.txt Patch0: gradm-2.0.1-dummypw.patch Patch1: gradm-2.0.1-rootrole.patch URL: http://www.grsecurity.net/ @@ -28,7 +29,9 @@ %patch0 -p1 -b .dummypw %patch1 -p1 -b .rootrole +cp %{SOURCE3} . + %build %make \ OPT_FLAGS="$RPM_OPT_FLAGS" \ @@ -76,6 +79,7 @@ %files -f files.list %defattr(-,root,root) +%doc %attr(644,root,root) rbac.txt policy %dev(c, 1, 12) %attr(0622,root,root) /dev/grsec %dir %attr(0700,root,root) %{_sysconfdir}/grsec %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/grsec/policy @@ -88,6 +92,10 @@ %changelog +* Mon Jan 24 2005 Jaakko Heinonen 2.1.1-1jh +- add rbac.txt document +- it's now 2.1.1 final + * Tue Jan 18 2005 Jaakko Heinonen 2.1.1-0.pre.1jh - update to pre-version of the 2.1.1 From svn at tinysofa.org Tue Jan 25 06:39:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 25 Jan 2005 01:39:40 -0500 (EST) Subject: [tinysofa-svn] r5746 - in tinysofa/releases/1.2: elfutils/current/specs initscripts/current/specs mysql/current/specs nfs-utils/current/specs pptpd/current/specs Message-ID: <20050125063940.DF2CA34413F@minbar.tinysofa.org> Author: jh Date: 2005-01-25 01:39:18 -0500 (Tue, 25 Jan 2005) New Revision: 5746 Modified: tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec tinysofa/releases/1.2/mysql/current/specs/mysql.spec tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec tinysofa/releases/1.2/pptpd/current/specs/pptpd.spec Log: - misc requirements fixes - disable RPM_OPT_FLAGS for elfutils Modified: tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec =================================================================== --- tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec 2005-01-25 06:37:05 UTC (rev 5745) +++ tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec 2005-01-25 06:39:18 UTC (rev 5746) @@ -70,7 +70,7 @@ %build mkdir build-%{_target_platform} cd build-%{_target_platform} -CFLAGS="$CFLAGS $RPM_OPT_FLAGS" \ +#CFLAGS="$CFLAGS $RPM_OPT_FLAGS" \ # XXX - O3 may cause problems ../configure \ --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ Modified: tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-01-25 06:37:05 UTC (rev 5745) +++ tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-01-25 06:39:18 UTC (rev 5746) @@ -19,7 +19,7 @@ Requires: agetty, gawk, sed, mktemp, e2fsprogs >= 1.15 Requires: procps, sysklogd >= 1.3.31 Requires: setup >= 2.0.3, psmisc, which, grep -Requires: modutils >= 2.3.11-5 +Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 2.0, sysvinit Requires: iproute, iputils, net-tools Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-01-25 06:37:05 UTC (rev 5745) +++ tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-01-25 06:39:18 UTC (rev 5746) @@ -59,7 +59,7 @@ %{see_base} %package devel -Requires: mysql-libs zlib-devel +Requires: mysql-libs zlib-devel libstdc++-devel Summary: MySQL - Development header files and libraries Group: development Modified: tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec =================================================================== --- tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec 2005-01-25 06:37:05 UTC (rev 5745) +++ tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec 2005-01-25 06:39:18 UTC (rev 5746) @@ -86,6 +86,7 @@ PreReq: coreutils, grep Requires: modutils >= 2.4.26-9 BuildRequires: krb5-devel >= 1.3.1 autoconf >= 2.57 +BuildRequires: tcp_wrappers-devel %service_requires %accountman_requires Requires: /sbin/nologin Modified: tinysofa/releases/1.2/pptpd/current/specs/pptpd.spec =================================================================== --- tinysofa/releases/1.2/pptpd/current/specs/pptpd.spec 2005-01-25 06:37:05 UTC (rev 5745) +++ tinysofa/releases/1.2/pptpd/current/specs/pptpd.spec 2005-01-25 06:39:18 UTC (rev 5746) @@ -10,7 +10,6 @@ Patch0: pptpd-overflow.patch BuildRoot: %{_tmppath}/%{name}-root Requires: ppp -BuildRequires: rpm >= 3.0.5 %description PPTPd, Point-to-Point Tunnelling Protocol Daemon, offers out @@ -30,7 +29,6 @@ make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT/etc/ppp make DESTDIR="$RPM_BUILD_ROOT" install install -m 0644 samples/pptpd.conf $RPM_BUILD_ROOT/etc/pptpd.conf @@ -51,7 +49,7 @@ %config(noreplace) /etc/ppp/options.pptpd %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %changelog * Thu Aug 05 2004 tsintegrate 1.1.3-14ts From svn at tinysofa.org Tue Jan 25 10:07:16 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 25 Jan 2005 05:07:16 -0500 (EST) Subject: [tinysofa-svn] r5747 - tinysofa/releases/1.2/krb5/current/specs Message-ID: <20050125100716.D0F8D344142@minbar.tinysofa.org> Author: jh Date: 2005-01-25 05:07:10 -0500 (Tue, 25 Jan 2005) New Revision: 5747 Modified: tinysofa/releases/1.2/krb5/current/specs/krb5.spec Log: - make devel to require the base package Modified: tinysofa/releases/1.2/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/1.2/krb5/current/specs/krb5.spec 2005-01-25 06:39:18 UTC (rev 5746) +++ tinysofa/releases/1.2/krb5/current/specs/krb5.spec 2005-01-25 10:07:10 UTC (rev 5747) @@ -1,7 +1,7 @@ Summary: Kerberos is a network authentication protocol. Name: krb5 Version: 1.3.6 -Release: 2jh +Release: 3jh Group: main Source0: krb5-%{version}.tar.gz Patch0: krb5-1.3.6-prof_err.patch @@ -23,6 +23,7 @@ Group: development Summary: Development libraries for kerberos 5 Requires: %{name}-libs = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: libcom_err-devel %rename kerberos5-devel @@ -95,6 +96,9 @@ %changelog +* Tue Jan 25 2005 Jaakko Heinonen 1.3.6-3jh +- make devel to require the base package + * Tue Jan 04 2005 tsintegrate 1.3.6-1ts - current (1.3.6-1jh) integrated as 1.3.6-1ts for release 1.1-U3 From svn at tinysofa.org Tue Jan 25 10:20:23 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 25 Jan 2005 05:20:23 -0500 (EST) Subject: [tinysofa-svn] r5748 - tinysofa/releases/1.2/krb5/current/specs Message-ID: <20050125102023.A2077344142@minbar.tinysofa.org> Author: jh Date: 2005-01-25 05:20:17 -0500 (Tue, 25 Jan 2005) New Revision: 5748 Modified: tinysofa/releases/1.2/krb5/current/specs/krb5.spec Log: - move krb5-config to -devel Modified: tinysofa/releases/1.2/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/1.2/krb5/current/specs/krb5.spec 2005-01-25 10:07:10 UTC (rev 5747) +++ tinysofa/releases/1.2/krb5/current/specs/krb5.spec 2005-01-25 10:20:17 UTC (rev 5748) @@ -76,6 +76,7 @@ %files %defattr(-,root,root) %attr(755,root,root) %{_bindir}/* +%exclude %{_bindir}/krb5-config %{_sbindir}/* %exclude %{_sbindir}/krb5-send-pr %{_datadir}/gnats @@ -90,6 +91,7 @@ %files devel %defattr(-,root,root) +%attr(755,root,root) %{_bindir}/krb5-config %{_includedir}/* %attr(644,root,root) %{_libdir}/*.a %attr(755,root,root) %{_libdir}/*.so From svn at tinysofa.org Tue Jan 25 10:22:52 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 25 Jan 2005 05:22:52 -0500 (EST) Subject: [tinysofa-svn] r5749 - in tinysofa/releases/1.2: libtiff/current/specs nfs-utils/current/specs Message-ID: <20050125102252.286E3344142@minbar.tinysofa.org> Author: jh Date: 2005-01-25 05:22:40 -0500 (Tue, 25 Jan 2005) New Revision: 5749 Modified: tinysofa/releases/1.2/libtiff/current/specs/libtiff.spec tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec Log: - BR: gcc-c++ Modified: tinysofa/releases/1.2/libtiff/current/specs/libtiff.spec =================================================================== --- tinysofa/releases/1.2/libtiff/current/specs/libtiff.spec 2005-01-25 10:20:17 UTC (rev 5748) +++ tinysofa/releases/1.2/libtiff/current/specs/libtiff.spec 2005-01-25 10:22:40 UTC (rev 5749) @@ -10,6 +10,7 @@ URL: http://www.libtiff.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel zlib libjpeg-devel libjpeg +BuildRequires: gcc-c++ Requires: zlib libjpeg %description Modified: tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec =================================================================== --- tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec 2005-01-25 10:20:17 UTC (rev 5748) +++ tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec 2005-01-25 10:22:40 UTC (rev 5749) @@ -86,7 +86,7 @@ PreReq: coreutils, grep Requires: modutils >= 2.4.26-9 BuildRequires: krb5-devel >= 1.3.1 autoconf >= 2.57 -BuildRequires: tcp_wrappers-devel +BuildRequires: tcp_wrappers-devel gcc-c++ %service_requires %accountman_requires Requires: /sbin/nologin From svn at tinysofa.org Tue Jan 25 10:27:29 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 25 Jan 2005 05:27:29 -0500 (EST) Subject: [tinysofa-svn] r5750 - tinysofa/releases/1.2/nfs-utils/current/specs Message-ID: <20050125102729.DF011344142@minbar.tinysofa.org> Author: jh Date: 2005-01-25 05:27:24 -0500 (Tue, 25 Jan 2005) New Revision: 5750 Modified: tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec Log: - BR: openldap-devel Modified: tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec =================================================================== --- tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec 2005-01-25 10:22:40 UTC (rev 5749) +++ tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec 2005-01-25 10:27:24 UTC (rev 5750) @@ -86,7 +86,7 @@ PreReq: coreutils, grep Requires: modutils >= 2.4.26-9 BuildRequires: krb5-devel >= 1.3.1 autoconf >= 2.57 -BuildRequires: tcp_wrappers-devel gcc-c++ +BuildRequires: tcp_wrappers-devel gcc-c++ openldap-devel %service_requires %accountman_requires Requires: /sbin/nologin From svn at tinysofa.org Wed Jan 26 07:37:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 02:37:00 -0500 (EST) Subject: [tinysofa-svn] r5752 - tinysofa/releases/1.2 Message-ID: <20050126073700.B4EFB344146@minbar.tinysofa.org> Author: jh Date: 2005-01-26 02:36:47 -0500 (Wed, 26 Jan 2005) New Revision: 5752 Added: tinysofa/releases/1.2/device-mapper/ Log: - copy from contrib Copied: tinysofa/releases/1.2/device-mapper (from rev 5751, contrib/1.1/device-mapper) From svn at tinysofa.org Wed Jan 26 07:38:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 02:38:33 -0500 (EST) Subject: [tinysofa-svn] r5753 - tinysofa/releases/1.2 Message-ID: <20050126073833.867A6344146@minbar.tinysofa.org> Author: jh Date: 2005-01-26 02:38:20 -0500 (Wed, 26 Jan 2005) New Revision: 5753 Added: tinysofa/releases/1.2/lvm2/ Log: - copy from contrib Copied: tinysofa/releases/1.2/lvm2 (from rev 5752, contrib/1.1/lvm2) From svn at tinysofa.org Wed Jan 26 07:47:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 02:47:39 -0500 (EST) Subject: [tinysofa-svn] r5754 - in tinysofa/releases/1.2: device-mapper/current/specs lvm2/current/specs Message-ID: <20050126074739.B6796344146@minbar.tinysofa.org> Author: jh Date: 2005-01-26 02:47:28 -0500 (Wed, 26 Jan 2005) New Revision: 5754 Modified: tinysofa/releases/1.2/device-mapper/current/specs/device-mapper.spec tinysofa/releases/1.2/lvm2/current/specs/lvm2.spec Log: - change groups Modified: tinysofa/releases/1.2/device-mapper/current/specs/device-mapper.spec =================================================================== --- tinysofa/releases/1.2/device-mapper/current/specs/device-mapper.spec 2005-01-26 07:38:20 UTC (rev 5753) +++ tinysofa/releases/1.2/device-mapper/current/specs/device-mapper.spec 2005-01-26 07:47:28 UTC (rev 5754) @@ -3,32 +3,38 @@ Version: 1.00.19 Release: 2gd License: GPL -Group: contrib +Group: main URL: http://sources.redhat.com/dm Source0: %{name}.%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description This package contains the supporting userspace files (libdevmapper and dmsetup) for the device-mapper. + %prep %setup -q -n %{name}.%{version} + %build %configure --enable-static_link --with-user= --with-group= -make +%make + %install %makeinstall + %clean %clean_buildroot + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig + %files %defattr(-,root,root,-) %doc COPYING COPYING.LIB INSTALL INTRO README VERSION WHATS_NEW Modified: tinysofa/releases/1.2/lvm2/current/specs/lvm2.spec =================================================================== --- tinysofa/releases/1.2/lvm2/current/specs/lvm2.spec 2005-01-26 07:38:20 UTC (rev 5753) +++ tinysofa/releases/1.2/lvm2/current/specs/lvm2.spec 2005-01-26 07:47:28 UTC (rev 5754) @@ -3,10 +3,10 @@ Version: 2.00.25 Release: 1gd License: GPL -Group: contrib +Group: main URL: http://sources.redhat.com/lvm2 Source0: LVM2.%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: device-mapper BuildRequires: libtermcap-devel BuildRequires: ncurses-devel @@ -22,15 +22,22 @@ or more physical volumes and creating one or more logical volumes (kind of logical partitions) in volume groups. + %prep %setup -q -n LVM2.%{version} %build -%configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-staticdir=/sbin --with-user= --with-group= -make DESTDIR=$RPM_BUILD_ROOT +%configure \ + --enable-static_link \ + --enable-readline \ + --enable-lvm1_fallback \ + --with-staticdir=/sbin \ + --with-user= \ + --with-group= +%make DESTDIR=$RPM_BUILD_ROOT %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall_std # Temporary links until initscripts get updated to use lvm.static ln -s lvm.static $RPM_BUILD_ROOT/sbin/lvm @@ -42,9 +49,11 @@ [[ `/bin/uname -r` < 2.6 ]] && echo "You need to be running a 2.6 kernel to install lvm2." && exit 1 exit 0 + %clean %clean_buildroot + %files %defattr(-,root,root,-) %doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW @@ -53,11 +62,12 @@ /sbin/pvscan /sbin/vgchange /sbin/vgscan -/usr/sbin/lvm -/usr/sbin/* +%{_sbindir}/lvm +%{_sbindir}/* %{_mandir}/*/* -%config(noreplace) /etc/lvm/lvm.conf +%config(noreplace) %{_sysconfdir}/lvm/lvm.conf + %changelog * Tue Oct 12 2004 Gerald Dachs 2.00.25-1gd - new in tinysofa contrib From svn at tinysofa.org Wed Jan 26 07:34:30 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 02:34:30 -0500 (EST) Subject: [tinysofa-svn] r5751 - in tinysofa/releases: 1.1 1.2 Message-ID: <20050126073430.01E9D344145@minbar.tinysofa.org> Author: jh Date: 2005-01-26 02:34:18 -0500 (Wed, 26 Jan 2005) New Revision: 5751 Added: tinysofa/releases/1.1/lvm/ Removed: tinysofa/releases/1.2/lvm/ Log: - move to 1.1 Copied: tinysofa/releases/1.1/lvm (from rev 5750, tinysofa/releases/1.2/lvm) From svn at tinysofa.org Wed Jan 26 15:10:49 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 10:10:49 -0500 (EST) Subject: [tinysofa-svn] r5755 - tinysofa/releases/1.2/device-mapper/current/specs Message-ID: <20050126151049.4D55834414D@minbar.tinysofa.org> Author: jh Date: 2005-01-26 10:10:42 -0500 (Wed, 26 Jan 2005) New Revision: 5755 Modified: tinysofa/releases/1.2/device-mapper/current/specs/device-mapper.spec Log: - fix permissions Modified: tinysofa/releases/1.2/device-mapper/current/specs/device-mapper.spec =================================================================== --- tinysofa/releases/1.2/device-mapper/current/specs/device-mapper.spec 2005-01-26 07:47:28 UTC (rev 5754) +++ tinysofa/releases/1.2/device-mapper/current/specs/device-mapper.spec 2005-01-26 15:10:42 UTC (rev 5755) @@ -25,6 +25,7 @@ %install %makeinstall +chmod -R u+w %{buildroot} %clean %clean_buildroot From svn at tinysofa.org Wed Jan 26 17:26:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 12:26:55 -0500 (EST) Subject: [tinysofa-svn] r5756 - tinysofa/releases/1.2/grsecurity/current/specs Message-ID: <20050126172655.9417334414E@minbar.tinysofa.org> Author: jh Date: 2005-01-26 12:26:49 -0500 (Wed, 26 Jan 2005) New Revision: 5756 Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - handle rpmnew files in %%post Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-26 15:10:42 UTC (rev 5755) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-26 17:26:49 UTC (rev 5756) @@ -12,7 +12,7 @@ URL: http://www.grsecurity.net/ License: GPL Group: main -PreReq: /dev +PreReq: /dev %{__cp} %{__rm} %{__mkdir} findutils %service_requires BuildRequires: byacc flex bison findutils BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -71,6 +71,23 @@ /sbin/gradm -G fi %service_post -o grsec + +# handle .rpmnew files +if [ $1 -gt 1 ]; then + cd %{_sysconfdir}/grsec || exit 0 + if [ ! -e rpmnew ]; then + %{__mkdir} -m 700 rpmnew + fi + if [ -d rpmnew ]; do + /usr/bin/find policies roles -type f -name '*.rpmnew' \ + -exec %{__cp} -p --parents '{}' rpmnew/ \; \ + -exec %{__rm} -f '{}' \; + else + /usr/bin/find policies roles -type f -name '*.rpmnew' \ + -exec %{__rm} -f '{}' \; + fi + cd - +fi exit 0 %preun @@ -92,6 +109,9 @@ %changelog +* Wed Jan 26 2005 Jaakko Heinonen +- handle rpmnew files in %%post + * Mon Jan 24 2005 Jaakko Heinonen 2.1.1-1jh - add rbac.txt document - it's now 2.1.1 final From svn at tinysofa.org Wed Jan 26 17:29:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 12:29:40 -0500 (EST) Subject: [tinysofa-svn] r5757 - tinysofa/releases/1.2/grsecurity/current/specs Message-ID: <20050126172940.4DF1834414E@minbar.tinysofa.org> Author: jh Date: 2005-01-26 12:29:34 -0500 (Wed, 26 Jan 2005) New Revision: 5757 Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - add -f option for cp Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-26 17:26:49 UTC (rev 5756) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-26 17:29:34 UTC (rev 5757) @@ -80,7 +80,7 @@ fi if [ -d rpmnew ]; do /usr/bin/find policies roles -type f -name '*.rpmnew' \ - -exec %{__cp} -p --parents '{}' rpmnew/ \; \ + -exec %{__cp} -pf --parents '{}' rpmnew/ \; \ -exec %{__rm} -f '{}' \; else /usr/bin/find policies roles -type f -name '*.rpmnew' \ From svn at tinysofa.org Wed Jan 26 18:46:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 13:46:21 -0500 (EST) Subject: [tinysofa-svn] r5758 - in tinysofa/releases/1.2/anaconda/current: sources specs Message-ID: <20050126184621.C88FE34414E@minbar.tinysofa.org> Author: jh Date: 2005-01-26 13:46:10 -0500 (Wed, 26 Jan 2005) New Revision: 5758 Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-mdadm.patch Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec Log: - switch lvm tools to lvm2 - add mdadm support Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-mdadm.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-mdadm.patch 2005-01-26 17:29:34 UTC (rev 5757) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-mdadm.patch 2005-01-26 18:46:10 UTC (rev 5758) @@ -0,0 +1,89 @@ +--- anaconda-9.1/fsset.py.mdadm 2005-01-26 08:56:04.000000000 +0200 ++++ anaconda-9.1/fsset.py 2005-01-26 09:07:44.000000000 +0200 +@@ -982,16 +982,40 @@ + + return raidtab + ++ def mdadmConf(self): ++ raident = 0 ++ ++ cf = """ ++# mdadm.conf written out by anaconda ++DEVICE partitions ++MAILADDR root ++""" ++ for ent in self.entries: ++ if ent.device.getName() != "RAIDDevice": ++ continue ++ ++ raident +=1 ++ cf = cf + ent.device.mdadmLine() ++ ++ if raident > 0: ++ return cf ++ return ++ + def write (self, prefix): + f = open (prefix + "/etc/fstab", "w") + f.write (self.fstab()) + f.close () + +- raidtab = self.raidtab() ++ #raidtab = self.raidtab() + +- if raidtab: +- f = open (prefix + "/etc/raidtab", "w") +- f.write (raidtab) ++ #if raidtab: ++ # f = open (prefix + "/etc/raidtab", "w") ++ # f.write (raidtab) ++ # f.close () ++ cf = self.mdadmConf() ++ if cf: ++ f = open (prefix + "/etc/mdadm.conf", "w") ++ f.write (cf) + f.close () + + # touch mtab +@@ -1685,6 +1709,10 @@ + return [ '-R', 'stride=%d' % (self.numDisks * 16) ] + return [] + ++ def mdadmLine (self, devPrefix="/dev"): ++ return "ARRAY %s/%s super-minor=%s\n" %(devPrefix, self.device, ++ self.minor) ++ + def raidTab (self, devPrefix='/dev'): + entry = "" + entry = entry + "raiddev %s/%s\n" % (devPrefix, +@@ -1713,18 +1741,21 @@ + isys.makeDevInode(self.device, node) + + if not self.isSetup: +- raidtab = '/tmp/raidtab.%s' % (self.device,) +- f = open(raidtab, 'w') +- f.write(self.raidTab(devPrefix=devPrefix)) +- f.close() + for device in self.members: + PartitionDevice(device).setupDevice(chroot, + devPrefix=devPrefix) +- iutil.execWithRedirect ("/usr/sbin/mkraid", +- ('mkraid', '--really-force', +- '--dangerous-no-resync', +- '--configfile', +- raidtab, node), ++ ++ args = ["/usr/sbin/mdadm", "--create", "/dev/%s" %(self.device,), ++ "--run", "--chunk=%s" %(self.chunksize,), ++ "--level=%s" %(self.level,), ++ "--raid-devices=%s" %(self.numDisks,)] ++ ++ if self.spares > 0: ++ args.append("--spare-devices=%s" %(self.spares,),) ++ ++ args.extend(map(devify, self.members)) ++ log("going to run: %s" %(args,)) ++ iutil.execWithRedirect (args[0], args, + stderr="/dev/tty5", stdout="/dev/tty5") + raid.register_raid_device(self.device, self.members[:], + self.level, self.numDisks) Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch 2005-01-26 17:29:34 UTC (rev 5757) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch 2005-01-26 18:46:10 UTC (rev 5758) @@ -1,5 +1,5 @@ --- anaconda-9.1/Makefile.nox~ 2003-07-07 23:53:24.000000000 +0300 -+++ anaconda-9.1/Makefile 2004-11-24 20:22:42.869933104 +0200 ++++ anaconda-9.1/Makefile 2005-01-26 20:29:08.000000000 +0200 @@ -18,13 +18,13 @@ PYFILES = $(wildcard *.py) @@ -37,8 +37,8 @@ for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done CVSTAG=anaconda-$(subst .,_,$(VERSION)-$(RELEASE)) ---- anaconda-9.1/instdata.py.nox~ 2004-11-24 21:23:23.886237423 +0200 -+++ anaconda-9.1/instdata.py 2004-11-24 21:58:12.599952149 +0200 +--- anaconda-9.1/instdata.py.nox~ 2003-08-21 19:33:35.000000000 +0300 ++++ anaconda-9.1/instdata.py 2005-01-26 20:29:08.000000000 +0200 @@ -110,12 +110,12 @@ self.langSupport.write (instPath) @@ -66,7 +66,7 @@ self.rootPassword.writeKS(f, self.auth) self.firewall.writeKS(f) --- anaconda-9.1/scripts/mk-images.x86_64.nox~ 2003-07-10 21:23:17.000000000 +0300 -+++ anaconda-9.1/scripts/mk-images.x86_64 2004-11-24 20:22:42.870932836 +0200 ++++ anaconda-9.1/scripts/mk-images.x86_64 2005-01-26 20:29:08.000000000 +0200 @@ -12,8 +12,8 @@ cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img @@ -78,8 +78,8 @@ rm -f $MBD_BOOTTREE/syslinux-splash.png for file in $BOOTDISKDIR/*.msg; do filename=`basename $file` ---- anaconda-9.1/scripts/upd-instroot.nox~ 2005-01-16 20:42:31.646195880 +0200 -+++ anaconda-9.1/scripts/upd-instroot 2005-01-16 20:43:34.617355169 +0200 +--- anaconda-9.1/scripts/upd-instroot.nox~ 2003-09-18 01:17:58.000000000 +0300 ++++ anaconda-9.1/scripts/upd-instroot 2005-01-26 20:35:22.000000000 +0200 @@ -103,16 +103,17 @@ mkdir -p $DEST mkdir -p $DESTGR @@ -96,7 +96,7 @@ - rhpl pyxf86config libxml2 libxml2-python glib2 - elfutils-libelf bogl-bterm bogl krb5-libs convertdb1 jfsutils" + bzip2-libs dosfstools pciutils reiserfsprogs parted sed -+ busybox-anaconda rpm-python hdparm lvm beecrypt ++ busybox-anaconda rpm-python hdparm lvm2 device-mapper beecrypt + libxml2 libxml2-python glib2 + elfutils-libelf kerrberos5-libs jfsutils + libgcc procps libcom_err filesystem setup" @@ -137,7 +137,7 @@ PACKAGESGR="$PACKAGESGR syslinux" fi -@@ -218,6 +219,7 @@ +@@ -218,9 +219,11 @@ etc/protocols etc/services $LIBDIR/ld*.so* @@ -145,15 +145,66 @@ $LIBDIR/libc* $LIBDIR/libcom_err* $LIBDIR/libcrypt* -@@ -301,7 +303,6 @@ - sbin/vgrename - sbin/vgscan - sbin/vgsplit ++$LIBDIR/libdevmapper* + $LIBDIR/libdl* + $LIBDIR/libe2p* + $LIBDIR/libext2fs* +@@ -249,19 +252,7 @@ + sbin/hdparm + sbin/hwclock + sbin/ldconfig +-sbin/lvchange +-sbin/lvcreate +-sbin/lvdisplay +-sbin/lvextend +-sbin/lvmchange +-sbin/lvmcreate_initrd +-sbin/lvmdiskscan +-sbin/lvmsadc +-sbin/lvmsar +-sbin/lvreduce +-sbin/lvremove +-sbin/lvrename +-sbin/lvscan ++sbin/lvm* + sbin/mdadm + sbin/mkdosfs + sbin/mke2fs +@@ -275,33 +266,10 @@ + sbin/mkswap + sbin/parted + sbin/pdisk +-sbin/pvchange +-sbin/pvcreate +-sbin/pvdata +-sbin/pvdisplay +-sbin/pvmove +-sbin/pvscan + sbin/probe + sbin/resize2fs + sbin/sfdisk + sbin/tune2fs +-sbin/vgcfgbackup +-sbin/vgcfgrestore +-sbin/vgchange +-sbin/vgck +-sbin/vgcreate +-sbin/vgdisplay +-sbin/vgexport +-sbin/vgextend +-sbin/vgimport +-sbin/vgmerge +-sbin/vgmknodes +-sbin/vgreduce +-sbin/vgremove +-sbin/vgrename +-sbin/vgscan +-sbin/vgsplit -usr/X11R6/share/Xconfigurator/MonitorsDB usr/bin/python usr/bin/python2.2 usr/bin/hmount -@@ -313,14 +314,12 @@ +@@ -313,14 +281,12 @@ usr/lib/anaconda/* usr/lib/anaconda/installclasses/* usr/lib/anaconda/textw/* @@ -169,7 +220,7 @@ usr/$LIBDIR/libbeecrypt* usr/$LIBDIR/libglib* usr/$LIBDIR/libgmodule* -@@ -333,6 +332,7 @@ +@@ -333,6 +299,7 @@ usr/$LIBDIR/libnewt* usr/$LIBDIR/libparted* usr/$LIBDIR/libpopt* @@ -177,7 +228,7 @@ usr/$LIBDIR/librpm-*4.?.so* usr/$LIBDIR/librpmdb*4.?.so* usr/$LIBDIR/librpmio*4.?.so* -@@ -341,13 +341,12 @@ +@@ -341,13 +308,12 @@ usr/$LIBDIR/libz.* usr/$LIBDIR/libbogl.so* usr/$LIBDIR/python2.2/* @@ -193,7 +244,7 @@ usr/lib/rpm/macros usr/lib/rpm/rpmpopt usr/lib/rpm/rpmrc -@@ -372,6 +371,7 @@ +@@ -372,6 +338,7 @@ usr/share/hwdata/pci.ids usr/share/hwdata/Cards usr/share/hwdata/MonitorsDB @@ -201,7 +252,7 @@ usr/share/rhpl/extramodes usr/share/rhpl/vesamodes EOF -@@ -439,10 +439,6 @@ +@@ -439,10 +406,6 @@ lib/security $LIBDIR/security/pam_* usr/$LIBDIR/libwrap.so* @@ -212,7 +263,7 @@ EOF fi -@@ -480,12 +476,7 @@ +@@ -480,12 +443,7 @@ boot/*.b boot/bootlx etc/fb.modes @@ -226,7 +277,7 @@ $LIBDIR/libacl* $LIBDIR/libattr* $LIBDIR/libgcc* -@@ -505,35 +496,6 @@ +@@ -505,35 +463,6 @@ sbin/parted sbin/silo sbin/tune2fs @@ -262,7 +313,7 @@ usr/bin/chattr* usr/bin/fc-cache usr/bin/gtk-query* -@@ -549,42 +511,15 @@ +@@ -549,42 +478,15 @@ usr/bin/tail usr/bin/tilo usr/bin/uniq @@ -306,7 +357,7 @@ usr/$LIBDIR/rpm/rpmpopt usr/lib/syslinux/* usr/lib/yaboot/* -@@ -593,43 +528,11 @@ +@@ -593,43 +495,11 @@ usr/sbin/fbset usr/sbin/smartctl usr/share/anaconda/* @@ -350,7 +401,7 @@ usr/share/vte/termcap/xterm usr/share/zoneinfo/zone.tab EOF -@@ -828,10 +731,10 @@ +@@ -828,10 +698,10 @@ rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/extensions/lib{GLcore,glx,pex5}* # fixup joe links @@ -365,7 +416,7 @@ echo "Creating nsswitch.conf" cat > $DEST/etc/nsswitch.conf < Author: jh Date: 2005-01-26 13:51:39 -0500 (Wed, 26 Jan 2005) New Revision: 5759 Removed: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-loader2-kernel26.patch.old Log: - remove old loader patch Deleted: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-loader2-kernel26.patch.old =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-loader2-kernel26.patch.old 2005-01-26 18:46:10 UTC (rev 5758) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-loader2-kernel26.patch.old 2005-01-26 18:51:39 UTC (rev 5759) @@ -1,892 +0,0 @@ -diff -urN ./loader2.orig/hardware.c ./loader2/hardware.c ---- ./loader2.orig/hardware.c 2003-09-10 23:45:32.000000000 +0300 -+++ ./loader2/hardware.c 2005-01-11 10:54:29.145239748 +0200 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -166,7 +167,7 @@ - return 0; - } - -- logMessage("scsi tape device(s) found, loading st.o"); -+ logMessage("scsi tape device(s) found, loading st.ko"); - - if (mlLoadModuleSetLocation("st", modLoaded, modDeps, - modInfo, flags, -@@ -210,7 +211,7 @@ - /* this is a hack since we can't really probe on iSeries */ - #ifdef __powerpc__ - if (!access("/proc/iSeries", X_OK)) { -- mlLoadModuleSet("veth:viodasd:viocd", modLoaded, modDeps, modInfo, flags); -+ mlLoadModuleSet("iseries_veth:veth:viodasd:viocd", modLoaded, modDeps, modInfo, flags); - updateKnownDevices(kd); - } - #endif -@@ -303,13 +304,13 @@ - void scsiSetup(moduleList modLoaded, moduleDeps modDeps, - moduleInfoSet modInfo, int flags, - struct knownDevices * kd) { -- mlLoadModuleSet("sd_mod:sr_mod", modLoaded, modDeps, modInfo, flags); -+ mlLoadModuleSet("scsi_mod:sd_mod:sr_mod", modLoaded, modDeps, modInfo, flags); - } - - void ideSetup(moduleList modLoaded, moduleDeps modDeps, - moduleInfoSet modInfo, int flags, - struct knownDevices * kd) { -- mlLoadModuleSet("ide-cd", modLoaded, modDeps, modInfo, flags); -+ mlLoadModuleSet("cdrom:ide-cd", modLoaded, modDeps, modInfo, flags); - } - - -diff -urN ./loader2.orig/init.c ./loader2/init.c ---- ./loader2.orig/init.c 2004-12-20 11:01:25.000000000 +0200 -+++ ./loader2/init.c 2005-01-11 10:48:17.977660514 +0200 -@@ -44,7 +44,9 @@ - #include - #include - #include -+#include - #include -+#include - - #include "devt.h" - -@@ -72,9 +74,9 @@ - /* we set a nicer ld library path specifically for bash -- a full - one makes anaconda unhappy */ - #if defined(__x86_64__) || defined(__s390x__) || defined(__ppc64__) -- "LD_LIBRARY_PATH=/lib64:/usr/lib64:/usr/X11R6/lib64:/usr/kerberos/lib64:/lib:/usr/lib:/usr/X11R6/lib:/usr/kerberos/lib", -+ "LD_LIBRARY_PATH=/lib64:/usr/lib64:/usr/X11R6/lib64:/lib:/usr/lib:/usr/X11R6/lib", - #else -- "LD_LIBRARY_PATH=/lib:/usr/lib:/usr/X11R6/lib:/usr/kerberos/lib", -+ "LD_LIBRARY_PATH=/lib:/usr/lib:/usr/X11R6/lib", - #endif - "HOME=/", - "TERM=linux", -@@ -496,6 +498,13 @@ - } - printf("done\n"); - -+ printf("mounting /sys filesystem... "); -+ if (!testing) { -+ if (mount("/sys", "/sys", "sysfs", 0, NULL)) -+ fatal_error(1); -+ } -+ printf("done\n"); -+ - /* these args are only for testing from commandline */ - for (i = 1; i < argc; i++) { - if (!strcmp (argv[i], "serial")) { -diff -urN ./loader2.orig/linuxrc.s390 ./loader2/linuxrc.s390 ---- ./loader2.orig/linuxrc.s390 2003-09-10 23:45:32.000000000 +0300 -+++ ./loader2/linuxrc.s390 2005-01-11 10:48:17.979659978 +0200 -@@ -1,6 +1,6 @@ - #! /bin/sh - # --# Copyright (C) 2000-2003 by -+# Copyright (C) 2000-2004 by - # Bernhard Rosenkraenzer - # Oliver Paukstadt - # Karsten Hopp -@@ -23,7 +23,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # --VERSION=1.01 -+VERSION=1.1 - - export TEXTDOMAIN=s390installer - export TEXTDOMAINDIR=/usr/lib/locale -@@ -61,6 +61,59 @@ - fi - } - -+# read file from CMS and write it to /tmp -+readcmsfile() # $1=dasdport $2=filename -+{ -+ local dev -+ if [ $# -ne 2 ]; then return; fi -+ mknod /dev/dasda b 94 0 -+ insmod dasd_mod$LO dasd=$1 -+ insmod dasd_eckd_mod$LO -+ cmsfscat -d /dev/dasda -a $2 > /tmp/$2 -+ if [ ${#1} == 3 ]; then -+ dev="0.0.0${1}" -+ elif [ ${#1} == 4 ]; then -+ dev="0.0.${1}" -+ fi -+ echo 0 > /sys/bus/ccw/drivers/dasd-eckd/$dev/online -+ rmmod dasd_eckd_mod -+ rmmod dasd_mod -+} -+ -+setupdevice() -+{ -+ if [ -z "$SUBCHANNELS" -o -z "$DIRNAME" ]; then -+ echo $"SUBCHANNELS and DIRNAME empty, cannot continue." -+ exit 1 -+ fi -+ SYSDIR=${SUBCHANNELS//,*/} # get first subchannel. This is where the device can be brought online -+ echo "$SUBCHANNELS" >/sys/bus/ccwgroup/drivers/${DIRNAME}/group -+ [ -n "$PORTNAME" ] && echo "$PORTNAME" > /sys/bus/ccwgroup/drivers/${DIRNAME}/${SYSDIR}/portname -+ echo 1 > /sys/bus/ccwgroup/drivers/${DIRNAME}/${SYSDIR}/online -+} -+ -+convertchandev() -+{ -+ local del dev channels -+ if [ -z "$CHANDEV" -o -n "$SUBCHANNELS" ]; then -+ return -+ fi -+ dev=${CHANDEV//,*/} -+ channels=${CHANDEV#${dev},*} -+ channels=${channels//0x/0} -+ SUBCHANNELS="0.0.${channels//,*/}" -+ channels="${channels#*,}" -+ SUBCHANNELS="$SUBCHANNELS,0.0.${channels//,*/}" -+ if [ "$NETTYPE" = "eth" -o "$NETTYPE" = "hsi" ]; then -+ channels="${channels#*,}" -+ SUBCHANNELS="$SUBCHANNELS,0.0.${channels//,*/}" -+ fi -+ [ -z "$QETHPARM" ] && return -+ del=${QETHPARM%%portname:*} -+ PORTNAME=${QETHPARM#${del}} -+ PORTNAME=${PORTNAME//,*/} -+} -+ - S390ARCH=`uname -m` - if [ "$S390ARCH" = "s390" ]; then - export S390ARCH="S/390" -@@ -86,11 +139,12 @@ - PYTHONPATH=/tmp/updates - export PYTHONPATH - -+mount -t proc none /proc -+mount -t devpts /dev/pts /dev/pts -+mount -t sysfs none /sys - # remount root fs rw - mount /dev/root / -o remount,rw - --mount -t proc none /proc --mount -t devpts /dev/pts /dev/pts - # limit output on x3270 console (well, not really -- need debugging now) - echo "8 4 1 1" > /proc/sys/kernel/printk - -@@ -102,58 +156,59 @@ - - LO="" - --[ -L /sbin/insmod ] && LO=".o" -+[ -L /sbin/insmod ] && LO=".ko" -+ -+if [ -n "$CMSDASD" -a -n "$CMSCONFFILE" ]; then -+ readcmsfile $CMSDASD $CMSCONFFILE -+ source /tmp/$CMSCONFFILE #2>/dev/null -+fi - - # Parse configuration - # Check for missing parameters, prompt for them if necessary --while [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" ]; do -- echo $"Enter the FQDN of your new Linux guest (e.g. s390.redhat.com):" -- read HOSTNAME --done - while [ -z "$NETTYPE" ]; do -- echo $"Enter which kind of network device do you intend to use" -- echo " (e.g. ctc, escon, iucv, eth, hsi, tr):" -+ echo $"Which kind of network device do you intend to use" -+ echo $" (e.g. ctc, escon, iucv, eth, hsi, lcs, tr)." -+ echo $"Enter 'eth' for OSA-Express Fast Ethernet, Gigabit Ethernet" -+ echo $" (including 1000Base-T), High Speed Token Ring, and ATM " -+ echo $" (running Ethernet LAN emulation) features in QDIO mode." -+ echo $"Enter 'hsi' for Guest LANs using virtual HiperSockets or" -+ echo $" HiperSockets." - read NETTYPE - done - DEVICE=${NETTYPE}0 --if [ ":$NETTYPE" != ":iucv" ]; then # iucv is the only interface without chandev config -- while [ -z "$CHANDEV" ]; do -- echo $"Enter parameters you need to pass to the channel device layer." -- echo $"This includes the I/O ports of your ctc, escon, qeth, hsi and lcs devices." -- echo $"(e.g. \"ctc0,0x600,0x601\" will activate the ctc0 interface at I/O" -- echo $"ports 0x600,0x601)" -- echo $"Hipersocket interfaces need to be configured like qeth devices," -- echo $"p.e. qeth0,0x3000,0x3001,0x3002" -- echo $"Additional parameters for QETH devices such as the portname" -- echo $"should be entered at the next prompt, not here !" -- read CHANDEV -+if [ "$NETTYPE" != "iucv" ]; then # iucv is the only interface without ccw config -+ convertchandev -+ while [ -z "$SUBCHANNELS" ]; do -+ echo $"Enter the bus ID and the device number of your CCW devices." -+ echo $"CTC, ESCON and LCS need two subchannels:" -+ echo $"(e.g. \"0.0.0600,0.0.0601\" will configure the CTC or ESCON interface" -+ echo $"with the subchannels 0x600 and 0x601)" -+ echo $"QETH and HSI need three subchannels p.e. 0.0.03000,0.0.03001,0.0.03002" -+ read SUBCHANNELS - done -- echo "$CHANDEV" |grep -q "qeth" -- if [ "$?" = "0" ]; then -- if [ -z "$QETHPARM" ]; then -- echo $"Each OSA-Express feature in QDIO mode must be associated with a port name" -- echo $"Enter additional parameters for your QETH device" -- echo $"(e.g. \"add_parms,0x10,{lo_devno,hi_devno},portname:port_name\")" -- echo $"Press enter if you don't want to enter additional parameters" -- read QETHPARM -- if [ -z "$QETHPARM" ]; then -- echo $"You have been warned, but this will not work without an associated portname" -- fi -+ if [ "$NETTYPE" = "eth" -o "$NETTYPE" = "hsi" ]; then -+ QETH="yes" -+ if [ -z "$PORTNAME" ]; then -+ echo $"Portname of the OSA-Express feature in QDIO mode and z/VM Guest LAN" -+ echo $"This parameter is optional with z/VM 4.4.0 or z/VM 4.3.0 with" -+ echo $"APARs VM63308 and PQ73878" -+ echo $"Press enter if you don't want to enter a portname" -+ read PORTNAME - fi -+ DIRNAME="qeth" -+ elif [ "$NETTYPE" = "ctc" -o "$NETTYPE" = "escon" ]; then -+ DIRNAME="ctc" -+ elif [ "$NETTYPE" = "lcs" -o "$NETTYPE" = "tr" ]; then -+ DIRNAME="lcs" - fi -- echo "$CHANDEV" |grep -q "hsi" -- if [ "$?" = "0" ]; then -- if [ -z "$QETHPARM" ]; then -- echo $"Enter additional parameters for your HSI device" -- echo $"(e.g. \"add_parms,0x10,{lo_devno,hi_devno},portname:port_name\")" -- echo $"Press enter if you don't want to enter additional parameters" -- read QETHPARM -- fi -- fi -- [ -n "$CHANDEV" ] && echo "$CHANDEV" >/proc/chandev -- [ -n "$QETHPARM" ] && echo "$QETHPARM" >/proc/chandev -- [ -n "$CHANDEV" ] && echo "reprobe" >/proc/chandev -+ -+else -+ DIRNAME="iucv" - fi -+while [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" ]; do -+ echo $"Enter the FQDN of your new Linux guest (e.g. s390.redhat.com):" -+ read HOSTNAME -+done - while [ -z "$IPADDR" ]; do - echo $"Enter the IP address of your new Linux guest:" - read IPADDR -@@ -162,7 +217,7 @@ - echo $"Enter the network address of the new Linux guest:" - read NETWORK - done --if [ ":$NETTYPE" = ":eth" ] || [ ":$NETTYPE" = ":tr" ] || [ ":$NETTYPE" = ":hsi" ] || [ ":$NETTYPE" = ":lcs" ]; then -+if [ "$NETTYPE" = "eth" ] || [ "$NETTYPE" = "tr" ] || [ "$NETTYPE" = "hsi" ] || [ "$NETTYPE" = "lcs" ]; then - while [ -z "$NETMASK" ]; do - echo $"Enter the netmask for the new Linux guest (e.g. 255.255.255.0):" - read NETMASK -@@ -175,21 +230,6 @@ - echo $"Enter your default gateway:" - read GATEWAY - done -- if echo "$CHANDEV" |grep -q "lcs"; then -- if [ ":$NETTYPE" = ":tr" ]; then -- TR="on" -- else -- LCS="on" -- fi -- fi -- # qeth and nettype!= eth is hipersockets ! -- if echo "$CHANDEV" |grep -q "qeth"; then -- if [ ":$NETTYPE" = ":eth" ]; then -- QETH="on" -- elif [ ":$NETTYPE" = ":hsi" ]; then -- HSI="on" -- fi -- fi - else # ctc0, escon0, iucv0 - if [ -z "$NETMASK" ]; then - # If the user did not supply netmask, we add the right one. -@@ -197,7 +237,7 @@ - NETMASK="255.255.255.255" - fi - while [ -z "$GATEWAY" ]; do -- echo $"Enter the IP of your ctc/escon/iucv point-to-point partner:" -+ echo $"Enter the IP of your CTC / ESCON / IUCV point-to-point partner:" - read GATEWAY - done - -@@ -212,6 +252,9 @@ - echo $"Linux guest:" - read IUCV - done -+ if [ "${IUCV:0:5}" != "iucv=" ]; then -+ IUCV="iucv=$IUCV" -+ fi - fi - fi - # don't ask for MTU, but use it if it has been set in the .parm file -@@ -221,10 +264,12 @@ - fi - - # configure network-interface --KERNELVERSION=`cat /proc/version | awk '{ print $3 }'` - if [ ":$NETTYPE" = ":ctc" -o ":$NETTYPE" = ":escon" ]; then -+ insmod ccwgroup$LO -+ insmod cu3088$LO - insmod fsm$LO - insmod ctc$LO -+ setupdevice - ifconfig $DEVICE $IPADDR $MMTU pointopoint $GATEWAY - elif [ ":$NETTYPE" = ":iucv" ]; then - insmod fsm$LO -@@ -232,22 +277,24 @@ - insmod netiucv$LO $IUCV - ifconfig $DEVICE $IPADDR $MMTU pointopoint $GATEWAY - if [ -n "$IUCV" ]; then -- echo "options netiucv $IUCV" >> /tmp/modules.conf -+ echo "options netiucv $IUCV" >> /tmp/modprobe.conf - fi --elif [ -n "$LCS" -o -n "$TR" ]; then -+elif [ "$NETTYPE" = "lcs" -o "$NETTYPE" = "tr" ]; then -+ insmod ccwgroup$LO - insmod lcs$LO -+ setupdevice - ifconfig $DEVICE $IPADDR $MMTU netmask $NETMASK broadcast $BROADCAST - route add -net $NETWORK netmask $NETMASK dev $DEVICE 2>/dev/null -- echo "alias $DEVICE lcs" >> /tmp/modules.conf --elif [ -n "$QETH" -o -n "$HSI" ]; then -- if [ "$DEVICE" = "eth0" -a "$HSI" = "on" ]; then -- DEVICE="hsi0" -- fi -+ echo "alias $DEVICE lcs" >> /tmp/modprobe.conf -+elif [ "$NETTYPE" = "eth" -o "$NETTYPE" = "hsi" ]; then -+ insmod ccwgroup$LO - insmod qdio$LO -+ insmod ipv6$LO - insmod qeth$LO -+ setupdevice - ifconfig $DEVICE $IPADDR $MMTU netmask $NETMASK broadcast $BROADCAST - route add -net $NETWORK netmask $NETMASK dev $DEVICE 2>/dev/null -- echo "alias $DEVICE qeth" >> /tmp/modules.conf -+ echo "alias $DEVICE qeth" >> /tmp/modprobe.conf - else - echo $"Unknown network device, aborting installation" - exit 1 -@@ -275,8 +322,8 @@ - ifconfig -a - route -n - --echo $"Starting portmap." --portmap -+#echo $"Starting portmap." -+#portmap - - # convert to space-separated lists - if [ -n "$SEARCHDNS" ]; then -@@ -311,8 +358,7 @@ - S390ARCH="$S390ARCH" - TEXTDOMAIN="$TEXTDOMAIN" - TEXTDOMAINDIR="$TEXTDOMAINDIR" --CHANDEV="$CHANDEV" --QETHPARM="$QETHPARM" -+PORTNAME="$PORTNAME" - HOSTNAME="$HOSTNAME" - DEVICE="$DEVICE" - NETTYPE="$NETTYPE" -@@ -324,17 +370,13 @@ - BROADCAST="$BROADCAST" - DNS="$DNS" - SEARCHDNS="$SEARCHDNS" --LCS="$LCS" --QETH="$QETH" --HSI="$HSI" --TR="$TR" - IUCV="$IUCV" -+SUBCHANNELS="$SUBCHANNELS" - ONBOOT="yes" --export LANG CHANDEV QETHPARM S390ARCH TEXTDOMAIN TEXTDOMAINDIR HSI -+export LANG PORTNAME S390ARCH TEXTDOMAIN TEXTDOMAINDIR - export HOSTNAME DEVICE NETTYPE IPADDR GATEWAY MTU - export NETWORK NETMASK BROADCAST DNS SEARCHDNS --export LCS QETH IUCV ONBOOT --export TR -+export IUCV ONBOOT SUBCHANNELS - EOF - # immediately read it in again to export these into the shell below - . /tmp/install.cfg -@@ -348,8 +390,9 @@ - GATEWAY=$GATEWAY - BROADCAST=$BROADCAST - HOSTNAME=$HOSTNAME --DOMAIN= - MTU=$MTU -+SUBCHANNELS=$SUBCHANNELS -+QETH=$QETH - EOF - - # so that the vars get propagated into the sshd shells -@@ -369,6 +412,10 @@ - export LD_LIBRARY_PATH PATH HOME PYTHONPATH - EOF - -+if [ -n "$DISPLAY" ]; then -+ echo "export DISPLAY=$DISPLAY" >> /etc/profile -+fi -+ - - if [ "$NETTYPE" = "ctc" -o "$NETTYPE" = "escon" -o "$NETTYPE" = "iucv" ]; then - echo "REMIP=$GATEWAY" >> /tmp/netinfo -diff -urN ./loader2.orig/loader.c ./loader2/loader.c ---- ./loader2.orig/loader.c 2003-09-27 00:38:41.000000000 +0300 -+++ ./loader2/loader.c 2005-01-11 10:54:19.430840728 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -215,7 +216,7 @@ - void initializeConsole(moduleList modLoaded, moduleDeps modDeps, - moduleInfoSet modInfo, int flags) { - if (!FL_NOFB(flags)) -- mlLoadModuleSet("vga16fb", modLoaded, modDeps, modInfo, flags); -+ mlLoadModuleSet("vgastate:vga16fb", modLoaded, modDeps, modInfo, flags); - /* enable UTF-8 console */ - printf("\033%%G"); - fflush(stdout); -@@ -1102,7 +1103,7 @@ - if (!strcmp(argv[0] + strlen(argv[0]) - 8, "modprobe")) - return ourInsmodCommand(argc, argv); - if (!strcmp(argv[0] + strlen(argv[0]) - 5, "rmmod")) -- return combined_insmod_main(argc, argv); -+ return ourInsmodCommand(argc, argv); - - if (!testing && !access("/var/run/loader.run", R_OK)) { - printf(_("loader has already been run. Starting shell.")); -@@ -1297,7 +1298,7 @@ - /* look for cards which require the agpgart module */ - agpgartInitialize(modLoaded, modDeps, modInfo, flags); - -- mlLoadModuleSetLocation("md:raid0:raid1:raid5:msdos:ext3:reiserfs:jfs:xfs:lvm-mod", -+ mlLoadModuleSetLocation("md:raid0:raid1:raid5:fat:msdos:jbd:ext3:reiserfs:jfs:xfs:lvm-mod", /* dm-mod? */ - modLoaded, modDeps, modInfo, flags, - secondStageModuleLocation); - -diff -urN ./loader2.orig/Makefile ./loader2/Makefile ---- ./loader2.orig/Makefile 2004-12-20 11:01:25.000000000 +0200 -+++ ./loader2/Makefile 2005-01-11 10:48:17.982659175 +0200 -@@ -119,8 +119,7 @@ - - loader: loader.o $(OBJS) $(NETOBJS) - $(CC) -g $(STATIC) -o $@ $^ -lpopt \ -- $(HWLIBS) $(ISYSLIB) \ -- $(MODULELINKAGE) $(GUNZIP) \ -+ $(HWLIBS) $(ISYSLIB) $(GUNZIP) \ - -lpump -lresolv $(NEWTLIB) $(SLANGLIB) $(BTERMLIB) $(WLITELIB) - - clean: -diff -urN ./loader2.orig/md5.h ./loader2/md5.h ---- ./loader2.orig/md5.h 2003-08-02 00:03:14.000000000 +0300 -+++ ./loader2/md5.h 2005-01-11 10:53:49.013984743 +0200 -@@ -3,7 +3,11 @@ - - #include - -+#ifdef __dietlibc__ -+typedef uint32_t uint32; -+#else - typedef u_int32_t uint32; -+#endif - - struct MD5Context { - uint32 buf[4]; -diff -urN ./loader2.orig/modstubs.c ./loader2/modstubs.c ---- ./loader2.orig/modstubs.c 2003-06-04 02:49:47.000000000 +0300 -+++ ./loader2/modstubs.c 2005-01-11 10:48:17.983658907 +0200 -@@ -20,30 +20,72 @@ - #include - #include - #include -+#include - #include - #include - #include -+#include - -+#include "log.h" - #include "modstubs.h" - #include "modules.h" - - #include "../isys/cpio.h" - #include "../isys/stubs.h" - -+extern long init_module(void *, unsigned long, const char *); -+extern long delete_module(const char *, unsigned int); -+ - static int usage() { -- fprintf(stderr, "usage: insmod [-p ] .o\n"); -+ fprintf(stderr, "usage: insmod [-p ] .ko\n"); -+ return 1; -+} -+ -+static int rmmod_usage() { -+ fprintf(stderr, "usage: rmmod \n"); - return 1; - } - -+static char * extractModule(char * file, char * ballPath, int version, -+ int *rmObj) { -+ gzFile fd; -+ /* Make finaleName and fullName REALLY static, otherwise they get dropped -+ from the stack after the function returns and the addresses are no -+ longer valid. */ -+ static char finalName[100], fullName[100]; -+ char * chptr = NULL; -+ -+ if (access(file, R_OK)) { -+ /* it might be having a ball */ -+ fd = gunzip_open(ballPath); -+ if (!fd) -+ return NULL; -+ -+ chptr = strrchr(file, '/'); -+ if (chptr) file = chptr + 1; -+ sprintf(finalName, "/tmp/%s", file); -+ -+ /* XXX: leak */ -+ sprintf(fullName, "%s/%s", getModuleLocation(version), file); -+ -+ if (installCpioFile(fd, fullName, finalName, 0)) -+ return NULL; -+ -+ *rmObj = 1; -+ file = finalName; -+ } -+ -+ return file; -+} -+ - int ourInsmodCommand(int argc, char ** argv) { - char * file; -- char finalName[100]; -- char * chptr; -- gzFile fd; - int rc, rmObj = 0; - char * ballPath = NULL; -- char fullName[100]; - int version = 1; -+ int fd; -+ void * modbuf = NULL; -+ struct stat sb; - - if (argc < 2) { - return usage(); -@@ -68,53 +110,64 @@ - ballPath = strdup("/modules/modules.cgz"); - } - -- file = argv[1]; -+ file = extractModule(argv[1], ballPath, version, &rmObj); -+ free(ballPath); - -- if (access(file, R_OK)) { -- /* it might be having a ball */ -- fd = gunzip_open(ballPath); -- if (!fd) { -- free(ballPath); -- return 1; -- } -- -- chptr = strrchr(file, '/'); -- if (chptr) file = chptr + 1; -- sprintf(finalName, "/tmp/%s", file); -- -- /* XXX: leak */ -- sprintf(fullName, "%s/%s", getModuleLocation(version), file); -- -- if (installCpioFile(fd, fullName, finalName, 0)) { -- free(ballPath); -- return 1; -- } -- -- rmObj = 1; -- file = finalName; -+ if (stat(file, &sb) == -1) { -+ logMessage("unable to stat file %s: %s", file, strerror(errno)); -+ return 1; - } - -- free(ballPath); -- -- argv[0] = "insmod"; -- argv[1] = file; -+ fd = open(file, O_RDONLY); -+ if (fd < 0) { -+ logMessage("unable to open file %s: %s", file, strerror(errno)); -+ return 1; -+ } - -- rc = combined_insmod_main(argc, argv); -- -- if (rmObj) unlink(file); -+ modbuf = mmap(0, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); -+ if (modbuf == NULL) { -+ logMessage("error reading file %s: %s", file, strerror(errno)); -+ return 1; -+ } - -+ if (argc > 2) { -+ /* FIXME: only allows one param */ -+ rc = init_module(modbuf, sb.st_size, argv[2]); -+ } else { -+ rc = init_module(modbuf, sb.st_size, ""); -+ } -+ if (rc != 0) -+ logMessage("failed to insert module (%d)", errno); - return rc; - } - -+int ourRmmodCommand(int argc, char ** argv) { -+ if (argc < 2) { -+ return rmmod_usage(); -+ } -+ -+ return rmmod(argv[1]); -+} -+ -+static char * modNameMunge(char * mod) { -+ unsigned int i; -+ -+ for (i = 0; mod[i]; i++) { -+ if (mod[i] == '-') -+ mod[i] = '_'; -+ } -+ return mod; -+} -+ - int rmmod(char * modName) { - pid_t child; - int status; -- char * argv[] = { "/bin/rmmod", modName, NULL }; -- int argc = 2; - int rc = 0; - -+ modName = modNameMunge(modName); - if ((child = fork()) == 0) { -- exit(combined_insmod_main(argc, argv)); -+ rc = delete_module(modName, O_NONBLOCK|O_EXCL); -+ exit(rc); - } - - waitpid(child, &status, 0); -@@ -158,8 +211,7 @@ - argc += count; - - if ((child = fork()) == 0) { -- execv("/bin/loader", argv); -- exit(1); -+ exit(ourInsmodCommand(argc, argv)); - } - - waitpid(child, &status, 0); -diff -urN ./loader2.orig/modstubs.h ./loader2/modstubs.h ---- ./loader2.orig/modstubs.h 2002-12-03 20:02:11.000000000 +0200 -+++ ./loader2/modstubs.h 2005-01-11 10:48:17.984658639 +0200 -@@ -2,10 +2,8 @@ - #define H_MODSTUBS - - int ourInsmodCommand(int argc, char ** argv); -+int ourRmmodCommand(int argc, char ** argv); - int rmmod(char * modName); - int insmod(char * modName, char * path, char ** args); - --/* hack */ --int combined_insmod_main(int argc, char ** argv); -- - #endif -diff -urN ./loader2.orig/moduledeps.c ./loader2/moduledeps.c ---- ./loader2.orig/moduledeps.c 2002-12-03 01:51:11.000000000 +0200 -+++ ./loader2/moduledeps.c 2005-01-11 10:48:17.985658371 +0200 -@@ -73,6 +73,27 @@ - moduleDepList = realloc(moduleDepList, sizeof(*moduleDepList) * numItems); - for (nextDep = moduleDepList; nextDep->name; nextDep++) ; - -+ /* We have to remove `\' first. */ -+ start = buf; -+ start = strchr(start, '\\'); -+ while (start) { -+ /* Replace `\\' with a space. */ -+ *start++ = ' '; -+ /* Replace the following `\n' and `\r' with a space. */ -+ if (*start == '\n') { -+ *start++ = ' '; -+ if (*start == '\r') -+ *start++ = ' '; -+ } -+ else if (*start == '\r') { -+ *start++ = ' '; -+ if (*start == '\n') -+ *start++ = ' '; -+ } -+ start = strchr(start, '\\'); -+ -+ } -+ - start = buf; - while (start < (buf + sb.st_size) && *start) { - end = strchr(start, '\n'); -@@ -133,7 +154,7 @@ - } - - /* fun test cases... */ --#if 0 -+#ifdef TESTING - - void printDeps(moduleDeps modDeps) { - moduleDeps dep; -@@ -169,5 +190,6 @@ - mlLoadDeps(&deps, "modules.dep.2"); - printDeps(deps); - -+ return 0; - } - #endif -diff -urN ./loader2.orig/modules.c ./loader2/modules.c ---- ./loader2.orig/modules.c 2003-08-01 23:43:05.000000000 +0300 -+++ ./loader2/modules.c 2005-01-11 10:48:17.986658103 +0200 -@@ -76,7 +76,7 @@ - char buf[16384]; - int count = 0; - -- f = fopen("/tmp/modules.conf", "r"); -+ f = fopen("/tmp/modprobe.conf", "r"); - if (!f) - return 0; - while (fgets(buf, sizeof(buf) - 1, f)) { -@@ -276,7 +276,7 @@ - } - } - -- sprintf(fileName, "%s.o", modName); -+ sprintf(fileName, "%s.ko", modName); - for (argPtr = args; argPtr && *argPtr; argPtr++) { - strcat(fileName, " "); - strcat(fileName, *argPtr); -@@ -521,12 +521,12 @@ - if (!FL_TESTING(flags)) { - int fd; - -- fd = open("/tmp/modules.conf", O_WRONLY | O_CREAT | O_APPEND, 0666); -+ fd = open("/tmp/modprobe.conf", O_WRONLY | O_CREAT | O_APPEND, 0666); - if (fd == -1) { -- logMessage("error appending to /tmp/modules.conf: %s\n", -+ logMessage("error appending to /tmp/modprobe.conf: %s\n", - strerror(errno)); - } else { -- writeModulesConf(modLoaded, fd); -+ writeModulesConf(modLoaded, fd); - close(fd); - } - } -@@ -584,11 +584,10 @@ - for (i = 0, lm = list->mods; i < list->numModules; i++, lm++) { - if (!lm->weLoaded) continue; - if (lm->written) continue; -- lm->written = 1; - - /* JKFIXME: this is a hack for the fact that these are now - * DRIVER_SCSI so we can get /tmp/scsidisks, but we don't -- * want them in modules.conf :/ */ -+ * want them in modprobe.conf :/ */ - if (!strcmp(lm->name, "usb-storage") || - !strcmp(lm->name, "sbp2")) { - continue; -@@ -599,7 +598,7 @@ - switch (lm->major) { - case DRIVER_SCSI: - /* originally set to # of scsi_hostadapter already in -- * /tmp/modules.conf. then we increment ourselves */ -+ * /tmp/modprobe.conf. then we increment ourselves */ - if (scsiNum) - sprintf(buf2, "scsi_hostadapter%d ", scsiNum); - else -@@ -610,6 +609,7 @@ - strcat(buf, lm->name); - strcat(buf, "\n"); - write(fd, buf, strlen(buf)); -+ lm->written = 1; - - break; - -@@ -626,6 +626,8 @@ - tmp = ""; - } - -+ if (lm->firstDevNum > lm->lastDevNum) break; -+ - for (ethNum = lm->firstDevNum; - ethNum <= lm->lastDevNum; ethNum++) { - sprintf(buf2, "%s%d ", tmp, ethNum); -@@ -639,6 +641,7 @@ - strcat(buf, lm->name); - strcat(buf, "\n"); - write(fd, buf, strlen(buf)); -+ lm->written = 1; - - break; - -@@ -657,6 +660,7 @@ - } - strcat(buf, "\n"); - write(fd, buf, strlen(buf)); -+ lm->written = 1; - } - } - -@@ -729,7 +733,7 @@ - } - - if (version == 1) { -- ret = malloc(strlen(u.release) + strlen(arch) + 1); -+ ret = malloc(strlen(u.release) + strlen(arch) + 2); - sprintf(ret, "%s/%s", u.release, arch); - return ret; - } else { -@@ -784,9 +788,9 @@ - if (!oldPaths[i].path) { - map[numMaps].archivePath = alloca(strlen(modpath) + - strlen(*m) + 25); -- sprintf(map[numMaps].archivePath, "%s/%s.o", modpath, *m); -+ sprintf(map[numMaps].archivePath, "%s/%s.ko", modpath, *m); - map[numMaps].fsPath = alloca(10 + strlen(*m)); -- sprintf(map[numMaps].fsPath, "/tmp/%s.o", *m); -+ sprintf(map[numMaps].fsPath, "/tmp/%s.ko", *m); - unlink(map[numMaps].fsPath); - map[numMaps].mapFlags = CPIO_MAP_PATH; - numMaps++; -@@ -807,7 +811,7 @@ - - for (m = modNames, i = 0, numMaps = 0; *m; m++, i++) { - if (!oldPaths[i].path) { -- sprintf(fn, "/tmp/%s.o", modNames[i]); -+ sprintf(fn, "/tmp/%s.ko", modNames[i]); - if (!stat(fn, &sb)) { - oldPaths[i].path = strdup(fn); - /* JKFIXME: this is copied from the old stuff -- do we really need it? */ -diff -urN ./loader2.orig/modules.h ./loader2/modules.h ---- ./loader2.orig/modules.h 2003-06-04 01:54:01.000000000 +0300 -+++ ./loader2/modules.h 2005-01-11 10:48:17.988657567 +0200 -@@ -23,7 +23,7 @@ - }; - - struct moduleList_s { -- struct loadedModuleInfo mods[50]; -+ struct loadedModuleInfo mods[100]; - int numModules; - }; - From svn at tinysofa.org Wed Jan 26 20:28:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 15:28:32 -0500 (EST) Subject: [tinysofa-svn] r5761 - in tinysofa/releases/1.2/postgresql/current: sources specs Message-ID: <20050126202832.12E5134414E@minbar.tinysofa.org> Author: jh Date: 2005-01-26 15:26:10 -0500 (Wed, 26 Jan 2005) New Revision: 5761 Added: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.6.tar.bz2 tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch Removed: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.3.tar.bz2 tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.5-tempfile.patch tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.5.tar.bz2 tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.5.patch Modified: tinysofa/releases/1.2/postgresql/current/specs/postgresql.spec Log: - 7.4.6 Deleted: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.3.tar.bz2 =================================================================== (Binary files differ) Deleted: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.5-tempfile.patch =================================================================== --- tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.5-tempfile.patch 2005-01-26 19:10:52 UTC (rev 5760) +++ tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.5-tempfile.patch 2005-01-26 20:26:10 UTC (rev 5761) @@ -1,48 +0,0 @@ -diff -ur postgresql-7.4.5.orig/contrib/findoidjoins/make_oidjoins_check postgresql-7.4.5/contrib/findoidjoins/make_oidjoins_check ---- postgresql-7.4.5.orig/contrib/findoidjoins/make_oidjoins_check 2002-09-05 21:57:32.000000000 +0200 -+++ postgresql-7.4.5/contrib/findoidjoins/make_oidjoins_check 2004-09-20 11:51:39.000000000 +0200 -@@ -10,27 +10,35 @@ - # Caution: you may need to use GNU awk. - AWK=${AWK:-awk} - --trap "rm -f /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15 -+TMP= -+TMPA= -+TMPB= -+trap 'rm -f -- "$TMP" "$TMPA" "$TMPB"' EXIT -+trap 'trap - EXIT; rm -f -- "$TMP" "$TMPA" "$TMPB"; exit 1' HUP INT QUIT TERM -+ -+TMP=`mktemp -t oidjoins.XXXXXX` || exit 1 -+TMPA=`mktemp -t oidjoins.a.XXXXXX` || exit 1 -+TMPB=`mktemp -t oidjoins.b.XXXXXX` || exit 1 - - # Read input --cat "$@" >/tmp/$$ -+cat "$@" > $TMP - - # Look for fields with multiple references. --cat /tmp/$$ | cut -d' ' -f2 | sort | uniq -d >/tmp/$$a --if [ -s /tmp/$$a ] ; then -+cat $TMP | cut -d' ' -f2 | sort | uniq -d > $TMPA -+if [ -s $TMPA ] ; then - echo "Ignoring these fields that link to multiple tables:" 1>&2 -- cat /tmp/$$a 1>&2 -+ cat $TMPA 1>&2 - fi - - # Get the non-multiply-referenced fields. --cat /tmp/$$ | while read LINE -+cat $TMP | while read LINE - do - set -- $LINE -- grep "^$2\$" /tmp/$$a >/dev/null 2>&1 || echo $LINE --done >/tmp/$$b -+ grep "^$2\$" $TMPA >/dev/null 2>&1 || echo $LINE -+done > $TMPB - - # Generate the output. --cat /tmp/$$b | -+cat $TMPB | - $AWK -F'[ \.]' '\ - BEGIN \ - { Deleted: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.5.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.6.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.6.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.5.patch =================================================================== --- tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.5.patch 2005-01-26 19:10:52 UTC (rev 5760) +++ tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.5.patch 2005-01-26 20:26:10 UTC (rev 5761) @@ -1,128 +0,0 @@ -diff -Naur postgresql-7.4.1.orig/config/python.m4 postgresql-7.4.1/config/python.m4 ---- postgresql-7.4.1.orig/config/python.m4 2003-09-02 02:01:48.000000000 +0300 -+++ postgresql-7.4.1/config/python.m4 2003-11-18 21:29:47.000000000 +0200 -@@ -25,7 +25,11 @@ - python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"` - python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` - python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` --python_configdir="${python_execprefix}/lib/python${python_version}/config" -+python_path=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]]"` -+python_libpath=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]][[5:]]"` -+python_configdir="${python_path}/config" -+python_moduledir="${python_path}/site-packages" -+python_moduleexecdir="${python_execprefix}/${python_libpath}/site-packages" - python_includespec="-I${python_prefix}/include/python${python_version}" - if test "$python_prefix" != "$python_execprefix"; then - python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec" -@@ -37,9 +41,9 @@ - AC_SUBST(python_includespec)[]dnl - # This should be enough of a message. - if test "$python_prefix" != "$python_execprefix"; then -- AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}]) -+ AC_MSG_RESULT([$python_prefix/${python_libpath} and $python_execprefix/${python_libpath}]) - else -- AC_MSG_RESULT([$python_prefix/lib/python${python_version}]) -+ AC_MSG_RESULT([$python_prefix/${python_libpath}]) - fi - ])# _PGAC_CHECK_PYTHON_DIRS - -diff -Naur postgresql-7.4.1.orig/configure.in postgresql-7.4.1/configure.in ---- postgresql-7.4.1.orig/configure.in 2003-11-16 23:33:50.000000000 +0200 -+++ postgresql-7.4.1/configure.in 2003-11-18 21:31:09.000000000 +0200 -@@ -19,12 +19,11 @@ - dnl - dnl The GNU folks apparently haven't heard that some people don't use - dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". --m4_define([info], [doc]) --m4_define([infodir], [docdir]) -+dnl -+dnl Now use both docdir and infodir to work properly with RPM macros -+dnl (courtesy, Elliott Lee ) -+dnl - Andrew Overholt 10 December 2002 - AC_INIT([PostgreSQL], [7.4.5], [pgsql-bugs at postgresql.org]) --m4_undefine([infodir]) --m4_undefine([info]) --AC_SUBST(docdir) - - AC_PREREQ(2.53) - AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group]) -@@ -40,6 +39,10 @@ - template= - AC_MSG_CHECKING([which template to use]) - -+AC_ARG_WITH(docdir, [location for non-info documentation], , with_docdir=${datadir}/doc) -+docdir="$with_docdir" -+AC_SUBST(docdir) -+ - PGAC_ARG_REQ(with, template, [], - [ - case $withval in -@@ -442,8 +445,8 @@ - if test -d "$krb4_prefix/include"; then - INCLUDES="$INCLUDES -I$krb4_prefix/include" - fi -- if test -d "$krb4_prefix/lib"; then -- LIBDIRS="$LIBDIRS -L$krb4_prefix/lib" -+ if test -d "$krb4_prefix/$LIBNAME"; then -+ LIBDIRS="$LIBDIRS -L$krb4_prefix/$LIBNAME" - fi - - krb_srvtab="/etc/srvtab" -@@ -452,7 +455,7 @@ - - AC_SUBST(with_krb4) - -- -+test -z "$LIBNAME" && LIBNAME=lib - # - # Kerberos 5 - # -@@ -467,8 +470,8 @@ - if test -d "$krb5_prefix/include"; then - INCLUDES="$INCLUDES -I$krb5_prefix/include" - fi -- if test -d "$krb5_prefix/lib"; then -- LIBDIRS="$LIBDIRS -L$krb5_prefix/lib" -+ if test -d "$krb5_prefix/$LIBNAME"; then -+ LIBDIRS="$LIBDIRS -L$krb5_prefix/$LIBNAME" - fi - - krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab" -@@ -485,7 +488,7 @@ - - AC_SUBST(krb_srvtab) - -- -+test -z "$LIBNAME" && LIBNAME=lib - # - # Kerberos configuration parameters - # -@@ -496,7 +499,7 @@ - AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"], - [Define to the name of the PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME)]) - -- -+test -z "$LIBNAME" && LIBNAME=lib - # - # PAM - # -@@ -533,8 +536,8 @@ - if test -d "${openssl_prefix}/include" ; then - INCLUDES="$INCLUDES -I${openssl_prefix}/include" - fi -- if test -d "${openssl_prefix}/lib" ; then -- LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib" -+ if test -d "${openssl_prefix}/$LIBNAME" ; then -+ LIBDIRS="$LIBDIRS -L${openssl_prefix}/$LIBNAME" - fi - ]) - -@@ -597,7 +600,7 @@ - case $host_os in sysv5*) - AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R], - [ -- pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib" -+ pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/$LIBNAME" - AC_TRY_LINK([], [], [pgac_cv_prog_ld_R=yes], [pgac_cv_prog_ld_R=no]) - LDFLAGS=$pgac_save_LDFLAGS - ]) Added: tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch =================================================================== --- tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch 2005-01-26 19:10:52 UTC (rev 5760) +++ tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch 2005-01-26 20:26:10 UTC (rev 5761) @@ -0,0 +1,128 @@ +diff -Naur postgresql-7.4.1.orig/config/python.m4 postgresql-7.4.1/config/python.m4 +--- postgresql-7.4.1.orig/config/python.m4 2003-09-02 02:01:48.000000000 +0300 ++++ postgresql-7.4.1/config/python.m4 2003-11-18 21:29:47.000000000 +0200 +@@ -25,7 +25,11 @@ + python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"` + python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` + python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` +-python_configdir="${python_execprefix}/lib/python${python_version}/config" ++python_path=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]]"` ++python_libpath=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]][[5:]]"` ++python_configdir="${python_path}/config" ++python_moduledir="${python_path}/site-packages" ++python_moduleexecdir="${python_execprefix}/${python_libpath}/site-packages" + python_includespec="-I${python_prefix}/include/python${python_version}" + if test "$python_prefix" != "$python_execprefix"; then + python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec" +@@ -37,9 +41,9 @@ + AC_SUBST(python_includespec)[]dnl + # This should be enough of a message. + if test "$python_prefix" != "$python_execprefix"; then +- AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}]) ++ AC_MSG_RESULT([$python_prefix/${python_libpath} and $python_execprefix/${python_libpath}]) + else +- AC_MSG_RESULT([$python_prefix/lib/python${python_version}]) ++ AC_MSG_RESULT([$python_prefix/${python_libpath}]) + fi + ])# _PGAC_CHECK_PYTHON_DIRS + +diff -Naur postgresql-7.4.1.orig/configure.in postgresql-7.4.1/configure.in +--- postgresql-7.4.1.orig/configure.in 2003-11-16 23:33:50.000000000 +0200 ++++ postgresql-7.4.1/configure.in 2003-11-18 21:31:09.000000000 +0200 +@@ -19,12 +19,11 @@ + dnl + dnl The GNU folks apparently haven't heard that some people don't use + dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". +-m4_define([info], [doc]) +-m4_define([infodir], [docdir]) ++dnl ++dnl Now use both docdir and infodir to work properly with RPM macros ++dnl (courtesy, Elliott Lee ) ++dnl - Andrew Overholt 10 December 2002 + AC_INIT([PostgreSQL], [7.4.6], [pgsql-bugs at postgresql.org]) +-m4_undefine([infodir]) +-m4_undefine([info]) +-AC_SUBST(docdir) + + AC_PREREQ(2.53) + AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group]) +@@ -40,6 +39,10 @@ + template= + AC_MSG_CHECKING([which template to use]) + ++AC_ARG_WITH(docdir, [location for non-info documentation], , with_docdir=${datadir}/doc) ++docdir="$with_docdir" ++AC_SUBST(docdir) ++ + PGAC_ARG_REQ(with, template, [], + [ + case $withval in +@@ -442,8 +445,8 @@ + if test -d "$krb4_prefix/include"; then + INCLUDES="$INCLUDES -I$krb4_prefix/include" + fi +- if test -d "$krb4_prefix/lib"; then +- LIBDIRS="$LIBDIRS -L$krb4_prefix/lib" ++ if test -d "$krb4_prefix/$LIBNAME"; then ++ LIBDIRS="$LIBDIRS -L$krb4_prefix/$LIBNAME" + fi + + krb_srvtab="/etc/srvtab" +@@ -452,7 +455,7 @@ + + AC_SUBST(with_krb4) + +- ++test -z "$LIBNAME" && LIBNAME=lib + # + # Kerberos 5 + # +@@ -467,8 +470,8 @@ + if test -d "$krb5_prefix/include"; then + INCLUDES="$INCLUDES -I$krb5_prefix/include" + fi +- if test -d "$krb5_prefix/lib"; then +- LIBDIRS="$LIBDIRS -L$krb5_prefix/lib" ++ if test -d "$krb5_prefix/$LIBNAME"; then ++ LIBDIRS="$LIBDIRS -L$krb5_prefix/$LIBNAME" + fi + + krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab" +@@ -485,7 +488,7 @@ + + AC_SUBST(krb_srvtab) + +- ++test -z "$LIBNAME" && LIBNAME=lib + # + # Kerberos configuration parameters + # +@@ -496,7 +499,7 @@ + AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"], + [Define to the name of the PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME)]) + +- ++test -z "$LIBNAME" && LIBNAME=lib + # + # PAM + # +@@ -533,8 +536,8 @@ + if test -d "${openssl_prefix}/include" ; then + INCLUDES="$INCLUDES -I${openssl_prefix}/include" + fi +- if test -d "${openssl_prefix}/lib" ; then +- LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib" ++ if test -d "${openssl_prefix}/$LIBNAME" ; then ++ LIBDIRS="$LIBDIRS -L${openssl_prefix}/$LIBNAME" + fi + ]) + +@@ -597,7 +600,7 @@ + case $host_os in sysv5*) + AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R], + [ +- pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib" ++ pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/$LIBNAME" + AC_TRY_LINK([], [], [pgac_cv_prog_ld_R=yes], [pgac_cv_prog_ld_R=no]) + LDFLAGS=$pgac_save_LDFLAGS + ]) Modified: tinysofa/releases/1.2/postgresql/current/specs/postgresql.spec =================================================================== --- tinysofa/releases/1.2/postgresql/current/specs/postgresql.spec 2005-01-26 19:10:52 UTC (rev 5760) +++ tinysofa/releases/1.2/postgresql/current/specs/postgresql.spec 2005-01-26 20:26:10 UTC (rev 5761) @@ -7,8 +7,8 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql -Version: 7.4.5 -Release: 1ts +Version: 7.4.6 +Release: 1jh License: BSD Group: main Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 @@ -33,8 +33,7 @@ # Cleanup # Not in use Patch4: postgresql-7.3.2-rpm.patch -Patch5: rpm-multilib-7.4.5.patch -Patch6: postgresql-7.4.5-tempfile.patch +Patch5: rpm-multilib-7.4.6.patch Requires: glibc shadow-utils initscripts zlib >= 1.1.4 Requires: %{name}-libs = %{version}-%{release} BuildRequires: perl gcc sed readline-devel ncurses-devel zlib-devel openssl-devel pam-devel @@ -164,7 +163,6 @@ %setup -q %patch2 -p1 -b .plperl %patch5 -p1 -b .multilib -%patch6 -p1 -b .tempfile chmod -R go-w . || : chown -R $USER. . || : @@ -653,6 +651,9 @@ %changelog +* Wed Jan 26 2005 Jaakko Heinonen 7.4.6-1jh +- 7.4.6 + * Tue Jan 04 2005 tsintegrate 7.4.5-1ts - current (7.4.5-1jh) integrated as 7.4.5-1ts for release 1.1-U3 From svn at tinysofa.org Wed Jan 26 21:18:36 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 26 Jan 2005 16:18:36 -0500 (EST) Subject: [tinysofa-svn] r5762 - tinysofa/releases/1.2/nfs-utils/current/sources Message-ID: <20050126211836.9CFDF34414E@minbar.tinysofa.org> Author: jh Date: 2005-01-26 16:18:29 -0500 (Wed, 26 Jan 2005) New Revision: 5762 Modified: tinysofa/releases/1.2/nfs-utils/current/sources/nfs.init tinysofa/releases/1.2/nfs-utils/current/sources/rpcidmapd.init Log: - init script updates Modified: tinysofa/releases/1.2/nfs-utils/current/sources/nfs.init =================================================================== --- tinysofa/releases/1.2/nfs-utils/current/sources/nfs.init 2005-01-26 20:26:10 UTC (rev 5761) +++ tinysofa/releases/1.2/nfs-utils/current/sources/nfs.init 2005-01-26 21:18:29 UTC (rev 5762) @@ -21,7 +21,7 @@ . /etc/sysconfig/network # Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 +[ "${NETWORKING}" = "no" ] && exit 0 [ -x /usr/sbin/rpc.nfsd ] || exit 0 [ -x /usr/sbin/rpc.mountd ] || exit 0 @@ -35,8 +35,8 @@ # Check for and source configuration file otherwise set defaults [ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs -[ -z "$MOUNTD_NFS_V2" ] && MOUNTD_NFS_V2=auto -[ -z "$MOUNTD_NFS_V3" ] && MOUNTD_NFS_V3=auto +[ -z "$MOUNTD_NFS_V2" ] && MOUNTD_NFS_V2=default +[ -z "$MOUNTD_NFS_V3" ] && MOUNTD_NFS_V3=default # Number of servers to be started by default [ -z "$RPCNFSDCOUNT" ] && RPCNFSDCOUNT=8 @@ -60,7 +60,9 @@ if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then echo -n $"Starting NFS quotas: " - daemon rpc.rquotad + [ -n "$RQUOTAD_PORT" ] \ + && RPCRQUOTADOPTS="$RPCRQUOTADOPTS -p $RQUOTAD_PORT" + daemon rpc.rquotad $RPCRQUOTADOPTS echo fi echo -n $"Starting NFS daemon: " @@ -71,35 +73,13 @@ && RPCMOUNTDOPTS="$RPCMOUNTDOPTS -p $MOUNTD_PORT" case $MOUNTD_NFS_V2 in - auto|AUTO) - # Let's see if we support NFS version 2. - /usr/sbin/rpcinfo -u localhost nfs 2 &>/dev/null - if [ $? -ne 0 ]; then - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 2" - fi - ;; no|NO) - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 2" - ;; - yes|YES) - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --nfs-version 2" - ;; + RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 2" ;; esac case $MOUNTD_NFS_V3 in - auto|AUTO) - # Let's see if we support NFS version 3. - /usr/sbin/rpcinfo -u localhost nfs 3 &>/dev/null - if [ $? -ne 0 ]; then - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3" - fi - ;; no|NO) - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3" - ;; - yes|YES) - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --nfs-version 3" - ;; + RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3" ;; esac echo -n $"Starting NFS mountd: " @@ -120,7 +100,7 @@ echo -n $"Shutting down NFS daemon: " killproc nfsd echo - if [ -n "$RQUOTAD" ]; then + if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then echo -n $"Shutting down NFS quotas: " killproc rpc.rquotad echo @@ -140,7 +120,7 @@ status) status rpc.mountd status nfsd - if [ -n "$RQUOTAD" ]; then + if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then status rpc.rquotad fi ;; Modified: tinysofa/releases/1.2/nfs-utils/current/sources/rpcidmapd.init =================================================================== --- tinysofa/releases/1.2/nfs-utils/current/sources/rpcidmapd.init 2005-01-26 20:26:10 UTC (rev 5761) +++ tinysofa/releases/1.2/nfs-utils/current/sources/rpcidmapd.init 2005-01-26 21:18:29 UTC (rev 5762) @@ -30,7 +30,7 @@ start|condstart) # Make sure the daemon is not already running. if status $prog > /dev/null ; then - [ "$1" = "condstart" ] && killproc $prog "-SIGHUP" + [ "$1" = "condstart" ] && killproc $prog "-SIGHUP" > /dev/null exit 0 fi rm -f /var/lock/subsys/$prog From svn at tinysofa.org Thu Jan 27 19:13:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 27 Jan 2005 14:13:33 -0500 (EST) Subject: [tinysofa-svn] r5764 - in contrib/1.1/dnsmasq/current: sources specs Message-ID: <20050127191333.46D8734415E@minbar.tinysofa.org> Author: gda Date: 2005-01-27 14:13:12 -0500 (Thu, 27 Jan 2005) New Revision: 5764 Added: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.20.tar.gz Removed: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.19.tar.gz Modified: contrib/1.1/dnsmasq/current/specs/dnsmasq.spec Log: new upstream Deleted: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.19.tar.gz =================================================================== (Binary files differ) Added: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.20.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.20.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/dnsmasq/current/specs/dnsmasq.spec =================================================================== --- contrib/1.1/dnsmasq/current/specs/dnsmasq.spec 2005-01-26 21:19:58 UTC (rev 5763) +++ contrib/1.1/dnsmasq/current/specs/dnsmasq.spec 2005-01-27 19:13:12 UTC (rev 5764) @@ -1,6 +1,6 @@ Summary: A lightweight caching nameserver Name: dnsmasq -Version: 2.19 +Version: 2.20 Release: 1gd Group: contrib Source: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz @@ -62,6 +62,9 @@ %changelog +* Thu Jan 27 2005 Gerald Dachs 2.20-1gd +- new upstream version + * Tue Dec 14 2004 Gerald Dachs 2.19-1gd - new upstream version From svn at tinysofa.org Fri Jan 28 12:59:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 28 Jan 2005 07:59:47 -0500 (EST) Subject: [tinysofa-svn] r5765 - in tinysofa/releases/1.2/perl-dbi/current: sources specs Message-ID: <20050128125947.BAA2934415E@minbar.tinysofa.org> Author: jh Date: 2005-01-28 07:59:38 -0500 (Fri, 28 Jan 2005) New Revision: 5765 Added: tinysofa/releases/1.2/perl-dbi/current/sources/DBI-1.38-CAN-2005-0077.patch Modified: tinysofa/releases/1.2/perl-dbi/current/specs/perl-dbi.spec Log: - CAN-2005-0077 fix Added: tinysofa/releases/1.2/perl-dbi/current/sources/DBI-1.38-CAN-2005-0077.patch =================================================================== --- tinysofa/releases/1.2/perl-dbi/current/sources/DBI-1.38-CAN-2005-0077.patch 2005-01-27 19:13:12 UTC (rev 5764) +++ tinysofa/releases/1.2/perl-dbi/current/sources/DBI-1.38-CAN-2005-0077.patch 2005-01-28 12:59:38 UTC (rev 5765) @@ -0,0 +1,47 @@ +--- libdbi-perl-1.21.orig/lib/DBI/ProxyServer.pm ++++ libdbi-perl-1.21/lib/DBI/ProxyServer.pm +@@ -33,12 +33,6 @@ + package DBI::ProxyServer; + + +-my $haveFileSpec = eval { require File::Spec }; +-my $tmpDir = $haveFileSpec ? File::Spec->tmpdir() : +- ($ENV{'TMP'} || $ENV{'TEMP'} || '/tmp'); +-my $defaultPidFile = $haveFileSpec ? +- File::Spec->catdir($tmpDir, "dbiproxy.pid") : "/tmp/dbiproxy.pid"; +- + + ############################################################################ + # +@@ -107,7 +101,8 @@ + } else { + $o->{'mode'} = 'single'; + } +- $o->{'pidfile'} = $defaultPidFile; ++ # No pidfile by default, configuration must provide one if needed ++ $o->{'pidfile'} = 'none'; + $o->{'user'} = undef; + }; + +@@ -491,7 +486,7 @@ + =item I (B<--pidfile=file>) + + (UNIX only) If this option is present, a PID file will be created at the +-given location. ++given location. Default is do not create a pidfile. + + =item I (B<--user=uid>) + +only in patch2: +unchanged: +--- libdbi-perl-1.21.orig/dbiproxy.PL ++++ libdbi-perl-1.21/dbiproxy.PL +@@ -143,7 +143,7 @@ + =item B<--pidfile=file> + + (UNIX only) If this option is present, a PID file will be created at the +-given location. ++given location. Default is do not create a pidfile. + + =item B<--user=uid> + Modified: tinysofa/releases/1.2/perl-dbi/current/specs/perl-dbi.spec =================================================================== --- tinysofa/releases/1.2/perl-dbi/current/specs/perl-dbi.spec 2005-01-27 19:13:12 UTC (rev 5764) +++ tinysofa/releases/1.2/perl-dbi/current/specs/perl-dbi.spec 2005-01-28 12:59:38 UTC (rev 5765) @@ -6,9 +6,10 @@ Summary: The Perl Database Interface by Tim Bunce Name: perl-dbi Version: 1.38 -Release: 1ts -URL: http://www.cpan.org +Release: 2jh +URL: http://www.cpan.org/ Source: ftp://ftp.pasteur.fr/pub/computing/CPAN/modules/by-module/DBI/%{real_name}-%{version}.tar.gz +Patch: DBI-1.38-CAN-2005-0077.patch License: GPL Group: extra Requires: perl >= %{perl_epoch}:%{perl_version} @@ -26,6 +27,7 @@ %prep %setup -q -n %{real_name}-%{version} +%patch -p1 -b .CAN-2005-0077~ %build @@ -69,6 +71,9 @@ %changelog +* Fri Jan 28 2005 Jaakko Heinonen 1.38-2jh +- CAN-2005-0077 fix + * Thu Aug 05 2004 tsintegrate 1.38-1ts - current (1.38-1jh) integrated as 1.38-1ts for release 1.1 From svn at tinysofa.org Fri Jan 28 23:48:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 28 Jan 2005 18:48:38 -0500 (EST) Subject: [tinysofa-svn] r5766 - in contrib/1.1/clamav/current: sources specs Message-ID: <20050128234838.8311E344202@minbar.tinysofa.org> Author: gda Date: 2005-01-28 18:45:01 -0500 (Fri, 28 Jan 2005) New Revision: 5766 Added: contrib/1.1/clamav/current/sources/clamav-0.81.tar.gz Removed: contrib/1.1/clamav/current/sources/clamav-0.80.tar.gz Modified: contrib/1.1/clamav/current/specs/clamav.spec Log: new upstream Deleted: contrib/1.1/clamav/current/sources/clamav-0.80.tar.gz =================================================================== (Binary files differ) Added: contrib/1.1/clamav/current/sources/clamav-0.81.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.1/clamav/current/sources/clamav-0.81.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/clamav/current/specs/clamav.spec =================================================================== --- contrib/1.1/clamav/current/specs/clamav.spec 2005-01-28 12:59:38 UTC (rev 5765) +++ contrib/1.1/clamav/current/specs/clamav.spec 2005-01-28 23:45:01 UTC (rev 5766) @@ -1,7 +1,7 @@ Summary: An antivirus toolkit for Unix Name: clamav -Version: 0.80 -Release: 1ok +Version: 0.81 +Release: 1gd License: GPL Group: contrib URL: http://www.clamav.net @@ -74,13 +74,12 @@ --disable-clamav \ --with-user=%{user_name} \ --with-group=%{group_name} \ - --with-dbdir=%{_localstatedir}/lib/clamav -%{__make} + --with-dbdir=%{_localstatedir}/lib/clamav \ + --disable-zlib-vcheck +%make %install -[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot - install -d %buildroot%{_initrddir}/ install -d %buildroot%{_sysconfdir}/sysconfig/ install -d %buildroot%{_sysconfdir}/logrotate.d/ @@ -90,7 +89,7 @@ install -d %buildroot%{_localstatedir}/log/clamav/ install -d %buildroot%{_localstatedir}/run/clamav/ -%{__make} install DESTDIR=%buildroot +%makeinstall rm -f %buildroot%{_mandir}/man8/clamav-milter.8* install %{SOURCE1} %buildroot%{_initrddir}/clamd @@ -107,18 +106,16 @@ install %{SOURCE8} %buildroot%{_sysconfdir}/freshclam.conf mkdir -p %buildroot/%{_defaultdocdir}/%{name}-%{version} -mkdir -p %buildroot/%{_defaultdocdir}/%{name}-%{version}/html DOC="AUTHORS BUGS COPYING ChangeLog FAQ INSTALL NEWS README TODO docs/*.pdf" for i in $DOC ; do install -m644 $i %buildroot/%{_defaultdocdir}/%{name}-%{version}/ done -for i in "*.html" "*.css" "*.png" ; do - install -m644 docs/html/$i %buildroot/%{_defaultdocdir}/%{name}-%{version}/html -done +install database/*.cvd %buildroot/%{_localstatedir}/lib/clamav/ + %clean -[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot +%clean_buildroot %pre if [ -z "`getent group %{group_name}`" ] ; then @@ -181,6 +178,9 @@ %changelog +* Sat Jan 29 2005 Gerald Dachs 0.81-1gd +- New upstream + * Mon Sep 13 2004 tsintegrate 0.75.1-1gd - current (0.75.1-1gd) integrated as 0.75.1-1gd From svn at tinysofa.org Sat Jan 29 10:14:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 29 Jan 2005 05:14:45 -0500 (EST) Subject: [tinysofa-svn] r5767 - in contrib/1.1/xorg-x11/current: sources specs Message-ID: <20050129101445.33FF334419A@minbar.tinysofa.org> Author: gda Date: 2005-01-29 05:14:33 -0500 (Sat, 29 Jan 2005) New Revision: 5767 Added: contrib/1.1/xorg-x11/current/sources/xorg-x11-6.8.1-nolisten-tcp.patch Modified: contrib/1.1/xorg-x11/current/specs/xorg-x11.spec Log: applied -nolisten tcp Added: contrib/1.1/xorg-x11/current/sources/xorg-x11-6.8.1-nolisten-tcp.patch =================================================================== --- contrib/1.1/xorg-x11/current/sources/xorg-x11-6.8.1-nolisten-tcp.patch 2005-01-28 23:45:01 UTC (rev 5766) +++ contrib/1.1/xorg-x11/current/sources/xorg-x11-6.8.1-nolisten-tcp.patch 2005-01-29 10:14:33 UTC (rev 5767) @@ -0,0 +1,8 @@ +--- xorg-x11-6.8.1/xc/programs/xdm/config/Xserv.ws.cpp.orig 2005-01-29 11:04:05.790449448 +0100 ++++ xorg-x11-6.8.1/xc/programs/xdm/config/Xserv.ws.cpp 2005-01-29 11:04:50.999576616 +0100 +@@ -10,4 +10,4 @@ + XCOMM look like: + XCOMM XTerminalName:0 foreign + XCOMM +-:0 local BINDIR/X DEFAULTVT ++:0 local BINDIR/X -nolisten tcp DEFAULTVT Modified: contrib/1.1/xorg-x11/current/specs/xorg-x11.spec =================================================================== --- contrib/1.1/xorg-x11/current/specs/xorg-x11.spec 2005-01-28 23:45:01 UTC (rev 5766) +++ contrib/1.1/xorg-x11/current/specs/xorg-x11.spec 2005-01-29 10:14:33 UTC (rev 5767) @@ -22,7 +22,7 @@ Name: xorg-x11 Version: 6.8.1 -Release: 2gd +Release: 3gd #Release: 0.%{cvs_release}.0 %define build_maintainer_mode %( hostname -f |grep -q capslock.lan && echo 1 || echo 0) @@ -481,6 +481,7 @@ # tinysofa patches Patch30000: XFree86-6.8.1-tinysofa-vt.patch +Patch30001: xorg-x11-6.8.1-nolisten-tcp.patch # EXPERIMENTAL patches (disabled except for development) @@ -1077,7 +1078,8 @@ ) # tinysofa patches -%patch30000 -p1 -b .tinysofa-vt +%patch30000 -p1 -b .tinysofa-vt~ +%patch30001 -p1 -b .nolisten-tcp~ ###################################################################### @@ -3386,6 +3388,9 @@ %clean_buildroot %changelog +* Sat Jan 29 2005 Gerald Dachs 6.8.1-3gd +- applied nolisten-tcp patch + * Mon Dec 20 2004 Gerald Dachs 6.8.1-2gd - applied security patches From svn at tinysofa.org Sat Jan 29 11:26:16 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 29 Jan 2005 06:26:16 -0500 (EST) Subject: [tinysofa-svn] r5768 - in contrib/1.1/clearsilver/current: sources specs Message-ID: <20050129112616.C10CA344164@minbar.tinysofa.org> Author: gda Date: 2005-01-29 06:25:42 -0500 (Sat, 29 Jan 2005) New Revision: 5768 Added: contrib/1.1/clearsilver/current/sources/clearsilver-0.9.13.tar.gz Removed: contrib/1.1/clearsilver/current/sources/clearsilver-0.9.12.tar.gz Modified: contrib/1.1/clearsilver/current/specs/clearsilver.spec Log: new upstream Deleted: contrib/1.1/clearsilver/current/sources/clearsilver-0.9.12.tar.gz =================================================================== (Binary files differ) Added: contrib/1.1/clearsilver/current/sources/clearsilver-0.9.13.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.1/clearsilver/current/sources/clearsilver-0.9.13.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/clearsilver/current/specs/clearsilver.spec =================================================================== --- contrib/1.1/clearsilver/current/specs/clearsilver.spec 2005-01-29 10:14:33 UTC (rev 5767) +++ contrib/1.1/clearsilver/current/specs/clearsilver.spec 2005-01-29 11:25:42 UTC (rev 5768) @@ -1,6 +1,6 @@ Summary: Neotonic ClearSilver Name: clearsilver -Version: 0.9.12 +Version: 0.9.13 Release: 1gd Copyright: Open Source - Neotonic ClearSilver License (Apache 1.1 based) Group: contrib @@ -87,6 +87,9 @@ %{perl_vendorarch}/auto/ClearSilver/ClearSilver.bs %Changelog +* Sat Jan 29 2005 Gerald Dachs 0.9.13-1gd +- new upstream version + * Sun Oct 10 2004 Gerald Dachs 0.9.12-1gd - new upstream version From svn at tinysofa.org Sat Jan 29 12:15:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 29 Jan 2005 07:15:06 -0500 (EST) Subject: [tinysofa-svn] r5769 - in tinysofa/releases/1.2/iptables/current: sources specs Message-ID: <20050129121506.481E8344162@minbar.tinysofa.org> Author: jh Date: 2005-01-29 07:14:56 -0500 (Sat, 29 Jan 2005) New Revision: 5769 Modified: tinysofa/releases/1.2/iptables/current/sources/iptables.init tinysofa/releases/1.2/iptables/current/sources/iptables6.init tinysofa/releases/1.2/iptables/current/specs/iptables.spec Log: - test that iptables rules are valid before (re)loading them Modified: tinysofa/releases/1.2/iptables/current/sources/iptables.init =================================================================== --- tinysofa/releases/1.2/iptables/current/sources/iptables.init 2005-01-29 11:25:42 UTC (rev 5768) +++ tinysofa/releases/1.2/iptables/current/sources/iptables.init 2005-01-29 12:14:56 UTC (rev 5769) @@ -25,6 +25,8 @@ exit 1 fi +umask 077 + SYSCONFFILE=/etc/sysconfig/iptables MODCONFFILE=/etc/sysconfig/iptables-modules-ipv4 BINFILE=/sbin/iptables @@ -94,15 +96,33 @@ { # Load new rules NOTE="Loading new rules" - echo -n $NOTE - iptables-restore < $SYSCONFFILE + echo -n "$NOTE" + iptables-restore "$SYSCONFFILE" [ "$?" = "0" ] && success "$NOTE" || failure "$NOTE" - echo "" + echo } +test_config() +{ + NOTE="Testing $SYSCONFFILE" + echo -n "$NOTE" + output=`iptables-restore --test "$SYSCONFFILE" 2>&1` + if [ $? = 0 ]; then + success "$NOTE" + ret=0 + else + failure "$NOTE" + ret=1 + fi + + echo + test -n "$output" && echo "$output" + return $ret +} + case "$1" in start) - # Load modules + test_config || exit $? echo -n "Loading iptables modules: " /sbin/modprobe ip_tables 2>/dev/null >/dev/null echo -n "." @@ -131,15 +151,16 @@ ;; restart|reload) + test_config || exit $? flush DROP load_rules ;; save) NOTE="Saving rules to file" - echo -n $NOTE - iptables-save > $SYSCONFFILE - [ "$?" = "0" ] && success $NOTE || failure $NOTE + echo -n "$NOTE" + iptables-save > "$SYSCONFFILE" + [ "$?" = "0" ] && success "$NOTE" || failure "$NOTE" echo "" ;; Modified: tinysofa/releases/1.2/iptables/current/sources/iptables6.init =================================================================== --- tinysofa/releases/1.2/iptables/current/sources/iptables6.init 2005-01-29 11:25:42 UTC (rev 5768) +++ tinysofa/releases/1.2/iptables/current/sources/iptables6.init 2005-01-29 12:14:56 UTC (rev 5769) @@ -25,6 +25,8 @@ exit 1 fi +umask 077 + SYSCONFFILE=/etc/sysconfig/iptables6 MODCONFFILE=/etc/sysconfig/iptables-modules-ipv6 BINFILE=/sbin/ip6tables @@ -94,15 +96,33 @@ { # Load new rules NOTE="Loading new rules" - echo -n $NOTE - ip6tables-restore < $SYSCONFFILE + echo -n "$NOTE" + ip6tables-restore "$SYSCONFFILE" [ "$?" = "0" ] && success "$NOTE" || failure "$NOTE" - echo "" + echo } +test_config() +{ + NOTE="Testing $SYSCONFFILE" + echo -n "$NOTE" + output=`iptables-restore --test "$SYSCONFFILE" 2>&1` + if [ $? = 0 ]; then + success "$NOTE" + ret=0 + else + failure "$NOTE" + ret=1 + fi + + echo + test -n "$output" && echo "$output" + return $ret +} + case "$1" in start) - # Load modules + test_config || exit $? echo -n "Loading iptables modules: " /sbin/modprobe ip_tables 2>/dev/null >/dev/null echo -n "." @@ -130,14 +150,15 @@ echo ;; restart|reload) + test_config || exit $? flush DROP load_rules ;; save) NOTE="Saving rules to file" - echo -n $NOTE - ip6tables-save > $SYSCONFFILE - [ "$?" = "0" ] && success $NOTE || failure $NOTE + echo -n "$NOTE" + ip6tables-save > "$SYSCONFFILE" + [ "$?" = "0" ] && success "$NOTE" || failure "$NOTE" echo "" ;; Modified: tinysofa/releases/1.2/iptables/current/specs/iptables.spec =================================================================== --- tinysofa/releases/1.2/iptables/current/specs/iptables.spec 2005-01-29 11:25:42 UTC (rev 5768) +++ tinysofa/releases/1.2/iptables/current/specs/iptables.spec 2005-01-29 12:14:56 UTC (rev 5769) @@ -1,7 +1,7 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities. Version: 1.2.11 -Release: 2jh +Release: 3jh Source: http://www.netfilter.org/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables6.init @@ -107,6 +107,9 @@ %changelog +* Sat Jan 29 2005 Jaakko Heinonen 1.2.12-3jh +- test that iptables rules are valid before (re)loading them + * Thu Jan 20 2005 Jaakko Heinonen 1.2.12-2jh - change default target to DROP on restart - set default targets on service start From svn at tinysofa.org Sat Jan 29 14:39:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 29 Jan 2005 09:39:55 -0500 (EST) Subject: [tinysofa-svn] r5770 - tinysofa/releases/1.2/iptables/current/sources Message-ID: <20050129143955.5A2DF3441B9@minbar.tinysofa.org> Author: jh Date: 2005-01-29 09:39:47 -0500 (Sat, 29 Jan 2005) New Revision: 5770 Modified: tinysofa/releases/1.2/iptables/current/sources/iptables.init tinysofa/releases/1.2/iptables/current/sources/iptables6.init Log: - iptables -> ip6tables fix - minor polishing Modified: tinysofa/releases/1.2/iptables/current/sources/iptables.init =================================================================== --- tinysofa/releases/1.2/iptables/current/sources/iptables.init 2005-01-29 12:14:56 UTC (rev 5769) +++ tinysofa/releases/1.2/iptables/current/sources/iptables.init 2005-01-29 14:39:47 UTC (rev 5770) @@ -157,11 +157,11 @@ ;; save) - NOTE="Saving rules to file" + NOTE="Saving rules to $SYSCONFFILE" echo -n "$NOTE" iptables-save > "$SYSCONFFILE" [ "$?" = "0" ] && success "$NOTE" || failure "$NOTE" - echo "" + echo ;; *) Modified: tinysofa/releases/1.2/iptables/current/sources/iptables6.init =================================================================== --- tinysofa/releases/1.2/iptables/current/sources/iptables6.init 2005-01-29 12:14:56 UTC (rev 5769) +++ tinysofa/releases/1.2/iptables/current/sources/iptables6.init 2005-01-29 14:39:47 UTC (rev 5770) @@ -106,7 +106,7 @@ { NOTE="Testing $SYSCONFFILE" echo -n "$NOTE" - output=`iptables-restore --test "$SYSCONFFILE" 2>&1` + output=`ip6tables-restore --test "$SYSCONFFILE" 2>&1` if [ $? = 0 ]; then success "$NOTE" ret=0 @@ -155,11 +155,11 @@ load_rules ;; save) - NOTE="Saving rules to file" + NOTE="Saving rules to $SYSCONFFILE" echo -n "$NOTE" ip6tables-save > "$SYSCONFFILE" [ "$?" = "0" ] && success "$NOTE" || failure "$NOTE" - echo "" + echo ;; *) From svn at tinysofa.org Sun Jan 30 20:55:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 30 Jan 2005 15:55:45 -0500 (EST) Subject: [tinysofa-svn] r5771 - tinysofa/releases/1.2/initscripts/current/specs Message-ID: <20050130205545.B430434419A@minbar.tinysofa.org> Author: jh Date: 2005-01-30 15:55:39 -0500 (Sun, 30 Jan 2005) New Revision: 5771 Modified: tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec Log: - fix doc files permissions Modified: tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-01-29 14:39:47 UTC (rev 5770) +++ tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-01-30 20:55:39 UTC (rev 5771) @@ -131,8 +131,8 @@ %files %defattr(0755,root,root) -%doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 -%doc ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 +%doc %attr(0644,root,root) sysconfig.txt sysvinitfiles ChangeLog +%doc %attr(0644,root,root) static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 %dir /etc/sysconfig/network-scripts %dir /etc/sysconfig/console %dir /etc/sysconfig/networking From svn at tinysofa.org Mon Jan 31 05:25:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 31 Jan 2005 00:25:21 -0500 (EST) Subject: [tinysofa-svn] r5772 - tinysofa/releases/1.1 Message-ID: <20050131052521.6DC0434418B@minbar.tinysofa.org> Author: jh Date: 2005-01-31 00:25:12 -0500 (Mon, 31 Jan 2005) New Revision: 5772 Added: tinysofa/releases/1.1/php4/ Log: - copy to 1.1 Copied: tinysofa/releases/1.1/php4 (from rev 5771, tinysofa/releases/1.2/php4) From svn at tinysofa.org Mon Jan 31 05:31:07 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 31 Jan 2005 00:31:07 -0500 (EST) Subject: [tinysofa-svn] r5773 - tinysofa/releases/1.2 Message-ID: <20050131053107.BCB9E34419F@minbar.tinysofa.org> Author: jh Date: 2005-01-31 00:31:00 -0500 (Mon, 31 Jan 2005) New Revision: 5773 Added: tinysofa/releases/1.2/php/ Removed: tinysofa/releases/1.2/php4/ Log: - rename to php4 -> php Copied: tinysofa/releases/1.2/php (from rev 5753, tinysofa/releases/1.2/php4) From svn at tinysofa.org Mon Jan 31 08:02:41 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 31 Jan 2005 03:02:41 -0500 (EST) Subject: [tinysofa-svn] r5774 - tinysofa/releases/1.2/openssh/current/specs Message-ID: <20050131080241.43EE834419B@minbar.tinysofa.org> Author: jh Date: 2005-01-31 03:02:35 -0500 (Mon, 31 Jan 2005) New Revision: 5774 Modified: tinysofa/releases/1.2/openssh/current/specs/openssh.spec Log: - PreReq: tcp_wrappers (server) Modified: tinysofa/releases/1.2/openssh/current/specs/openssh.spec =================================================================== --- tinysofa/releases/1.2/openssh/current/specs/openssh.spec 2005-01-31 05:31:00 UTC (rev 5773) +++ tinysofa/releases/1.2/openssh/current/specs/openssh.spec 2005-01-31 08:02:35 UTC (rev 5774) @@ -61,7 +61,8 @@ Group: main Obsoletes: ssh-server %{name}-server-config < %{version}-%{release} PreReq: %{name} = %{version} -Requires: tcp_wrappers +# this is to avoid upgrade problems from 1.1-U2 or older +PreReq: tcp_wrappers %service_requires %description server From svn at tinysofa.org Mon Jan 31 08:45:05 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 31 Jan 2005 03:45:05 -0500 (EST) Subject: [tinysofa-svn] r5775 - tinysofa/releases/1.2/openswan/current/specs Message-ID: <20050131084505.ECDEC344200@minbar.tinysofa.org> Author: jh Date: 2005-01-31 03:45:00 -0500 (Mon, 31 Jan 2005) New Revision: 5775 Modified: tinysofa/releases/1.2/openswan/current/specs/openswan.spec Log: - build as pie Modified: tinysofa/releases/1.2/openswan/current/specs/openswan.spec =================================================================== --- tinysofa/releases/1.2/openswan/current/specs/openswan.spec 2005-01-31 08:02:35 UTC (rev 5774) +++ tinysofa/releases/1.2/openswan/current/specs/openswan.spec 2005-01-31 08:45:00 UTC (rev 5775) @@ -35,13 +35,13 @@ %patch1 -p1 -b .confused %build -CFLAGS="${RPM_OPT_FLAGS}" \ %make -j1 \ - DESTDIR=/ \ + USERCOMPILE="-g %{optflags} -fPIE -pie" \ + USERLINK="-g -pie" \ PUBDIR=%{_sbindir} \ BINDIR=%{_libdir}/ipsec \ - INC_MANDIR=share/man \ - INC_USRLOCAL=/usr \ + MANTREE=%{_mandir} \ + INC_USRLOCAL=%{_prefix} \ FINALEXAMPLECONFDIR=/usr/share/doc/freeswan-%{version} \ FINALLIBEXECDIR=%{_libdir}/ipsec \ FINALLIBDIR=%{_libdir}/ipsec \ @@ -55,8 +55,8 @@ %makeinstall_std \ PUBDIR=%{_sbindir} \ BINDIR=%{_libdir}/ipsec \ - INC_MANDIR=share/man \ - INC_USRLOCAL=/usr \ + MANTREE=%{buildroot}%{_mandir} \ + INC_USRLOCAL=%{_prefix} \ FINALEXAMPLECONFDIR=/usr/share/doc/%{name}-%{version} \ FINALLIBEXECDIR=%{_libdir}/ipsec \ FINALLIBDIR=%{_libdir}/ipsec \ @@ -113,6 +113,9 @@ %changelog +* Mon Jan 31 2005 Jaakko Heinonen +- pie + * Tue Jan 04 2005 tsintegrate 2.2.0-1ts - current (2.2.0-1jh) integrated as 2.2.0-1ts for release 1.1-U3 From svn at tinysofa.org Mon Jan 31 16:49:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 31 Jan 2005 11:49:33 -0500 (EST) Subject: [tinysofa-svn] r5777 - in tinysofa/releases/1.2/openswan/current: sources specs Message-ID: <20050131164933.03D73344202@minbar.tinysofa.org> Author: jh Date: 2005-01-31 11:49:24 -0500 (Mon, 31 Jan 2005) New Revision: 5777 Added: tinysofa/releases/1.2/openswan/current/sources/openswan-2.3.0-pie.patch Modified: tinysofa/releases/1.2/openswan/current/specs/openswan.spec Log: - add pie patch Added: tinysofa/releases/1.2/openswan/current/sources/openswan-2.3.0-pie.patch =================================================================== --- tinysofa/releases/1.2/openswan/current/sources/openswan-2.3.0-pie.patch 2005-01-31 09:06:12 UTC (rev 5776) +++ tinysofa/releases/1.2/openswan/current/sources/openswan-2.3.0-pie.patch 2005-01-31 16:49:24 UTC (rev 5777) @@ -0,0 +1,63 @@ +--- openswan-2.3.0/lib/libcrypto/libdes/Makefile.pie 2005-01-13 18:05:33.000000000 +0100 ++++ openswan-2.3.0/lib/libcrypto/libdes/Makefile 2005-01-13 18:05:43.000000000 +0100 +@@ -60,7 +60,7 @@ + # normally overridden by FreeS/WAN Makefiles anyway + CFLAG= -O3 -fomit-frame-pointer -I${KLIPSD}/include -I${SRCDIR} + +-CFLAGS=$(OPTS) $(CFLAG) ++CFLAGS=$(OPTS) $(CFLAG) $(USERCOMPILE) + CPP=$(CC) -E + + # Assember version of des_encrypt*(). +--- openswan-2.3.0/programs/Makefile.program.pie 2005-01-13 18:03:44.000000000 +0100 ++++ openswan-2.3.0/programs/Makefile.program 2005-01-13 18:03:45.000000000 +0100 +@@ -117,7 +117,7 @@ + %: %.c + + %: %.o $(OBJS) $(OPENSWANLIB) +- $(CC) $(CFLAGS) -o $@ $@.o ${OBJS} $(LDFLAGS) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ $@.o ${OBJS} $(LDFLAGS) $(LIBS) $(USERLINK) + + %: %.in ${OPENSWANSRCDIR}/Makefile.inc ${OPENSWANSRCDIR}/Makefile.ver + @cat $< | sed -e "s/xxx/$(IPSECVERSION)/" \ +--- openswan-2.3.0/programs/pluto/Makefile.pie 2005-01-13 18:03:45.000000000 +0100 ++++ openswan-2.3.0/programs/pluto/Makefile 2005-01-13 18:03:44.000000000 +0100 +@@ -410,23 +410,24 @@ + done + + alg_info_test: alg_info_test.o ike_alg.o constants.o defs.o log.o db_ops.o crypto.o $(LIBDESLITE) $(OPENSWANLIB) +- $(CC) -o $@ $^ $(LIBSPLUTO) ++ $(CC) -o $@ $^ $(LIBSPLUTO) $(USERLINK) + + # alg/libalg.o contains an already resolved object built with + # additional crypto algos inside. + OBJSPLUTO:= ike_alg.o db_ops.o $(OBJSPLUTO) + ++ + $(BINNAMEPLUTO): $(OBJSPLUTO) $(ALG_LIBS) $(OPENSWANLIB) +- $(CC) -o $(BINNAMEPLUTO) $(LDFLAGS) $(OBJSPLUTO) $(LIBSPLUTO) ++ $(CC) -o $(BINNAMEPLUTO) $(LDFLAGS) $(USERLINK) $(OBJSPLUTO) $(LIBSPLUTO) + + $(BINNAMEADNS): $(OBJSADNS) +- $(CC) -o $(BINNAMEADNS) $(OBJSADNS) $(LIBSADNS) ++ $(CC) -o $(BINNAMEADNS) $(OBJSADNS) $(USERLINK) $(LIBSADNS) + + $(BINNAMEWHACK): $(OBJSWHACK) +- $(CC) -o $(BINNAMEWHACK) $(OBJSWHACK) $(LIBSWHACK) ++ $(CC) -o $(BINNAMEWHACK) $(OBJSWHACK) $(USERLINK) $(LIBSWHACK) + + $(BINNAMEWHACKINIT): $(OBJSWHACKINIT) +- $(CC) -o $(BINNAMEWHACKINIT) $(OBJSWHACKINIT) $(LIBSWHACK) ++ $(CC) -o $(BINNAMEWHACKINIT) $(OBJSWHACKINIT) $(USERLINK) $(LIBSWHACK) + + distlist: + @echo $(DIST) +@@ -461,7 +462,7 @@ + checkprograms: + + .c.o: +- $(CC) $(COPTS) $(ALLFLAGS) -c $< ++ $(CC) $(COPTS) $(ALLFLAGS) $(USERCOMPILE) -c $< + + # Gather dependencies caused by explicit #includes within .c files + # Modified: tinysofa/releases/1.2/openswan/current/specs/openswan.spec =================================================================== --- tinysofa/releases/1.2/openswan/current/specs/openswan.spec 2005-01-31 09:06:12 UTC (rev 5776) +++ tinysofa/releases/1.2/openswan/current/specs/openswan.spec 2005-01-31 16:49:24 UTC (rev 5777) @@ -9,6 +9,7 @@ Source1: freeswan-1.9.secrets.proto Patch0: openswan-2.1.4-init.patch Patch1: freeswan-2.00-confused.patch +Patch2: openswan-2.3.0-pie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Provides: vpn ipsec %service_requires @@ -31,9 +32,11 @@ %prep %setup -q -%patch0 -p1 -b .init -%patch1 -p1 -b .confused +%patch0 -p1 -b .init~ +%patch1 -p1 -b .confused~ +%patch2 -p1 -b .pie~ + %build %make -j1 \ USERCOMPILE="-g %{optflags} -fPIE -pie" \ From svn at tinysofa.org Mon Jan 31 20:29:00 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 31 Jan 2005 15:29:00 -0500 (EST) Subject: [tinysofa-svn] r5778 - tinysofa/releases/1.2/grsecurity/current/specs Message-ID: <20050131202900.2315E344275@minbar.tinysofa.org> Author: jh Date: 2005-01-31 15:28:50 -0500 (Mon, 31 Jan 2005) New Revision: 5778 Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - fix a mistake in %post script Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-31 16:49:24 UTC (rev 5777) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-01-31 20:28:50 UTC (rev 5778) @@ -1,4 +1,4 @@ -%define policies_date 20050126 +%define policies_date 20050127 Summary: grsecurity user space utilities and policies Name: grsecurity Version: 2.1.1 @@ -78,7 +78,7 @@ if [ ! -e rpmnew ]; then %{__mkdir} -m 700 rpmnew fi - if [ -d rpmnew ]; do + if [ -d rpmnew ]; then /usr/bin/find policies roles -type f -name '*.rpmnew' \ -exec %{__cp} -pf --parents '{}' rpmnew/ \; \ -exec %{__rm} -f '{}' \;