From fedora-cvs-commits at redhat.com Thu Mar 17 21:16:49 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:16:49 -0500 Subject: rpms/MAKEDEV/devel .cvsignore, 1.37, 1.38 MAKEDEV.spec, 1.37, 1.38 sources, 1.37, 1.38 Message-ID: <200503172116.j2HLGnWV031006@cvs.devel.redhat.com> Update of /cvs/dist/rpms/MAKEDEV/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30984/devel Modified Files: .cvsignore MAKEDEV.spec sources Log Message: auto-import MAKEDEV-3.19-1 on branch devel from MAKEDEV-3.19-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/MAKEDEV/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 16 Mar 2005 22:08:52 -0000 1.37 +++ .cvsignore 17 Mar 2005 21:16:47 -0000 1.38 @@ -1 +1 @@ -MAKEDEV-3.18-1.tar.gz +MAKEDEV-3.19-1.tar.gz Index: MAKEDEV.spec =================================================================== RCS file: /cvs/dist/rpms/MAKEDEV/devel/MAKEDEV.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- MAKEDEV.spec 16 Mar 2005 22:08:52 -0000 1.37 +++ MAKEDEV.spec 17 Mar 2005 21:16:47 -0000 1.38 @@ -1,5 +1,5 @@ Name: MAKEDEV -Version: 3.18 +Version: 3.19 Release: 1 Group: System Environment/Base License: GPL @@ -48,6 +48,10 @@ %config %{_sysconfdir}/makedev.d %changelog +* Thu Mar 17 2005 Nalin Dahyabhai 3.19-1 +- skip over subdirectories in /etc/makedev.d (#150766) instead of spitting + out an error (or warning, if -i was used) and quitting + * Tue Mar 15 2005 Nalin Dahyabhai 3.18-1 - update to 10 February devices-2.6+.txt: - remove vtx Index: sources =================================================================== RCS file: /cvs/dist/rpms/MAKEDEV/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 16 Mar 2005 22:08:52 -0000 1.37 +++ sources 17 Mar 2005 21:16:47 -0000 1.38 @@ -1 +1 @@ -a366653a180336477b5a57f4dafbd0b0 MAKEDEV-3.18-1.tar.gz +38639670ebd3a1d2eca6437f3bd47b97 MAKEDEV-3.19-1.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 17 21:31:40 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:31:40 -0500 Subject: rpms/gnome-netstatus/devel .cvsignore, 1.9, 1.10 gnome-netstatus.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <200503172131.j2HLVcL9009841@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnome-netstatus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9800 Modified Files: .cvsignore gnome-netstatus.spec sources Log Message: - Update to upstream version 2.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-netstatus/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 31 Jan 2005 20:23:46 -0000 1.9 +++ .cvsignore 17 Mar 2005 21:31:28 -0000 1.10 @@ -1,3 +1,4 @@ gnome-netstatus-2.7.92.tar.bz2 gnome-netstatus-2.8.0.tar.bz2 gnome-netstatus-2.9.4.tar.bz2 +gnome-netstatus-2.10.0.tar.bz2 Index: gnome-netstatus.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnome-netstatus.spec 2 Mar 2005 18:08:30 -0000 1.12 +++ gnome-netstatus.spec 17 Mar 2005 21:31:31 -0000 1.13 @@ -6,8 +6,8 @@ Summary: Network status applet Name: gnome-netstatus -Version: 2.9.4 -Release: 2 +Version: 2.10.0 +Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -84,6 +84,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Thu Mar 17 2005 Ray Strode - 2.10.0-1 +- Update to upstream version 2.10.0 + * Wed Mar 2 2005 Mark McLoughlin 2.9.4-2 - Rebuild with gcc4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-netstatus/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 31 Jan 2005 20:23:46 -0000 1.9 +++ sources 17 Mar 2005 21:31:31 -0000 1.10 @@ -1 +1 @@ -bc567643761756d3224e9ee2e223873f gnome-netstatus-2.9.4.tar.bz2 +b1a044cfbe3299e00d514d966d4766e8 gnome-netstatus-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 17 21:34:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:34:28 -0500 Subject: rpms/gnome-nettool/devel .cvsignore, 1.2, 1.3 gnome-nettool.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200503172134.j2HLYSwg010064@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnome-nettool/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10046 Modified Files: .cvsignore gnome-nettool.spec sources Log Message: - Update to upstream version 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-nettool/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Sep 2004 05:29:12 -0000 1.2 +++ .cvsignore 17 Mar 2005 21:34:24 -0000 1.3 @@ -1 +1,2 @@ gnome-nettool-0.99.3.tar.bz2 +gnome-nettool-1.2.0.tar.bz2 Index: gnome-nettool.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-nettool.spec 2 Mar 2005 18:09:48 -0000 1.3 +++ gnome-nettool.spec 17 Mar 2005 21:34:24 -0000 1.4 @@ -5,8 +5,8 @@ Summary: A GNOME interface for various networking tools Name: gnome-nettool -Version: 0.99.3 -Release: 3 +Version: 1.2.0 +Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -58,6 +58,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Thu Mar 17 2005 Ray Strode - 1.2.0-1 +- Update to upstream version 1.2.0 + * Wed Mar 2 2005 Mark McLoughlin 0.99.3-3 - Rebuild with gcc4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-nettool/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 05:29:12 -0000 1.2 +++ sources 17 Mar 2005 21:34:24 -0000 1.3 @@ -1 +1 @@ -b9cd4e18cb68b3e86d86dfa67fcf6b0f gnome-nettool-0.99.3.tar.bz2 +277338cf5d54ae9941260dd993a14f7a gnome-nettool-1.2.0.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 17 21:40:27 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:40:27 -0500 Subject: rpms/autofs/FC-3 autofs-4.1.3-init-script-browse.patch, NONE, 1.1 autofs-4.1.3-submount-variable-propagation.patch, 1.1, 1.2 autofs.spec, 1.52, 1.53 Message-ID: <200503172140.j2HLeRLj010457@cvs.devel.redhat.com> Update of /cvs/dist/rpms/autofs/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv10443 Modified Files: autofs-4.1.3-submount-variable-propagation.patch autofs.spec Added Files: autofs-4.1.3-init-script-browse.patch Log Message: * Thu Mar 17 2005 Chris Feist - 1:4.1.3-110 - Fixed one off bug in the submount-variable-propagation patch. (bz #143074) - Fixed a bug in the init script which wouldn't find the -browse option if it was preceded by another option. (fz #113494) autofs-4.1.3-init-script-browse.patch: rc.autofs.in | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- NEW FILE autofs-4.1.3-init-script-browse.patch --- --- autofs-4.1.3/samples/rc.autofs.in.orig 2005-03-02 14:08:02.892128400 -0500 +++ autofs-4.1.3/samples/rc.autofs.in 2005-03-02 14:24:22.390222056 -0500 @@ -232,9 +232,12 @@ function getmounts() fi # Dont even deal with conflicts between --ghost and [no]browse # Its just insane to configure things like that. - if echo "$options" | grep -qE -- '\B-browse\b' ; + if echo "$options" | grep -q 'browse' ; then - startupoptions="$startupoptions --ghost" + if echo "$options" | grep -qE -- '[ ]+-browse' || + echo "$options" | grep -q -- ',browse' ; + then + startupoptions="$startupoptions --ghost" fi # Check for verbose if echo "$DAEMONOPTIONS $options" | \ autofs-4.1.3-submount-variable-propagation.patch: parse_sun.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletion(-) Index: autofs-4.1.3-submount-variable-propagation.patch =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-3/autofs-4.1.3-submount-variable-propagation.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- autofs-4.1.3-submount-variable-propagation.patch 11 Feb 2005 22:44:09 -0000 1.1 +++ autofs-4.1.3-submount-variable-propagation.patch 17 Mar 2005 21:40:24 -0000 1.2 @@ -1,6 +1,7 @@ ---- autofs-4.1.3/modules/parse_sun.c.child_args 2005-02-07 15:33:23.182045264 -0500 -+++ autofs-4.1.3/modules/parse_sun.c 2005-02-07 15:37:51.281287984 -0500 -@@ -70,6 +70,7 @@ static struct substvar +diff -urN autofs-4.1.3/modules/parse_sun.c autofs-4.1.3.new/modules/parse_sun.c +--- autofs-4.1.3/modules/parse_sun.c Mon Sep 27 10:16:39 2004 ++++ autofs-4.1.3.new/modules/parse_sun.c Mon Sep 27 10:07:15 2004 +@@ -70,6 +70,7 @@ /* Default context pattern */ @@ -8,17 +9,17 @@ static struct parse_context default_context = { NULL, /* No mount options */ &sv_osvers, /* The substvar predefined variables */ -@@ -376,7 +377,19 @@ int parse_init(int argc, const char *con +@@ -376,7 +377,19 @@ *(sv->val++) = '\0'; else sv->val = ""; - -+ /* we use 4 for the "-D", the "=", and the null */ ++ /* we use 5 for the "-D", the "=", the ",", and the null */ + if (child_args) { -+ child_args = realloc(child_args, strlen(child_args) + strlen(sv->def) + strlen(sv->val) + 4); ++ child_args = realloc(child_args, strlen(child_args) + strlen(sv->def) + strlen(sv->val) + 5); + strcat(child_args, ","); + } -+ else { ++ else { /* No comma, so only +4 */ + child_args = malloc(strlen(sv->def) + strlen(sv->val) + 4); + *child_args = '\0'; + } @@ -29,10 +30,13 @@ sv->next = ctxt->subst; ctxt->subst = sv; } -@@ -566,6 +579,28 @@ static int sun_mount(const char *root, c - options = noptions; - } +@@ -564,6 +577,29 @@ + np[-1] = '\0'; + options = noptions; ++ } ++ ++ + if (child_args && !strcmp(fstype, "autofs")) { + char *noptions; + if (! options) { @@ -53,8 +57,6 @@ + else { + error(MODPREFIX "alloca failed for options"); + } -+ } -+ + } + while (*name == '/') { - name++; - namelen--; Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-3/autofs.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- autofs.spec 1 Mar 2005 19:20:38 -0000 1.52 +++ autofs.spec 17 Mar 2005 21:40:24 -0000 1.53 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs %define version 4.1.3 -%define release 106 +%define release 110 Version: %{version} Release: %{release} Epoch: 1 @@ -58,6 +58,7 @@ Patch54: autofs-4.1.3-alt-master-ldap.patch Patch55: autofs-4.1.3-auto-smb-mount-fix.patch Patch56: autofs-4.1.3-check-nsswitch-submount.patch +Patch57: autofs-4.1.3-init-script-browse.patch Buildroot: /var/tmp/autofs-tmp BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl @@ -132,7 +133,7 @@ %patch43 -p1 -b .yp-direct-lookup %patch44 -p1 -b .filestream-leak %patch45 -p1 -b .no-rmdir -%patch46 -p1 +%patch46 -p1 %patch47 -p1 -b .cache-release %patch48 -p1 -b .non-replicated-ping %patch49 -p1 -b .program-map-extra-char @@ -143,6 +144,7 @@ %patch54 -p1 -b .alt-master-ldap %patch55 -p1 -b .auto-smb-mount %patch56 -p1 -b .check-nsswitch-submount +%patch57 -p1 -b .init-script-browse cp $RPM_SOURCE_DIR/autofs.sysconfig . @@ -197,7 +199,13 @@ %{_libdir}/autofs/* %changelog -* Mon Feb 28 2005 Chris Feist - 1:4.1.3-102 +* Thu Mar 17 2005 Chris Feist - 1:4.1.3-110 +- Fixed one off bug in the submount-variable-propagation patch. + (bz #143074) +- Fixed a bug in the init script which wouldn't find the -browse + option if it was preceded by another option. (fz #113494) + +* Mon Feb 28 2005 Chris Feist - 1:4.1.3-100 - When using ldap if auto.master doesn't exist we now check for auto_master. Addresses bz #130079 - When using an auto.smb map we now remove the leading ':' from the path which From fedora-cvs-commits at redhat.com Thu Mar 17 21:40:40 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:40:40 -0500 Subject: rpms/gnome-session/devel .cvsignore, 1.12, 1.13 gnome-session.spec, 1.32, 1.33 sources, 1.12, 1.13 Message-ID: <200503172140.j2HLeeIU010489@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10445 Modified Files: .cvsignore gnome-session.spec sources Log Message: - Update to upstream version 2.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 2 Feb 2005 21:11:07 -0000 1.12 +++ .cvsignore 17 Mar 2005 21:40:30 -0000 1.13 @@ -1,3 +1,4 @@ gnome-session-2.7.91.tar.bz2 gnome-session-2.8.0.tar.bz2 gnome-session-2.9.4.tar.bz2 +gnome-session-2.10.0.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gnome-session.spec 2 Feb 2005 21:37:06 -0000 1.32 +++ gnome-session.spec 17 Mar 2005 21:40:30 -0000 1.33 @@ -12,7 +12,7 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.9.4 +Version: 2.10.0 Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.7/%{name}-%{version}.tar.bz2 @@ -151,6 +151,9 @@ %{_sysconfdir}/X11/dm/Sessions/* %changelog +* Thu Mar 17 2005 Ray Strode - 2.10.0-1 +- Update to upstream version 2.10.0 + * Wed Feb 2 2005 Matthias Clasen 2.9.4-1 - Update to 2.9.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 2 Feb 2005 21:11:07 -0000 1.12 +++ sources 17 Mar 2005 21:40:30 -0000 1.13 @@ -1 +1 @@ -85077a3dc14ce353bda22408f78e92c3 gnome-session-2.9.4.tar.bz2 +cbeb2db49dac11bf8088e6b025265fff gnome-session-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 17 21:40:54 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:40:54 -0500 Subject: rpms/jessie/devel jessie.spec,1.3,1.4 Message-ID: <200503172140.j2HLesL5010551@cvs.devel.redhat.com> Update of /cvs/dist/rpms/jessie/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10523 Modified Files: jessie.spec Log Message: * Thu Mar 17 2005 Thomas Fitzsimmons - 0:1.0.0-3 - Don't install security.d file. Index: jessie.spec =================================================================== RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jessie.spec 10 Mar 2005 23:12:24 -0000 1.3 +++ jessie.spec 17 Mar 2005 21:40:50 -0000 1.4 @@ -1,6 +1,6 @@ Name: jessie Version: 1.0.0 -Release: 2 +Release: 3 Epoch: 0 Summary: A free implementation of the Java Secure Sockets Extension @@ -38,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d -touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-org.metastatic.jessie.provider.Jessie +#touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-org.metastatic.jessie.provider.Jessie install -dm 755 $RPM_BUILD_ROOT%{_javadir} install -pm 644 lib/jsse.jar \ @@ -81,9 +81,12 @@ # %{_javadir}-1.4.0/jsse.jar # %{_javadir}-1.4.1/jsse.jar # %{_javadir}-1.4.2/jsse.jar -%{_sysconfdir}/java/security/security.d/2000-org.metastatic.jessie.provider.Jessie +#%{_sysconfdir}/java/security/security.d/2000-org.metastatic.jessie.provider.Jessie %changelog +* Thu Mar 17 2005 Thomas Fitzsimmons - 0:1.0.0-3 +- Don't install security.d file. + * Thu Mar 10 2005 Thomas Fitzsimmons - 0:1.0.0-2 - Comment out extdirs support. - Install provider file. From fedora-cvs-commits at redhat.com Thu Mar 17 21:41:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:41:29 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.42, 1.43 Message-ID: <200503172141.j2HLfTRE010662@cvs.devel.redhat.com> Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10612 Modified Files: java-1.4.2-gcj-compat.spec Log Message: * Thu Mar 17 2005 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_13rh - Require jessie >= 1.0.0-3. Index: java-1.4.2-gcj-compat.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- java-1.4.2-gcj-compat.spec 15 Mar 2005 22:10:59 -0000 1.42 +++ java-1.4.2-gcj-compat.spec 17 Mar 2005 21:41:24 -0000 1.43 @@ -11,7 +11,7 @@ %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_12rh +%define release 40jpp_13rh %define cname java-%{javaver}-%{origin} %define sdklnk java-%{javaver}-%{origin} @@ -38,7 +38,7 @@ Requires: gcc%{gccsuffix}-java >= %{gccver} Requires: libgcj%{gccsuffix} >= %{gccver} Requires: gjdoc -Requires: jessie +Requires: jessie >= 1.0.0-3 Provides: jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} Provides: jre-%{origin} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}, java-%{javaver}, jre = %{javaver} @@ -350,6 +350,9 @@ %defattr(-,root,root) %changelog +* Thu Mar 17 2005 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_13rh +- Require jessie >= 1.0.0-3. + * Tue Mar 15 2005 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_12rh - Don't re-run rebuild-security-providers. From fedora-cvs-commits at redhat.com Thu Mar 17 21:42:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:42:02 -0500 Subject: rpms/autofs/devel autofs-4.1.3-init-script-browse.patch, NONE, 1.1 autofs-4.1.3-submount-variable-propagation.patch, 1.1, 1.2 autofs.spec, 1.53, 1.54 Message-ID: <200503172142.j2HLg2FP010784@cvs.devel.redhat.com> Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10734 Modified Files: autofs-4.1.3-submount-variable-propagation.patch autofs.spec Added Files: autofs-4.1.3-init-script-browse.patch Log Message: - Fixed one off bug in the submount-variable-propagation patch. (bz #143074) - Fixed a bug in the init script which wouldn't find the -browse option if it was preceded by another option. (fz #113494) autofs-4.1.3-init-script-browse.patch: rc.autofs.in | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- NEW FILE autofs-4.1.3-init-script-browse.patch --- --- autofs-4.1.3/samples/rc.autofs.in.orig 2005-03-02 14:08:02.892128400 -0500 +++ autofs-4.1.3/samples/rc.autofs.in 2005-03-02 14:24:22.390222056 -0500 @@ -232,9 +232,12 @@ function getmounts() fi # Dont even deal with conflicts between --ghost and [no]browse # Its just insane to configure things like that. - if echo "$options" | grep -qE -- '\B-browse\b' ; + if echo "$options" | grep -q 'browse' ; then - startupoptions="$startupoptions --ghost" + if echo "$options" | grep -qE -- '[ ]+-browse' || + echo "$options" | grep -q -- ',browse' ; + then + startupoptions="$startupoptions --ghost" fi # Check for verbose if echo "$DAEMONOPTIONS $options" | \ autofs-4.1.3-submount-variable-propagation.patch: parse_sun.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletion(-) Index: autofs-4.1.3-submount-variable-propagation.patch =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs-4.1.3-submount-variable-propagation.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- autofs-4.1.3-submount-variable-propagation.patch 11 Feb 2005 22:50:11 -0000 1.1 +++ autofs-4.1.3-submount-variable-propagation.patch 17 Mar 2005 21:42:00 -0000 1.2 @@ -1,6 +1,7 @@ ---- autofs-4.1.3/modules/parse_sun.c.child_args 2005-02-07 15:33:23.182045264 -0500 -+++ autofs-4.1.3/modules/parse_sun.c 2005-02-07 15:37:51.281287984 -0500 -@@ -70,6 +70,7 @@ static struct substvar +diff -urN autofs-4.1.3/modules/parse_sun.c autofs-4.1.3.new/modules/parse_sun.c +--- autofs-4.1.3/modules/parse_sun.c Mon Sep 27 10:16:39 2004 ++++ autofs-4.1.3.new/modules/parse_sun.c Mon Sep 27 10:07:15 2004 +@@ -70,6 +70,7 @@ /* Default context pattern */ @@ -8,17 +9,17 @@ static struct parse_context default_context = { NULL, /* No mount options */ &sv_osvers, /* The substvar predefined variables */ -@@ -376,7 +377,19 @@ int parse_init(int argc, const char *con +@@ -376,7 +377,19 @@ *(sv->val++) = '\0'; else sv->val = ""; - -+ /* we use 4 for the "-D", the "=", and the null */ ++ /* we use 5 for the "-D", the "=", the ",", and the null */ + if (child_args) { -+ child_args = realloc(child_args, strlen(child_args) + strlen(sv->def) + strlen(sv->val) + 4); ++ child_args = realloc(child_args, strlen(child_args) + strlen(sv->def) + strlen(sv->val) + 5); + strcat(child_args, ","); + } -+ else { ++ else { /* No comma, so only +4 */ + child_args = malloc(strlen(sv->def) + strlen(sv->val) + 4); + *child_args = '\0'; + } @@ -29,10 +30,13 @@ sv->next = ctxt->subst; ctxt->subst = sv; } -@@ -566,6 +579,28 @@ static int sun_mount(const char *root, c - options = noptions; - } +@@ -564,6 +577,29 @@ + np[-1] = '\0'; + options = noptions; ++ } ++ ++ + if (child_args && !strcmp(fstype, "autofs")) { + char *noptions; + if (! options) { @@ -53,8 +57,6 @@ + else { + error(MODPREFIX "alloca failed for options"); + } -+ } -+ + } + while (*name == '/') { - name++; - namelen--; Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- autofs.spec 1 Mar 2005 19:21:40 -0000 1.53 +++ autofs.spec 17 Mar 2005 21:42:00 -0000 1.54 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs %define version 4.1.3 -%define release 107 +%define release 111 Version: %{version} Release: %{release} Epoch: 1 @@ -58,6 +58,7 @@ Patch54: autofs-4.1.3-alt-master-ldap.patch Patch55: autofs-4.1.3-auto-smb-mount-fix.patch Patch56: autofs-4.1.3-check-nsswitch-submount.patch +Patch57: autofs-4.1.3-init-script-browse.patch Buildroot: /var/tmp/autofs-tmp BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl @@ -143,6 +144,7 @@ %patch54 -p1 -b .alt-master-ldap %patch55 -p1 -b .auto-smb-mount %patch56 -p1 -b .check-nsswitch-submount +%patch57 -p1 -b .init-script-browse cp $RPM_SOURCE_DIR/autofs.sysconfig . @@ -197,7 +199,13 @@ %{_libdir}/autofs/* %changelog -* Mon Feb 28 2005 Chris Feist - 1:4.1.3-103 +* Thu Mar 17 2005 Chris Feist - 1:4.1.3-111 +- Fixed one off bug in the submount-variable-propagation patch. + (bz #143074) +- Fixed a bug in the init script which wouldn't find the -browse + option if it was preceded by another option. (fz #113494) + +* Mon Feb 28 2005 Chris Feist - 1:4.1.3-100 - When using ldap if auto.master doesn't exist we now check for auto_master. Addresses bz #130079 - When using an auto.smb map we now remove the leading ':' from the path which From fedora-cvs-commits at redhat.com Thu Mar 17 21:43:53 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:43:53 -0500 Subject: rpms/gtksourceview/devel .cvsignore, 1.8, 1.9 gtksourceview.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200503172143.j2HLhrjA011004@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gtksourceview/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10949 Modified Files: .cvsignore gtksourceview.spec sources Log Message: - Update to upstream version 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 Feb 2005 19:21:06 -0000 1.8 +++ .cvsignore 17 Mar 2005 21:43:49 -0000 1.9 @@ -1,3 +1,4 @@ gtksourceview-1.1.0.tar.bz2 gtksourceview-1.1.91.tar.bz2 gtksourceview-1.1.92.tar.bz2 +gtksourceview-1.2.0.tar.bz2 Index: gtksourceview.spec =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtksourceview.spec 9 Feb 2005 19:21:06 -0000 1.10 +++ gtksourceview.spec 17 Mar 2005 21:43:49 -0000 1.11 @@ -3,7 +3,7 @@ Summary: A library for viewing source files Name: gtksourceview -Version: 1.1.92 +Version: 1.2.0 Release: 1 License: LGPL Group: System Environment/Libraries @@ -71,6 +71,9 @@ %{_libdir}/*.so %changelog +* Thu Mar 17 2005 Ray Strode - 1.2.0-1 +- Update to upstream version 1.2.0 + * Wed Feb 9 2005 Matthias Clasen - 1.1.92-1 - Update to 1.1.92 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Feb 2005 19:21:06 -0000 1.8 +++ sources 17 Mar 2005 21:43:49 -0000 1.9 @@ -1 +1 @@ -5e29584efbb935f339aac948fa09e787 gtksourceview-1.1.92.tar.bz2 +0a9f68a3faf982599b64276487c37c6d gtksourceview-1.2.0.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 17 21:45:20 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:45:20 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.43, 1.44 Message-ID: <200503172145.j2HLjK7b013029@cvs.devel.redhat.com> Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11898 Modified Files: java-1.4.2-gcj-compat.spec Log Message: * Thu Mar 17 2005 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_13rh - Uncomment rebuild-security-providers. Index: java-1.4.2-gcj-compat.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- java-1.4.2-gcj-compat.spec 17 Mar 2005 21:41:24 -0000 1.43 +++ java-1.4.2-gcj-compat.spec 17 Mar 2005 21:45:16 -0000 1.44 @@ -201,7 +201,7 @@ %{_libdir}/security/classpath.security \ %{_jvmdir}/%{cname}-%{version}/jre/lib/security/java.security -# rebuild-security-providers +rebuild-security-providers %post devel @@ -255,7 +255,7 @@ update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk} fi -# rebuild-security-providers +rebuild-security-providers %postun devel if [ $1 -eq 0 ] ; then @@ -351,6 +351,7 @@ %changelog * Thu Mar 17 2005 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_13rh +- Uncomment rebuild-security-providers. - Require jessie >= 1.0.0-3. * Tue Mar 15 2005 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_12rh From fedora-cvs-commits at redhat.com Thu Mar 17 21:59:55 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 16:59:55 -0500 Subject: rpms/libsoup/devel libsoup.spec,1.19,1.20 Message-ID: <200503172159.j2HLxtES025614@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libsoup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25598 Modified Files: libsoup.spec Log Message: * Thu Mar 17 2005 David Malcolm - 2.2.3-2 - explicitly enable gtk-doc support Index: libsoup.spec =================================================================== RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libsoup.spec 17 Mar 2005 20:40:19 -0000 1.19 +++ libsoup.spec 17 Mar 2005 21:59:53 -0000 1.20 @@ -1,7 +1,7 @@ Summary: Soup, an HTTP library implementation Name: libsoup Version: 2.2.3 -Release: 1 +Release: 2 License: LGPL Group: Development/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2 @@ -35,7 +35,7 @@ %setup -q %build -%configure +%configure --enable-gtk-doc make %install @@ -65,6 +65,9 @@ %{_datadir}/gtk-doc/html/libsoup %changelog +* Thu Mar 17 2005 David Malcolm - 2.2.3-2 +- explicitly enable gtk-doc support + * Thu Mar 17 2005 David Malcolm - 2.2.3-1 - 2.2.3 From fedora-cvs-commits at redhat.com Thu Mar 17 22:36:03 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 17:36:03 -0500 Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.2, 1.3 gnome-doc-utils.spec, 1.2, 1.3 sources, 1.2, 1.3 gnome-doc-utils-0.1.2-reloc.patch, 1.1, NONE Message-ID: <200503172236.j2HMa3DV008128@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnome-doc-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8117 Modified Files: .cvsignore gnome-doc-utils.spec sources Removed Files: gnome-doc-utils-0.1.2-reloc.patch Log Message: - Update to upstream version 0.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Jan 2005 19:17:15 -0000 1.2 +++ .cvsignore 17 Mar 2005 22:36:00 -0000 1.3 @@ -1 +1,2 @@ gnome-doc-utils-0.1.2.tar.bz2 +gnome-doc-utils-0.1.3.tar.bz2 Index: gnome-doc-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-doc-utils.spec 2 Feb 2005 21:23:57 -0000 1.2 +++ gnome-doc-utils.spec 17 Mar 2005 22:36:00 -0000 1.3 @@ -1,12 +1,11 @@ Summary: Documentation utilities for the GNOME project Name: gnome-doc-utils -Version: 0.1.2 -Release: 2 +Version: 0.1.3 +Release: 1 License: LGPL Group: Development/Tools URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 -Patch0: gnome-doc-utils-0.1.2-reloc.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildPrereq: libxml2-devel >= 2.6.12 @@ -23,7 +22,6 @@ %prep %setup -q -%patch0 -p1 -b .reloc %build %configure @@ -51,9 +49,13 @@ %{_datadir}/omf %{_datadir}/xml %{_datadir}/xml2po +%{_mandir}/man1/xml2po.1.gz %{_datadir}/gnome-doc-utils %changelog +* Thu Mar 17 2005 Ray Strode - 0.1.3-1 +- Update to upstream version 0.1.3 + * Wed Feb 2 2005 Nalin Dahyabhai - 0.1.2-2 - remove explicit libxml dependency (should have been libxml2) - add libxml2-devel and libxslt-devel as buildprereqs Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jan 2005 19:17:15 -0000 1.2 +++ sources 17 Mar 2005 22:36:00 -0000 1.3 @@ -1 +1 @@ -7164538a4a56418328f9bfde0313ac6b gnome-doc-utils-0.1.2.tar.bz2 +d59875bb5924fd098a19a7d229af63cc gnome-doc-utils-0.1.3.tar.bz2 --- gnome-doc-utils-0.1.2-reloc.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 17 22:38:49 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 17:38:49 -0500 Subject: rpms/gedit/devel .cvsignore, 1.21, 1.22 gedit.spec, 1.31, 1.32 sources, 1.23, 1.24 Message-ID: <200503172238.j2HMcn46008209@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8193 Modified Files: .cvsignore gedit.spec sources Log Message: - Update to upstream version 2.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 3 Mar 2005 17:44:48 -0000 1.21 +++ .cvsignore 17 Mar 2005 22:38:46 -0000 1.22 @@ -4,3 +4,4 @@ gedit-2.9.5.tar.bz2 gedit-2.9.6.tar.bz2 gedit-2.9.7.tar.bz2 +gedit-2.10.0.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gedit.spec 3 Mar 2005 17:44:48 -0000 1.31 +++ gedit.spec 17 Mar 2005 22:38:46 -0000 1.32 @@ -13,7 +13,7 @@ Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit -Version: 2.9.7 +Version: 2.10.0 Release: 1 Epoch: 1 License: GPL @@ -145,6 +145,9 @@ %{_libdir}/pkgconfig/gedit-2.10.pc %changelog +* Thu Mar 17 2005 Ray Strode - 2.10.0-1 +- Update to upstream version 2.10.0 + * Thu Mar 3 2005 Marco Pesenti Gritti 1:2.9.7-1 - Update to 2.9.7 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 3 Mar 2005 17:44:48 -0000 1.23 +++ sources 17 Mar 2005 22:38:46 -0000 1.24 @@ -1 +1 @@ -617b4179dcdad83f3e24ea64d287128c gedit-2.9.7.tar.bz2 +933f551489ca8303a07f3cd0c42d5881 gedit-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 17 22:39:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 17:39:52 -0500 Subject: rpms/logrotate/devel logrotate-3.7.1-selinux.patch, NONE, 1.1 logrotate.spec, 1.21, 1.22 Message-ID: <200503172239.j2HMdqw2008295@cvs.devel.redhat.com> Update of /cvs/dist/rpms/logrotate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8280 Modified Files: logrotate.spec Added Files: logrotate-3.7.1-selinux.patch Log Message: * Thu Mar 17 2005 Dan Walsh 3.7.1-9 - Add selinux_getenforce() calls to work when not in enforcing mode logrotate-3.7.1-selinux.patch: logrotate.c | 121 +++++++++++++++++++++++++++++++----------------------------- 1 files changed, 63 insertions(+), 58 deletions(-) --- NEW FILE logrotate-3.7.1-selinux.patch --- --- logrotate-3.7.1/logrotate.c~ 2005-03-17 12:48:27.192521752 -0500 +++ logrotate-3.7.1/logrotate.c 2005-03-17 12:58:25.661540632 -0500 @@ -250,44 +250,43 @@ return 1; } #ifdef WITH_SELINUX - if ((selinux_enabled=(is_selinux_enabled()>0))) - { - security_context_t oldContext; - if (fgetfilecon(fdcurr, &oldContext) >=0) { - if (getfscreatecon(&prev_context) < 0) { - message(MESS_ERROR, "error getting default context: %s\n", - strerror(errno)); - if (selinux_getenforce()) { + if ((selinux_enabled=(is_selinux_enabled()>0))) { + security_context_t oldContext; + if (fgetfilecon(fdcurr, &oldContext) >=0) { + if (getfscreatecon(&prev_context) < 0) { + message(MESS_ERROR, "error getting default context: %s\n", + strerror(errno)); + if (selinux_getenforce()) { + freecon(oldContext); + return 1; + } + } + if (setfscreatecon(oldContext) < 0) { + message(MESS_ERROR, "error setting file context %s to %s: %s\n", + saveLog, oldContext,strerror(errno)); + if (selinux_getenforce()) { + freecon(oldContext); + return 1; + } + } freecon(oldContext); - return 1; - } - } - if (setfscreatecon(oldContext) < 0) { - message(MESS_ERROR, "error setting file context %s to %s: %s\n", - saveLog, oldContext,strerror(errno)); - if (selinux_getenforce()) { - freecon(oldContext); - return 1; - } - } - freecon(oldContext); - } else { - message(MESS_ERROR, "error getting file context %s: %s\n", currLog, - strerror(errno)); - if (selinux_getenforce()) { - return 1; + } else { + message(MESS_ERROR, "error getting file context %s: %s\n", currLog, + strerror(errno)); + if (selinux_getenforce()) { + return 1; + } } - } - } + } #endif fdsave = open(saveLog, O_WRONLY | O_CREAT | O_TRUNC,sb->st_mode); #ifdef WITH_SELINUX if (selinux_enabled) { - setfscreatecon(prev_context); - if (prev_context!= NULL) { - freecon(prev_context); - prev_context=NULL; - } + setfscreatecon(prev_context); + if (prev_context!= NULL) { + freecon(prev_context); + prev_context=NULL; + } } #endif if (fdsave < 0) { @@ -533,27 +532,33 @@ #ifdef WITH_SELINUX if ((selinux_enabled=(is_selinux_enabled()>0))) { - security_context_t oldContext=NULL; - if (getfilecon(log->files[logNum], &oldContext)>0) { - if (getfscreatecon(&prev_context) < 0) { - message(MESS_ERROR, "error getting default context: %s\n", - strerror(errno)); - freecon(oldContext); - return 1; - } - if (setfscreatecon(oldContext) < 0) { - message(MESS_ERROR, "error setting file context %s to %s: %s\n", - log->files[logNum], oldContext,strerror(errno)); - freecon(oldContext); - return 1; - } - freecon(oldContext); - } else { - message(MESS_ERROR, "error getting file context %s: %s\n", - log->files[logNum], - strerror(errno)); - return 1; - } + security_context_t oldContext=NULL; + if (getfilecon(log->files[logNum], &oldContext)>0) { + if (getfscreatecon(&prev_context) < 0) { + message(MESS_ERROR, "error getting default context: %s\n", + strerror(errno)); + if (selinux_getenforce()) { + freecon(oldContext); + return 1; + } + } + if (setfscreatecon(oldContext) < 0) { + message(MESS_ERROR, "error setting file context %s to %s: %s\n", + log->files[logNum], oldContext,strerror(errno)); + if (selinux_getenforce()) { + freecon(oldContext); + return 1; + } + } + freecon(oldContext); + } else { + message(MESS_ERROR, "error getting file context %s: %s\n", + log->files[logNum], + strerror(errno)); + if (selinux_getenforce()) { + return 1; + } + } } #endif for (i = rotateCount + logStart - 1; (i >= 0) && !hasErrors; i--) { @@ -731,11 +736,11 @@ #ifdef WITH_SELINUX if (selinux_enabled) { - setfscreatecon(prev_context); - if (prev_context!= NULL) { - freecon(prev_context); - prev_context=NULL; - } + setfscreatecon(prev_context); + if (prev_context!= NULL) { + freecon(prev_context); + prev_context=NULL; + } } #endif return hasErrors; Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- logrotate.spec 17 Mar 2005 13:54:02 -0000 1.21 +++ logrotate.spec 17 Mar 2005 22:39:50 -0000 1.22 @@ -5,7 +5,7 @@ Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7.1 -Release: 8 +Release: 9 License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz @@ -13,6 +13,7 @@ Patch1: logrotate-3.7.1-man.patch Patch2: logrotate-3.7.1-conf.patch Patch3: logrotate-3.7.1-noTMPDIR.patch +Patch4: logrotate-3.7.1-selinux.patch BuildRoot: %{_tmppath}/%{name}-%{version}.root %description @@ -32,6 +33,7 @@ %patch1 -p1 -b .orig %patch2 -p1 -b .conf %patch3 -p1 -b .noTMPDIR +%patch4 -p1 -b .selinux %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \ @@ -64,6 +66,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Thu Mar 17 2005 Dan Walsh 3.7.1-9 +- Add selinux_getenforce() calls to work when not in enforcing mode + * Thu Mar 17 2005 Peter Vrabec 3.7.1-8 - rebuild From fedora-cvs-commits at redhat.com Thu Mar 17 22:11:18 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 17:11:18 -0500 Subject: rpms/GConf2/devel .cvsignore, 1.18, 1.19 GConf2.spec, 1.20, 1.21 sources, 1.18, 1.19 Message-ID: <200503172211.j2HMBIEI026027@cvs.devel.redhat.com> Update of /cvs/dist/rpms/GConf2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25987 Modified Files: .cvsignore GConf2.spec sources Log Message: - Update to 2.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 7 Feb 2005 17:36:28 -0000 1.18 +++ .cvsignore 17 Mar 2005 22:11:15 -0000 1.19 @@ -1 +1,2 @@ GConf-2.9.91.tar.bz2 +GConf-2.10.0.tar.bz2 Index: GConf2.spec =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- GConf2.spec 2 Mar 2005 16:55:09 -0000 1.20 +++ GConf2.spec 17 Mar 2005 22:11:15 -0000 1.21 @@ -4,8 +4,8 @@ Summary: A process-transparent configuration system Name: GConf2 -Version: 2.9.91 -Release: 2 +Version: 2.10.0 +Release: 1 License: LGPL Group: System Environment/Base Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2 @@ -93,8 +93,8 @@ %{_libdir}/pkgconfig/* %changelog -* Wed Mar 2 2005 Mark McLoughlin 2.9.91-2 -- Rebuild with gcc4 +* Thu Mar 17 2005 Ray Strode 2.10.0-1 +- Update to 2.10.0 * Mon Feb 7 2005 Mark McLoughlin 2.9.91-1 - Update to 2.9.91 Index: sources =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 7 Feb 2005 17:36:28 -0000 1.18 +++ sources 17 Mar 2005 22:11:15 -0000 1.19 @@ -1 +1 @@ -65cf7da6b91f168a8b9c9eb7503781d6 GConf-2.9.91.tar.bz2 +a7cd37be4e317195a6668a086fc72033 GConf-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 17 22:30:42 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 17:30:42 -0500 Subject: rpms/gconf-editor/devel .cvsignore, 1.13, 1.14 gconf-editor.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200503172230.j2HMUgNs007992@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gconf-editor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7978 Modified Files: .cvsignore gconf-editor.spec sources Log Message: - Update to upstream version 2.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gconf-editor/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 11 Feb 2005 16:45:58 -0000 1.13 +++ .cvsignore 17 Mar 2005 22:30:27 -0000 1.14 @@ -2,3 +2,4 @@ gconf-editor-2.8.0.tar.bz2 gconf-editor-2.9.3.tar.bz2 gconf-editor-2.9.91.tar.bz2 +gconf-editor-2.10.0.tar.bz2 Index: gconf-editor.spec =================================================================== RCS file: /cvs/dist/rpms/gconf-editor/devel/gconf-editor.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gconf-editor.spec 2 Mar 2005 17:04:40 -0000 1.18 +++ gconf-editor.spec 17 Mar 2005 22:30:27 -0000 1.19 @@ -7,8 +7,8 @@ Summary: Editor/admin tool for GConf Name: gconf-editor -Version: 2.9.91 -Release: 2 +Version: 2.10.0 +Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -77,6 +77,9 @@ %{_datadir}/omf/gconf-editor %changelog +* Thu Mar 17 2005 Ray Strode - 2.10.0-1 +- Update to upstream version 2.10.0 + * Wed Mar 2 2005 Mark McLoughlin 2.9.91-2 - Rebuild with gcc4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gconf-editor/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 11 Feb 2005 16:45:58 -0000 1.13 +++ sources 17 Mar 2005 22:30:27 -0000 1.14 @@ -1 +1 @@ -cfc48a184733b9b8557c0f1eea774476 gconf-editor-2.9.91.tar.bz2 +651a18f7eb5af91761521aa4f04ccc07 gconf-editor-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 17 22:14:18 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 17:14:18 -0500 Subject: rpms/evolution-data-server/devel .cvsignore, 1.21, 1.22 evolution-data-server.spec, 1.43, 1.44 sources, 1.21, 1.22 Message-ID: <200503172214.j2HMEIJk026197@cvs.devel.redhat.com> Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26180 Modified Files: .cvsignore evolution-data-server.spec sources Log Message: * Thu Mar 17 2005 David Malcolm - 1.2.1-1 - 1.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 8 Mar 2005 20:11:25 -0000 1.21 +++ .cvsignore 17 Mar 2005 22:14:16 -0000 1.22 @@ -1 +1 @@ -evolution-data-server-1.2.0.tar.bz2 +evolution-data-server-1.2.1.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- evolution-data-server.spec 10 Mar 2005 19:10:31 -0000 1.43 +++ evolution-data-server.spec 17 Mar 2005 22:14:16 -0000 1.44 @@ -32,8 +32,8 @@ Summary: Backend data server for evolution Name: evolution-data-server -Version: 1.2.0 -Release: 3 +Version: 1.2.1 +Release: 1 License: GPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -212,6 +212,9 @@ %changelog +* Thu Mar 17 2005 David Malcolm - 1.2.1-1 +- 1.2.1 + * Thu Mar 10 2005 David Malcolm - 1.2.0-3 - Removed explicit run-time spec-file requirement on mozilla. The Mozilla NSS API/ABI stabilised by version 1.7.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 8 Mar 2005 20:11:25 -0000 1.21 +++ sources 17 Mar 2005 22:14:16 -0000 1.22 @@ -1 +1 @@ -9a34499dc8e65af768ab1582803015ef evolution-data-server-1.2.0.tar.bz2 +c86cc41c1563f552015aebb563018936 evolution-data-server-1.2.1.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 17 22:58:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 17:58:04 -0500 Subject: rpms/audit/devel .cvsignore, 1.10, 1.11 audit.spec, 1.20, 1.21 sources, 1.10, 1.11 Message-ID: <200503172258.j2HMw4ZB022664@cvs.devel.redhat.com> Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22649 Modified Files: .cvsignore audit.spec sources Log Message: * Thu Mar 17 2005 Steve Grubb 0.6.9-1 - Added patch for filesystem watch - Added version information to audit start message - Change netlink code to use ack in order to get error notification Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 14 Mar 2005 21:08:53 -0000 1.10 +++ .cvsignore 17 Mar 2005 22:58:02 -0000 1.11 @@ -7,3 +7,4 @@ audit-0.6.6.tar.gz audit-0.6.7.tar.gz audit-0.6.8.tar.gz +audit-0.6.9.tar.gz Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- audit.spec 14 Mar 2005 21:08:53 -0000 1.20 +++ audit.spec 17 Mar 2005 22:58:02 -0000 1.21 @@ -1,6 +1,6 @@ Summary: User space tools for 2.6 kernel auditing. Name: audit -Version: 0.6.8 +Version: 0.6.9 Release: 1 License: GPL Group: System Environment/Daemons @@ -123,6 +123,11 @@ %changelog +* Thu Mar 17 2005 Steve Grubb 0.6.9-1 +- Added patch for filesystem watch +- Added version information to audit start message +- Change netlink code to use ack in order to get error notification + * Wed Mar 10 2005 Steve Grubb 0.6.8-1 - removed the pam_loginuid library - its going to pam Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 14 Mar 2005 21:08:53 -0000 1.10 +++ sources 17 Mar 2005 22:58:02 -0000 1.11 @@ -5,3 +5,4 @@ cde632731563e8b7e665cd50c9274139 audit-0.6.6.tar.gz 87dc88d07f8ec0e35a9c978818654577 audit-0.6.7.tar.gz 525186a68c02ad34620056792b64bd57 audit-0.6.8.tar.gz +afbda7c66f1a3fa5c09c83037edf278e audit-0.6.9.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 18 01:03:15 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 20:03:15 -0500 Subject: rpms/postgresql/FC-3 postgresql-7.4-getppid.patch, 1.1, 1.2 postgresql.spec, 1.40, 1.41 Message-ID: <200503180103.j2I13Fsv015062@cvs.devel.redhat.com> Update of /cvs/dist/rpms/postgresql/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv15047 Modified Files: postgresql-7.4-getppid.patch postgresql.spec Log Message: Fix the stale lockfile problem ... this time for sure ... (bug #151421) postgresql-7.4-getppid.patch: miscinit.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) Index: postgresql-7.4-getppid.patch =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-3/postgresql-7.4-getppid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- postgresql-7.4-getppid.patch 5 Oct 2004 15:32:24 -0000 1.1 +++ postgresql-7.4-getppid.patch 18 Mar 2005 01:03:12 -0000 1.2 @@ -1,12 +1,15 @@ -diff -Naur postgresql-7.4.5/src/backend/utils/init/miscinit.c postgresql-7.4.5-rh/src/backend/utils/init/miscinit.c ---- postgresql-7.4.5/src/backend/utils/init/miscinit.c 2003-09-26 11:27:37.000000000 -0400 -+++ postgresql-7.4.5-rh/src/backend/utils/init/miscinit.c 2004-10-04 19:56:40.893167096 -0400 -@@ -527,10 +527,13 @@ +diff -Naur postgresql-7.4.7.orig/src/backend/utils/init/miscinit.c postgresql-7.4.7/src/backend/utils/init/miscinit.c +--- postgresql-7.4.7.orig/src/backend/utils/init/miscinit.c 2003-09-26 11:27:37.000000000 -0400 ++++ postgresql-7.4.7/src/backend/utils/init/miscinit.c 2005-03-17 19:37:46.233120225 -0500 +@@ -527,13 +527,19 @@ /* * Check to see if the other process still exists * + * Reject parent PID too, so we are not fooled by parent shell -+ * during reboot. ++ * during reboot. Also, allow EPERM case: that implies the other ++ * process has a different UID, which implies it couldn't be a ++ * competing postmaster (data directory permissions checks ensure ++ * that a postmaster must have same UID as owner of data directory). + * * Normally kill() will fail with ESRCH if the given PID doesn't * exist. BeOS returns EINVAL for some silly reason, however. @@ -15,4 +18,8 @@ + if (other_pid != my_pid && other_pid != getppid()) { if (kill(other_pid, 0) == 0 || - (errno != ESRCH +- (errno != ESRCH ++ (errno != ESRCH && errno != EPERM + #ifdef __BEOS__ + && errno != EINVAL + #endif Index: postgresql.spec =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-3/postgresql.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- postgresql.spec 21 Feb 2005 19:26:48 -0000 1.40 +++ postgresql.spec 18 Mar 2005 01:03:12 -0000 1.41 @@ -67,7 +67,7 @@ # Pre-release RPM's should not be put up on the public ftp.postgresql.org server # -- only test releases or full releases should be. -Release: 3.FC3.1 +Release: 5.FC3.1 License: BSD Group: Applications/Databases Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 @@ -130,16 +130,6 @@ Obsoletes: postgresql-perl Obsoletes: postgresql-tk Obsoletes: rh-postgresql -Obsoletes: rh-postgresql-contrib -Obsoletes: rh-postgresql-devel -Obsoletes: rh-postgresql-docs -Obsoletes: rh-postgresql-jdbc -Obsoletes: rh-postgresql-libs -Obsoletes: rh-postgresql-pl -Obsoletes: rh-postgresql-python -Obsoletes: rh-postgresql-server -Obsoletes: rh-postgresql-tcl -Obsoletes: rh-postgresql-test Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -196,6 +186,7 @@ Summary: The shared libraries required for any PostgreSQL clients. Group: Applications/Databases Provides: libpq.so +Obsoletes: rh-postgresql-libs %description libs The postgresql-libs package provides the essential shared libraries for any @@ -207,8 +198,8 @@ Summary: The programs needed to create and run a PostgreSQL server. Group: Applications/Databases Prereq: /usr/sbin/useradd /sbin/chkconfig -Requires: postgresql = %{version} libpq.so -Conflicts: postgresql < 7.4 +Requires: postgresql = %{version}-%{release} libpq.so +Obsoletes: rh-postgresql-server %description server The postgresql-server package includes the programs needed to create @@ -225,6 +216,9 @@ %package docs Summary: Extra documentation for PostgreSQL Group: Applications/Databases +Requires: postgresql = %{version}-%{release} +Obsoletes: rh-postgresql-docs + %description docs The postgresql-docs package includes the SGML source for the documentation as well as the documentation in PDF format and some extra documentation. @@ -234,7 +228,9 @@ %package contrib Summary: Contributed source and binaries distributed with PostgreSQL Group: Applications/Databases -Requires: postgresql = %{version} +Requires: postgresql = %{version}-%{release} +Obsoletes: rh-postgresql-contrib + %description contrib The postgresql-contrib package contains contributed packages that are included in the PostgreSQL distribution. @@ -243,7 +239,9 @@ %package devel Summary: PostgreSQL development header files and libraries. Group: Development/Libraries -Requires: postgresql-libs = %{version} +Prereq: postgresql = %{version}-%{release} +Requires: postgresql-libs = %{version}-%{release} +Obsoletes: rh-postgresql-devel %description devel The postgresql-devel package contains the header files and libraries @@ -259,8 +257,9 @@ %package pl Summary: The PL procedural languages for PostgreSQL. Group: Applications/Databases -Requires: postgresql = %{version} -PreReq: postgresql-server = %{version} +Requires: postgresql = %{version}-%{release} +PreReq: postgresql-server = %{version}-%{release} +Obsoletes: rh-postgresql-pl %description pl PostgreSQL is an advanced Object-Relational database management @@ -273,7 +272,9 @@ %package tcl Summary: A Tcl client library for PostgreSQL. Group: Applications/Databases +Requires: libpq.so Requires: tcl >= 8.0 +Obsoletes: rh-postgresql-tcl %description tcl PostgreSQL is an advanced Object-Relational database management @@ -286,9 +287,10 @@ %package python Summary: Development module for Python code to access a PostgreSQL DB. Group: Applications/Databases +Requires: libpq.so Requires: python mx Conflicts: python < %pyver, python >= %pynextver - +Obsoletes: rh-postgresql-python %description python PostgreSQL is an advanced Object-Relational database management @@ -302,10 +304,11 @@ %package jdbc Summary: Files needed for Java programs to access a PostgreSQL database. Group: Applications/Databases +Obsoletes: rh-postgresql-jdbc %description jdbc PostgreSQL is an advanced Object-Relational database management -system. The postgresql-jdbc package includes the .jar file needed for +system. The postgresql-jdbc package includes the .jar files needed for Java programs to access a PostgreSQL database. %endif @@ -314,8 +317,9 @@ %package test Summary: The test suite distributed with PostgreSQL. Group: Applications/Databases -Requires: postgresql = %{version} -PreReq: postgresql-server = %{version} +Requires: postgresql = %{version}-%{release} +PreReq: postgresql-server = %{version}-%{release} +Obsoletes: rh-postgresql-test %description test PostgreSQL is an advanced Object-Relational database management @@ -802,6 +806,14 @@ %endif %changelog +* Thu Mar 17 2005 Tom Lane 7.4.7-5.FC3.1 +- Fix the stale lockfile problem ... this time for sure ... (bug #151421) + +* Wed Mar 2 2005 Tom Lane 7.4.7-4.FC3.1 +- Attach Obsoletes: declarations for rh-postgresql to subpackages (bz#144435) +- Make Requires: and Prereq: package linkages specify release not only + version, as per recent mailing list discussion. + * Mon Feb 21 2005 Tom Lane 7.4.7-3.FC3.1 - Work around selinux < Update of /cvs/dist/rpms/postgresql/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv15150 Modified Files: postgresql-7.4-getppid.patch postgresql.spec Log Message: Fix the stale lockfile problem ... this time for sure ... (bug #151421) postgresql-7.4-getppid.patch: miscinit.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) Index: postgresql-7.4-getppid.patch =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-2/postgresql-7.4-getppid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- postgresql-7.4-getppid.patch 8 Dec 2004 23:52:34 -0000 1.1 +++ postgresql-7.4-getppid.patch 18 Mar 2005 01:08:47 -0000 1.2 @@ -1,12 +1,15 @@ -diff -Naur postgresql-7.4.5/src/backend/utils/init/miscinit.c postgresql-7.4.5-rh/src/backend/utils/init/miscinit.c ---- postgresql-7.4.5/src/backend/utils/init/miscinit.c 2003-09-26 11:27:37.000000000 -0400 -+++ postgresql-7.4.5-rh/src/backend/utils/init/miscinit.c 2004-10-04 19:56:40.893167096 -0400 -@@ -527,10 +527,13 @@ +diff -Naur postgresql-7.4.7.orig/src/backend/utils/init/miscinit.c postgresql-7.4.7/src/backend/utils/init/miscinit.c +--- postgresql-7.4.7.orig/src/backend/utils/init/miscinit.c 2003-09-26 11:27:37.000000000 -0400 ++++ postgresql-7.4.7/src/backend/utils/init/miscinit.c 2005-03-17 19:37:46.233120225 -0500 +@@ -527,13 +527,19 @@ /* * Check to see if the other process still exists * + * Reject parent PID too, so we are not fooled by parent shell -+ * during reboot. ++ * during reboot. Also, allow EPERM case: that implies the other ++ * process has a different UID, which implies it couldn't be a ++ * competing postmaster (data directory permissions checks ensure ++ * that a postmaster must have same UID as owner of data directory). + * * Normally kill() will fail with ESRCH if the given PID doesn't * exist. BeOS returns EINVAL for some silly reason, however. @@ -15,4 +18,8 @@ + if (other_pid != my_pid && other_pid != getppid()) { if (kill(other_pid, 0) == 0 || - (errno != ESRCH +- (errno != ESRCH ++ (errno != ESRCH && errno != EPERM + #ifdef __BEOS__ + && errno != EINVAL + #endif Index: postgresql.spec =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-2/postgresql.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- postgresql.spec 21 Feb 2005 19:56:25 -0000 1.35 +++ postgresql.spec 18 Mar 2005 01:08:47 -0000 1.36 @@ -67,7 +67,7 @@ # Pre-release RPM's should not be put up on the public ftp.postgresql.org server # -- only test releases or full releases should be. -Release: 3.FC2.1 +Release: 5.FC2.1 License: BSD Group: Applications/Databases Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 @@ -129,16 +129,6 @@ Obsoletes: postgresql-perl Obsoletes: postgresql-tk Obsoletes: rh-postgresql -Obsoletes: rh-postgresql-contrib -Obsoletes: rh-postgresql-devel -Obsoletes: rh-postgresql-docs -Obsoletes: rh-postgresql-jdbc -Obsoletes: rh-postgresql-libs -Obsoletes: rh-postgresql-pl -Obsoletes: rh-postgresql-python -Obsoletes: rh-postgresql-server -Obsoletes: rh-postgresql-tcl -Obsoletes: rh-postgresql-test Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -195,6 +185,7 @@ Summary: The shared libraries required for any PostgreSQL clients. Group: Applications/Databases Provides: libpq.so +Obsoletes: rh-postgresql-libs %description libs The postgresql-libs package provides the essential shared libraries for any @@ -206,8 +197,8 @@ Summary: The programs needed to create and run a PostgreSQL server. Group: Applications/Databases Prereq: /usr/sbin/useradd /sbin/chkconfig -Requires: postgresql = %{version} libpq.so -Conflicts: postgresql < 7.4 +Requires: postgresql = %{version}-%{release} libpq.so +Obsoletes: rh-postgresql-server %description server The postgresql-server package includes the programs needed to create @@ -224,6 +215,9 @@ %package docs Summary: Extra documentation for PostgreSQL Group: Applications/Databases +Requires: postgresql = %{version}-%{release} +Obsoletes: rh-postgresql-docs + %description docs The postgresql-docs package includes the SGML source for the documentation as well as the documentation in PDF format and some extra documentation. @@ -233,7 +227,9 @@ %package contrib Summary: Contributed source and binaries distributed with PostgreSQL Group: Applications/Databases -Requires: postgresql = %{version} +Requires: postgresql = %{version}-%{release} +Obsoletes: rh-postgresql-contrib + %description contrib The postgresql-contrib package contains contributed packages that are included in the PostgreSQL distribution. @@ -242,7 +238,9 @@ %package devel Summary: PostgreSQL development header files and libraries. Group: Development/Libraries -Requires: postgresql-libs = %{version} +Prereq: postgresql = %{version}-%{release} +Requires: postgresql-libs = %{version}-%{release} +Obsoletes: rh-postgresql-devel %description devel The postgresql-devel package contains the header files and libraries @@ -258,8 +256,9 @@ %package pl Summary: The PL procedural languages for PostgreSQL. Group: Applications/Databases -Requires: postgresql = %{version} -PreReq: postgresql-server = %{version} +Requires: postgresql = %{version}-%{release} +PreReq: postgresql-server = %{version}-%{release} +Obsoletes: rh-postgresql-pl %description pl PostgreSQL is an advanced Object-Relational database management @@ -272,7 +271,9 @@ %package tcl Summary: A Tcl client library for PostgreSQL. Group: Applications/Databases +Requires: libpq.so Requires: tcl >= 8.0 +Obsoletes: rh-postgresql-tcl %description tcl PostgreSQL is an advanced Object-Relational database management @@ -285,9 +286,10 @@ %package python Summary: Development module for Python code to access a PostgreSQL DB. Group: Applications/Databases +Requires: libpq.so Requires: python mx Conflicts: python < %pyver, python >= %pynextver - +Obsoletes: rh-postgresql-python %description python PostgreSQL is an advanced Object-Relational database management @@ -301,10 +303,11 @@ %package jdbc Summary: Files needed for Java programs to access a PostgreSQL database. Group: Applications/Databases +Obsoletes: rh-postgresql-jdbc %description jdbc PostgreSQL is an advanced Object-Relational database management -system. The postgresql-jdbc package includes the .jar file needed for +system. The postgresql-jdbc package includes the .jar files needed for Java programs to access a PostgreSQL database. %endif @@ -313,8 +316,9 @@ %package test Summary: The test suite distributed with PostgreSQL. Group: Applications/Databases -Requires: postgresql = %{version} -PreReq: postgresql-server = %{version} +Requires: postgresql = %{version}-%{release} +PreReq: postgresql-server = %{version}-%{release} +Obsoletes: rh-postgresql-test %description test PostgreSQL is an advanced Object-Relational database management @@ -800,6 +804,14 @@ %endif %changelog +* Thu Mar 17 2005 Tom Lane 7.4.7-5.FC2.1 +- Fix the stale lockfile problem ... this time for sure ... (bug #151421) + +* Wed Mar 2 2005 Tom Lane 7.4.7-4.FC2.1 +- Attach Obsoletes: declarations for rh-postgresql to subpackages (bz#144435) +- Make Requires: and Prereq: package linkages specify release not only + version, as per recent mailing list discussion. + * Mon Feb 21 2005 Tom Lane 7.4.7-3.FC2.1 - Repair improper error message in init script when PGVERSION doesn't match. - Arrange for auto update of version embedded in init script. From fedora-cvs-commits at redhat.com Fri Mar 18 01:08:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 20:08:59 -0500 Subject: rpms/evolution/devel .cvsignore, 1.27, 1.28 evolution.spec, 1.62, 1.63 sources, 1.27, 1.28 Message-ID: <200503180108.j2I18xlE015223@cvs.devel.redhat.com> Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15149 Modified Files: .cvsignore evolution.spec sources Log Message: * Thu Mar 17 2005 David Malcolm - 2.2.1-1 - 2.2.1 - Updated requirements: * gtkhtml3 from 3.6.0 to 3.6.1 * libgal2 from 2.4.0 to 2.4.1 * eds from 1.2.0 to 1.2.1 - Added rum-time requirement on gnome-vfs2; updated version requirement from 2.0 to 2.4 - The new-mail-notify plugin will not be built for now since the upstream configure test now checks for dbus-glib-1 version <= 0.23.4 (to minimise problems caused by the API change) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 9 Mar 2005 00:51:42 -0000 1.27 +++ .cvsignore 18 Mar 2005 01:08:57 -0000 1.28 @@ -1 +1 @@ -evolution-2.2.0.tar.bz2 +evolution-2.2.1.tar.bz2 Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- evolution.spec 15 Mar 2005 03:41:59 -0000 1.62 +++ evolution.spec 18 Mar 2005 01:08:57 -0000 1.63 @@ -1,10 +1,10 @@ # no ppc64 mozilla ExcludeArch: ppc64 -%define gal_version 2:2.4.0 -%define gtkhtml_version 3.6.0 +%define gal_version 2:2.4.1 +%define gtkhtml_version 3.6.1 %define soup_version 2.2.2 -%define eds_version 1.2.0 +%define eds_version 1.2.1 %define use_mozilla_nss 1 %define evo_major 2.2 %define libbonoboui_version 2.4.2 @@ -12,6 +12,7 @@ %define gnome_icon_theme_version 1.3.6 %define libgnomeprint22_version 2.8.0 %define dbus_version 0.31 +%define gnomevfs2_version 2.4 ########################################################## # The Mozilla NSS API/ABI stabilised by version 1.7.3 @@ -34,8 +35,8 @@ %define nntp_support 1 Name: evolution -Version: 2.2.0 -Release: 10 +Version: 2.2.1 +Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -91,6 +92,7 @@ Requires: gnutls Requires: dbus >= %{dbus_version} Requires: libgnomeprint22 >= %{libgnomeprint22_version} +Requires: gnome-vfs2 >= %{gnomevfs2_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: libgal2-devel >= %{gal_version} @@ -98,7 +100,7 @@ BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: libbonobo-devel >= 2.0 BuildRequires: libbonoboui-devel >= %{libbonoboui_version} -BuildRequires: gnome-vfs2-devel >= 2.0 +BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libxml2-devel @@ -343,6 +345,15 @@ %{_libdir}/evolution/%{evo_major}/*/*.a %changelog +* Thu Mar 17 2005 David Malcolm - 2.2.1-1 +- 2.2.1 +- Updated requirements: + * gtkhtml3 from 3.6.0 to 3.6.1 + * libgal2 from 2.4.0 to 2.4.1 + * eds from 1.2.0 to 1.2.1 +- Added rum-time requirement on gnome-vfs2; updated version requirement from 2.0 to 2.4 +- The new-mail-notify plugin will not be built for now since the upstream configure test now checks for dbus-glib-1 version <= 0.23.4 (to minimise problems caused by the API change) + * Mon Mar 14 2005 David Malcolm - 2.2.0-10 - disabled pilot-link support for now so that we have an evolution package; more patching is needed to get this to work with pilot-link-0.12 Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 9 Mar 2005 00:51:42 -0000 1.27 +++ sources 18 Mar 2005 01:08:57 -0000 1.28 @@ -1 +1 @@ -a93991fb80c7fa88f6758661c8931f6b evolution-2.2.0.tar.bz2 +97b7d0257f3c8994964f703673661d34 evolution-2.2.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 01:18:33 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 Mar 2005 20:18:33 -0500 Subject: rpms/logrotate/devel logrotate-3.7.1-selinux.patch,1.1,1.2 Message-ID: <200503180118.j2I1IXax018499@cvs.devel.redhat.com> Update of /cvs/dist/rpms/logrotate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18484 Modified Files: logrotate-3.7.1-selinux.patch Log Message: * Thu Mar 17 2005 Dan Walsh 3.7.1-9 - Add selinux_getenforce() calls to work when not in enforcing mode logrotate-3.7.1-selinux.patch: logrotate.c | 126 +++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 71 insertions(+), 55 deletions(-) Index: logrotate-3.7.1-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/logrotate-3.7.1-selinux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logrotate-3.7.1-selinux.patch 17 Mar 2005 22:39:50 -0000 1.1 +++ logrotate-3.7.1-selinux.patch 18 Mar 2005 01:18:29 -0000 1.2 @@ -1,6 +1,14 @@ ---- logrotate-3.7.1/logrotate.c~ 2005-03-17 12:48:27.192521752 -0500 -+++ logrotate-3.7.1/logrotate.c 2005-03-17 12:58:25.661540632 -0500 -@@ -250,44 +250,43 @@ +--- logrotate-3.7.1/logrotate.c.selinux 2005-03-17 20:03:37.260188128 -0500 ++++ logrotate-3.7.1/logrotate.c 2005-03-17 20:15:01.472172096 -0500 +@@ -16,6 +16,7 @@ + #include + static security_context_t prev_context=NULL; + int selinux_enabled=0; ++int selinux_enforce=0; + #endif + + #include "basenames.h" +@@ -250,38 +251,43 @@ return 1; } #ifdef WITH_SELINUX @@ -11,14 +19,29 @@ - if (getfscreatecon(&prev_context) < 0) { - message(MESS_ERROR, "error getting default context: %s\n", - strerror(errno)); -- if (selinux_getenforce()) { -+ if ((selinux_enabled=(is_selinux_enabled()>0))) { +- freecon(oldContext); +- return 1; +- } +- if (setfscreatecon(oldContext) < 0) { +- message(MESS_ERROR, "error setting file context %s to %s: %s\n", +- saveLog, oldContext,strerror(errno)); +- freecon(oldContext); +- return 1; +- } +- freecon(oldContext); +- } else { +- message(MESS_ERROR, "error getting file context %s: %s\n", currLog, +- strerror(errno)); +- return 1; +- } +- } ++ if (selinux_enabled) { + security_context_t oldContext; + if (fgetfilecon(fdcurr, &oldContext) >=0) { + if (getfscreatecon(&prev_context) < 0) { + message(MESS_ERROR, "error getting default context: %s\n", + strerror(errno)); -+ if (selinux_getenforce()) { ++ if (selinux_enforce) { + freecon(oldContext); + return 1; + } @@ -26,38 +49,19 @@ + if (setfscreatecon(oldContext) < 0) { + message(MESS_ERROR, "error setting file context %s to %s: %s\n", + saveLog, oldContext,strerror(errno)); -+ if (selinux_getenforce()) { ++ if (selinux_enforce) { + freecon(oldContext); + return 1; + } + } - freecon(oldContext); -- return 1; -- } -- } -- if (setfscreatecon(oldContext) < 0) { -- message(MESS_ERROR, "error setting file context %s to %s: %s\n", -- saveLog, oldContext,strerror(errno)); -- if (selinux_getenforce()) { -- freecon(oldContext); -- return 1; -- } -- } -- freecon(oldContext); -- } else { -- message(MESS_ERROR, "error getting file context %s: %s\n", currLog, -- strerror(errno)); -- if (selinux_getenforce()) { -- return 1; ++ freecon(oldContext); + } else { + message(MESS_ERROR, "error getting file context %s: %s\n", currLog, + strerror(errno)); -+ if (selinux_getenforce()) { ++ if (selinux_enforce) { + return 1; + } - } -- } -- } ++ } + } #endif fdsave = open(saveLog, O_WRONLY | O_CREAT | O_TRUNC,sb->st_mode); @@ -76,10 +80,11 @@ } #endif if (fdsave < 0) { -@@ -533,27 +532,33 @@ +@@ -526,28 +532,34 @@ + (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext); #ifdef WITH_SELINUX - if ((selinux_enabled=(is_selinux_enabled()>0))) { +- if ((selinux_enabled=(is_selinux_enabled()>0))) { - security_context_t oldContext=NULL; - if (getfilecon(log->files[logNum], &oldContext)>0) { - if (getfscreatecon(&prev_context) < 0) { @@ -101,12 +106,13 @@ - strerror(errno)); - return 1; - } ++ if (selinux_enabled) { + security_context_t oldContext=NULL; + if (getfilecon(log->files[logNum], &oldContext)>0) { + if (getfscreatecon(&prev_context) < 0) { + message(MESS_ERROR, "error getting default context: %s\n", + strerror(errno)); -+ if (selinux_getenforce()) { ++ if (selinux_enforce) { + freecon(oldContext); + return 1; + } @@ -114,7 +120,7 @@ + if (setfscreatecon(oldContext) < 0) { + message(MESS_ERROR, "error setting file context %s to %s: %s\n", + log->files[logNum], oldContext,strerror(errno)); -+ if (selinux_getenforce()) { ++ if (selinux_enforce) { + freecon(oldContext); + return 1; + } @@ -124,14 +130,14 @@ + message(MESS_ERROR, "error getting file context %s: %s\n", + log->files[logNum], + strerror(errno)); -+ if (selinux_getenforce()) { ++ if (selinux_enforce) { + return 1; + } + } } #endif for (i = rotateCount + logStart - 1; (i >= 0) && !hasErrors; i--) { -@@ -731,11 +736,11 @@ +@@ -725,11 +737,11 @@ #ifdef WITH_SELINUX if (selinux_enabled) { @@ -148,3 +154,14 @@ } #endif return hasErrors; +@@ -1087,6 +1099,10 @@ + exit(1); + } + ++#ifdef WITH_SELINUX ++ selinux_enabled=(is_selinux_enabled()>0); ++ selinux_getenforcemode(&selinux_enforce); ++#endif + for (file = files; *file; file++) { + if (readConfigPath(*file, &defConfig, &logs, &numLogs)) { + exit(1); From fedora-cvs-commits at redhat.com Fri Mar 18 07:16:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 02:16:04 -0500 Subject: rpms/slang/devel slang-1.4.9-gcc4.patch, NONE, 1.1 slang.spec, 1.21, 1.22 Message-ID: <200503180716.j2I7G4tW027971@cvs.devel.redhat.com> Update of /cvs/dist/rpms/slang/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27931 Modified Files: slang.spec Added Files: slang-1.4.9-gcc4.patch Log Message: * Fri Mar 18 2005 Petr Rockai - 1.4.9-17 - Patch to compile with gcc4 by Robert Scheck (#151029). slang-1.4.9-gcc4.patch: slposio.c | 2 +- sltoken.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE slang-1.4.9-gcc4.patch --- Patch by Robert Scheck for slang >= 1.4.9, which makes slang rebuildable using gcc 4. --- slang-1.4.9/src/sltoken.c 2003-03-23 08:06:40.000000000 +0100 +++ slang-1.4.9/src/sltoken.c.gcc4 2005-03-14 09:01:16.000000000 +0100 @@ -789,7 +789,7 @@ #if _SLANG_HAS_DEBUG_CODE tok->line_number++; #endif - Input_Line = LLT->read(LLT); + Input_Line = (LLT->read) (LLT); if ((NULL == Input_Line) || SLang_Error) { Input_Line_Pointer = Input_Line = NULL; @@ -1185,7 +1185,7 @@ { case '\n': case 0: - if (NULL == (Input_Line = LLT->read(LLT))) + if (NULL == (Input_Line = (LLT->read) (LLT))) { Input_Line_Pointer = Input_Line = NULL; return; --- slang-1.4.9/src/slposio.c 2003-03-23 08:06:40.000000000 +0100 +++ slang-1.4.9/src/slposio.c.gcc4 2005-03-14 09:03:00.000000000 +0100 @@ -166,7 +166,7 @@ || (NULL == (b = SLmalloc (len + 1)))) goto return_error; - if (-1 == f->read (f->fd, b, &len)) + if (-1 == (f->read) (f->fd, b, &len)) { _SLerrno_errno = errno; goto return_error; Index: slang.spec =================================================================== RCS file: /cvs/dist/rpms/slang/devel/slang.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- slang.spec 2 Mar 2005 14:20:42 -0000 1.21 +++ slang.spec 18 Mar 2005 07:16:02 -0000 1.22 @@ -1,7 +1,7 @@ Summary: The shared library for the S-Lang extension language. Name: slang Version: 1.4.9 -Release: 16 +Release: 17 License: GPL Group: System Environment/Libraries Source: ftp://space.mit.edu/pub/davis/slang/v1.4/slang-%{version}.tar.bz2 @@ -10,6 +10,7 @@ Patch2: slang-utf8-acs.patch Patch3: slang-1.4.5-utf8-segv.patch Patch4: slang-utf8-fix.patch +Patch5: slang-1.4.9-gcc4.patch Url: http://www.s-lang.org/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libtool, libtermcap-devel @@ -44,6 +45,7 @@ %patch2 -p1 -b .acs %patch3 -p1 -b .segv %patch4 -p1 -b .utf8-fix +%patch5 -p1 -b .gcc4 cp %{SOURCE2} . @@ -86,6 +88,11 @@ %{_includedir}/slang %changelog +* Fri Mar 18 2005 Petr Rockai - 1.4.9-17 +- Patch to compile with gcc4 by Robert Scheck (#151029). (Weeird, + probably on march 2nd the used buildroot wasn't updated with + gcc4 yet?). + * Wed Mar 02 2005 Petr Rockai - rebuild From fedora-cvs-commits at redhat.com Fri Mar 18 07:37:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 02:37:41 -0500 Subject: rpms/iiimf-le-chinput/devel iiimf-le-chinput.spec,1.11,1.12 Message-ID: <200503180737.j2I7bf7x006627@cvs.devel.redhat.com> Update of /cvs/dist/rpms/iiimf-le-chinput/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6614 Modified Files: iiimf-le-chinput.spec Log Message: rebuild with gcc4 Index: iiimf-le-chinput.spec =================================================================== RCS file: /cvs/dist/rpms/iiimf-le-chinput/devel/iiimf-le-chinput.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- iiimf-le-chinput.spec 19 Nov 2004 02:49:40 -0000 1.11 +++ iiimf-le-chinput.spec 18 Mar 2005 07:37:39 -0000 1.12 @@ -3,7 +3,7 @@ Summary: A Simplified Chinese language engine for im-sdk Name: iiimf-le-chinput Version: 0.3 -Release: 14 +Release: 15 License: Distributable Source: %{name}-%{version}.tar.bz2 URL: http://people.redhat.com/yshao/im-sdk/ @@ -73,6 +73,9 @@ %{im_dir}/* %changelog +* Thu Mar 17 2005 Warren Togami 0.3-15 +- rebuild with gcc4 + * Thu Nov 18 2004 Yu Shao 0.3-14 - rebuild From fedora-cvs-commits at redhat.com Fri Mar 18 07:41:37 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 02:41:37 -0500 Subject: rpms/iiimf-le-chinput/devel iiimf-le-chinput-switch_off_luc-ia64_prototype.patch, NONE, 1.1 iiimf-le-chinput-preedit.patch, 1.5, 1.6 iiimf-le-chinput.spec, 1.12, 1.13 Message-ID: <200503180741.j2I7fb3c006699@cvs.devel.redhat.com> Update of /cvs/dist/rpms/iiimf-le-chinput/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6682 Modified Files: iiimf-le-chinput-preedit.patch iiimf-le-chinput.spec Added Files: iiimf-le-chinput-switch_off_luc-ia64_prototype.patch Log Message: merge fixes from FC3/RHEL4 iiimf-le-chinput-switch_off_luc-ia64_prototype.patch: chinput.c | 5 ++++- xaux/status.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE iiimf-le-chinput-switch_off_luc-ia64_prototype.patch --- diff -uNr iiimf-le-chinput-0.3.orig/src/chinput.c iiimf-le-chinput-0.3/src/chinput.c --- iiimf-le-chinput-0.3.orig/src/chinput.c 2004-12-01 18:14:28.216260848 +0800 +++ iiimf-le-chinput-0.3/src/chinput.c 2004-12-01 18:15:35.924967560 +0800 @@ -920,6 +920,7 @@ ) { MyDataPerSession *session_data = (MyDataPerSession *) s->specific_data; + iml_inst *lp; #ifdef DEBUG printf("if_chinput_UnsetSCFocus()\n"); debugprint(s); @@ -931,7 +932,9 @@ memset(session_data->conversion_string, 0, sizeof(UTFCHAR) * BUFSIZE); session_data->caret_pos = -1; preedit_draw(s); - //lookup_draw(s, NULL, 0); + lp = (iml_inst*)s->If->m->iml_make_lookup_done_inst(s); + s->If->m->iml_execute(s, &lp); + session_data->luc_start = False; IMM_ResetInput(chinput_imm); int pIntegerList[1]; char *pStrings[1]; diff -uNr iiimf-le-chinput-0.3.orig/src/xaux/status.c iiimf-le-chinput-0.3/src/xaux/status.c --- iiimf-le-chinput-0.3.orig/src/xaux/status.c 2004-12-01 18:14:28.215261000 +0800 +++ iiimf-le-chinput-0.3/src/xaux/status.c 2004-12-01 18:17:15.033900712 +0800 @@ -98,6 +98,7 @@ /* Create a new hbox with an image and a label packed into it * and return the box. */ +GtkWidget* create_icon_from_xpm (const char **xpm, int width, int height, iiimf-le-chinput-preedit.patch: chinput.c | 19 +++++++++++++++---- inpinyin.h | 1 + wrapper.c | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) Index: iiimf-le-chinput-preedit.patch =================================================================== RCS file: /cvs/dist/rpms/iiimf-le-chinput/devel/iiimf-le-chinput-preedit.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iiimf-le-chinput-preedit.patch 30 Oct 2004 09:12:34 -0000 1.5 +++ iiimf-le-chinput-preedit.patch 18 Mar 2005 07:41:33 -0000 1.6 @@ -42,15 +42,7 @@ int i; int r; -@@ -821,6 +821,7 @@ - #ifdef DEBUG - printf("if_chinput_SetSCValue(), set my conversion on.\n"); - #endif -+ IMM_ResetInput(chinput_imm); - my_conversion_on(s); - break; - -@@ -920,10 +921,20 @@ +@@ -920,10 +920,20 @@ iml_session_t * s ) { @@ -71,7 +63,7 @@ } void -@@ -1099,11 +1110,12 @@ +@@ -1099,11 +1109,12 @@ printf("imdata->labeltype=%d\n",imdata->labeltype); } Index: iiimf-le-chinput.spec =================================================================== RCS file: /cvs/dist/rpms/iiimf-le-chinput/devel/iiimf-le-chinput.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- iiimf-le-chinput.spec 18 Mar 2005 07:37:39 -0000 1.12 +++ iiimf-le-chinput.spec 18 Mar 2005 07:41:34 -0000 1.13 @@ -3,7 +3,7 @@ Summary: A Simplified Chinese language engine for im-sdk Name: iiimf-le-chinput Version: 0.3 -Release: 15 +Release: 17 License: Distributable Source: %{name}-%{version}.tar.bz2 URL: http://people.redhat.com/yshao/im-sdk/ @@ -18,6 +18,8 @@ Patch1: iiimf-le-chinput-preedit.patch Patch2: iiimf-le-chinput-auxoff.patch Patch3: iiimf-le-chinput-build.patch +Patch4: iiimf-le-chinput-wait-ext.patch +Patch5: iiimf-le-chinput-switch_off_luc-ia64_prototype.patch Requires(post): %{_bindir}/iiimf-le-tools, %{_bindir}/killall Requires(preun): %{_bindir}/iiimf-le-tools @@ -39,6 +41,8 @@ %patch1 -p1 -b .preedit %patch2 -p1 -b .auxoff %patch3 -p1 -b .build +%patch4 -p1 -b .wait-ext +%patch5 -p1 -b .switch_off_luc-ia64_prototype %build aclocal -I m4 @@ -73,9 +77,16 @@ %{im_dir}/* %changelog -* Thu Mar 17 2005 Warren Togami 0.3-15 +* Thu Mar 17 2005 Warren Togami 0.3-17 - rebuild with gcc4 +* Wed Dec 1 2004 Yu Shao 0.3-16 +- fix bug 141090, Clear lookup window after switching IC +- fix bug 140692, Aux is not up on IA64 + +* Wed Nov 24 2004 Yu Shao 0.3-15 +- fix bug 136135, LE aux window not displayed after switching LE to it + * Thu Nov 18 2004 Yu Shao 0.3-14 - rebuild From fedora-cvs-commits at redhat.com Fri Mar 18 07:44:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 02:44:04 -0500 Subject: rpms/iiimf-le-chinput/devel iiimf-le-chinput-wait-ext.patch, NONE, 1.1 Message-ID: <200503180744.j2I7i4dA006781@cvs.devel.redhat.com> Update of /cvs/dist/rpms/iiimf-le-chinput/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6767 Added Files: iiimf-le-chinput-wait-ext.patch Log Message: sigh... another missing patch iiimf-le-chinput-wait-ext.patch: xaux_so_common.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletion(-) --- NEW FILE iiimf-le-chinput-wait-ext.patch --- --- iiimf-le-chinput-0.3/src/xaux/xaux_so_common.c.orig 2004-11-24 13:39:56.496333448 +0800 +++ iiimf-le-chinput-0.3/src/xaux/xaux_so_common.c 2004-11-24 13:41:03.486149448 +0800 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -293,7 +294,15 @@ execl(ext, xc->classname, NULL); _exit(1); } - + + time_t start_t, curr_t; + int default_timeoff = 30; + time(&start_t); + while (xaux_so_get_extwin(xc, aux->service->display(aux)) != True){ + time(&curr_t); + if ((curr_t - start_t) > default_timeoff) return False; + }; + /* parent */ return True; } From fedora-cvs-commits at redhat.com Fri Mar 18 08:54:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 03:54:44 -0500 Subject: rpms/openoffice.org/devel workspace-gcj4.patch, NONE, 1.1 openoffice.org.spec, 1.101, 1.102 sources, 1.40, 1.41 Message-ID: <200503180854.j2I8si8s016950@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16934 Modified Files: openoffice.org.spec sources Added Files: workspace-gcj4.patch Log Message: add a Requires on libgcj for hsqldb and try out gcj-dbtool for speeding up the java part of the build process workspace-gcj4.patch: bin/deliver.pl | 0 config_office/configure.in | 21 +++++++++++++++++++++ config_office/set_soenv.in | 8 +++++++- inc/settings.mk | 0 solenv/bin/deliver.pl | 22 ++++++++++++++++++++++ solenv/inc/settings.mk | 2 +- 6 files changed, 51 insertions(+), 2 deletions(-) --- NEW FILE workspace-gcj4.patch --- Index: configure.in =================================================================== RCS file: /cvs/tools/config_office/configure.in,v retrieving revision 1.106 diff -u -p -r1.106 configure.in --- openoffice.org.orig/config_office/configure.in 8 Mar 2005 16:31:52 -0000 1.106 +++ openoffice.org/config_office/configure.in 18 Mar 2005 08:22:43 -0000 @@ -1843,6 +1852,27 @@ AC_SUBST(JAVAINTERPRETER) AC_SUBST(JAVACOMPILER) AC_SUBST(JAVADOC) +dnl =================================================================== +dnl Check for optional gcj-dbtool +dnl =================================================================== +if test "$JDK" == "gcj"; then + javacache=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"` + javacache="$javacache""-dbtool" + if test -z "$with_jdk_home"; then + AC_PATH_PROG(JAVACACHE, $javacache) + else + _javac_path="$with_jdk_home/bin/$javacache" + dnl Check if there is a gcj-dbtool at all. + if test -x "$_javac_path"; then + JAVACACHE=$_javac_path + fi + fi + if test -z "$JAVACACHE"; then + AC_MSG_WARN([$javacache not found set with_jdk_home]) + fi +fi +AC_SUBST(JAVACACHE) + if test "$NEEDXSLTPROC" = "no"; then XSLTPROC=NO_XSLTPROC else Index: set_soenv.in =================================================================== RCS file: /cvs/tools/config_office/set_soenv.in,v retrieving revision 1.52 diff -u -p -r1.52 set_soenv.in --- openoffice.org.orig/config_office/set_soenv.in 8 Mar 2005 16:35:34 -0000 1.52 +++ openoffice.org/config_office/set_soenv.in 18 Mar 2005 08:22:44 -0000 @@ -78,7 +78,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV $UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB, $URD_ONLY, $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, - $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, + $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $GCJ_DATABASE, $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $NMAKE_PATH, $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, @@ -848,6 +849,8 @@ $CLASSPATH = '$JAVA_HOME'.$ds # Location of the JDK supported standard classes.zip file. # see above for why the change $XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.'; +# Localtion of gcj cache +$GCJ_DATABASE = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.$ds."openoffice.org.gcjdb"; # Paths to run time shared libraries. if ($platform =~ m/solaris/) @@ -1585,6 +1594,10 @@ if ( $JDK ne "gcj" ) { ToFile( "CLASSPATH", $CLASSPATH, "e" ); ToFile( "XCLASSPATH", $XCLASSPATH, "e" ); } +else { + ToFile( "GCJ_DATABASE", $GCJ_DATABASE, "e" ); + ToFile( "JAVACACHE", '@JAVACACHE@', "e" ); +} if ( $platform =~ m/darwin/ ) { ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH, "e" ); } Index: bin/deliver.pl =================================================================== RCS file: /cvs/tools/solenv/bin/deliver.pl,v retrieving revision 1.78 diff -u -p -r1.78 deliver.pl --- openoffice.org.orig/solenv/bin/deliver.pl 14 Jan 2005 11:33:44 -0000 1.78 +++ openoffice.org/solenv/bin/deliver.pl 18 Mar 2005 08:07:14 -0000 @@ -702,6 +702,15 @@ sub is_unstripped { return ''; } +sub is_jar { + my $file_name = shift; + + if (-f $file_name && (( `file $file_name` ) =~ /Zip archive/o)) { + return '1' if ($file_name =~ /\.jar\.*/o); + }; + return ''; +} + sub execute_system { my $command = shift; if (system($command)) { @@ -718,6 +727,16 @@ sub strip_target { return $rc; }; +sub cachejar { + my $file = shift; + my $to = $file.".so"; + print "CACHEJAR: $file -> $to with $ENV{GCJ_DATABASE}\n"; + print "Caching 1/2: $ENV{JAVACOMPILER} -shared -findirect-dispatch -fjni -o $to $file\n"; + execute_system("$ENV{JAVACOMPILER} -shared -findirect-dispatch -fjni -o $to $file"); + print "Caching 2/2: $ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to\n"; + execute_system("$ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to"); +}; + sub copy_if_newer { # return 0 if file is unchanged ( for whatever reason ) @@ -776,6 +795,9 @@ sub copy_if_newer fix_file_permissions($$from_stat_ref[2], $temp_file); $rc = rename($temp_file, $to); if ( $rc ) { + if ($ENV{JDK} eq 'gcj' && is_jar($from)) { + cachejar($to); + } # handle special packaging of *.dylib files for Mac OS X if ( $^O eq 'darwin' ) { Index: inc/settings.mk =================================================================== RCS file: /cvs/tools/solenv/inc/settings.mk,v retrieving revision 1.166 diff -u -p -r1.166 settings.mk --- openoffice.org.orig/solenv/inc/settings.mk 1 Mar 2005 16:14:15 -0000 1.166 +++ openoffice.org/solenv/inc/settings.mk 18 Mar 2005 08:07:43 -0000 @@ -209,7 +209,7 @@ JAVADOC=javadoc -J-Xmx120m .IF "$(JDK)" == "gcj" #JAVAC=$(JAVACOMPILER) -g -fno-assert -Wno-deprecated -C JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -g -fno-assert -Wno-deprecated -C -JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.runtime.VMClassLoader.library_control=never +JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE) .ELSE JAVAC=$(JAVACOMPILER) JAVAI=$(JAVAINTERPRETER) Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- openoffice.org.spec 17 Mar 2005 15:54:47 -0000 1.101 +++ openoffice.org.spec 18 Mar 2005 08:54:41 -0000 1.102 @@ -53,6 +53,7 @@ Patch21: openoffice.org-1.9.85.ooo45146.mandrakelicence.patch Patch22: openoffice.org-1.9.84.ooo45162.svxcasting2.patch Patch23: openoffice.org-1.9.85.ooo44853.rpmbuilddir.patch +Patch24: workspace-gcj4.patch %define instdir %{_libdir}/openoffice.org%{version} @@ -85,7 +86,7 @@ Group: Applications/Productivity Requires: libart_lgpl >= 2.3.11, zlib, freetype, cups, curl, libxml2, openldap Requires: gtk2, gnome-vfs2, mozilla-nss >= 1.7.5, neon >= 0.24 -Requires: startup-notification +Requires: startup-notification, libgcj >= %{gcjver} PreReq: desktop-file-utils >= 0.9 Obsoletes: openoffice.org Obsoletes: openoffice.org-libs @@ -524,8 +525,8 @@ %patch5 -p1 -b .mktemp %patch6 -p1 -b .singleton %patch7 -p1 -b .wmclass.patch -%patch8 -p1 -b .ignoremissing.patch -%patch9 -p1 -b .workspace-gccfour +%patch8 -p1 -b .ignoremissing.patch +%patch9 -p1 -b .workspace-gccfour %patch10 -p1 -b .scboost.patch %patch11 -p1 -b .qadevOOogcj.patch %patch12 -p1 -b .noznow.patch @@ -540,6 +541,7 @@ %patch21 -p1 -b .mandrakelicence.patch %patch22 -p1 -b .svxcasting2.patch %patch23 -p1 -b .rpmbuilddir.patch +%patch24 -p1 -b .workspace-gcj4.patch cd solenv/bin tar xvzf %{SOURCE2} Archive-Zip-1.13/lib cd ../.. @@ -2078,6 +2080,7 @@ - bump to latest version - add the contrib non-core dictionaries, and allow them to be split up between the languagepacks +- use gcj-dbtool during build * Wed Mar 09 2005 Caolan McNamara 1:1.9.84-1 - bump to 1.9.84 Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 17 Mar 2005 13:49:30 -0000 1.40 +++ sources 18 Mar 2005 08:54:42 -0000 1.41 @@ -1,3 +1,3 @@ c94a123e4006b410706a5b550f007e93 Archive-Zip-1.13.tar.gz -4b2fb542c11df811d0517de40e8b1de0 openoffice.org-myspell-contrib.tar.gz 2828d37e2bf9c6943a991465c542f815 SRC680_m85.tar.bz2 +0ec1ff5be35855e61096ce561cef8422 openoffice.org-myspell-contrib.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 18 08:56:26 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 03:56:26 -0500 Subject: rpms/ncompress/devel ncompress.spec,1.13,1.14 Message-ID: <200503180856.j2I8uQbr017008@cvs.devel.redhat.com> Update of /cvs/dist/rpms/ncompress/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16996 Modified Files: ncompress.spec Log Message: rebuilt Index: ncompress.spec =================================================================== RCS file: /cvs/dist/rpms/ncompress/devel/ncompress.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ncompress.spec 10 Feb 2005 10:35:47 -0000 1.13 +++ ncompress.spec 18 Mar 2005 08:56:23 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Fast compression and decompression utilities. Name: ncompress Version: 4.2.4 -Release: 41 +Release: 42 License: distributable Group: Applications/File Source: ftp://metalab.unc.edu/pub/Linux/utils/compress/ncompress-4.2.4.tar.Z @@ -67,6 +67,9 @@ %doc LZW.INFO README %changelog +* Fri Mar 18 2005 Peter Vrabec +- rebuilt + * Thu Feb 08 2005 Peter Vrabec - rebuilt From fedora-cvs-commits at redhat.com Fri Mar 18 09:15:33 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 04:15:33 -0500 Subject: rpms/pax/devel pax.spec,1.11,1.12 Message-ID: <200503180915.j2I9FXZC020771@cvs.devel.redhat.com> Update of /cvs/dist/rpms/pax/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20758 Modified Files: pax.spec Log Message: rebuilt Index: pax.spec =================================================================== RCS file: /cvs/dist/rpms/pax/devel/pax.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- pax.spec 21 Oct 2004 10:30:33 -0000 1.11 +++ pax.spec 18 Mar 2005 09:15:31 -0000 1.12 @@ -1,7 +1,7 @@ Summary: POSIX File System Archiver Name: pax Version: 3.0 -Release: 10 +Release: 11 License: BSD Group: Applications/Archiving Source: %{name}-%{version}.tar.bz2 @@ -35,6 +35,9 @@ %doc %{_mandir}/man1/* %changelog +* Fri Mar 18 2005 Peter Vrabec 3.0-11 +- rebuilt + * Thu Oct 21 2004 Peter Vrabec - fix PAXPATHLEN (#132857) From fedora-cvs-commits at redhat.com Fri Mar 18 09:36:21 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 04:36:21 -0500 Subject: rpms/pwlib/devel .cvsignore, 1.8, 1.9 pwlib.spec, 1.20, 1.21 sources, 1.8, 1.9 pwlib-1.6.3-libname.patch, 1.1, NONE pwlib-1.6.3-make_j.patch, 1.1, NONE pwlib-1.6.5-debuginfo.patch, 1.1, NONE Message-ID: <200503180936.j2I9aLHq031991@cvs.devel.redhat.com> Update of /cvs/dist/rpms/pwlib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31976 Modified Files: .cvsignore pwlib.spec sources Removed Files: pwlib-1.6.3-libname.patch pwlib-1.6.3-make_j.patch pwlib-1.6.5-debuginfo.patch Log Message: Update to new release and cleanup of spec file, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pwlib/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Dec 2004 04:00:38 -0000 1.8 +++ .cvsignore 18 Mar 2005 09:36:18 -0000 1.9 @@ -1 +1,2 @@ pwlib-v1_8_3-src-tar.gz +pwlib-1.8.4.tar.gz Index: pwlib.spec =================================================================== RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- pwlib.spec 17 Mar 2005 08:44:42 -0000 1.20 +++ pwlib.spec 18 Mar 2005 09:36:18 -0000 1.21 @@ -1,21 +1,15 @@ Summary: Portable Windows Libary Name: pwlib -Version: 1.8.3 -%define tar_version 1_8_3 -Release: 2 +Version: 1.8.4 +Release: 1 URL: http://www.openh323.org/ -Source0: pwlib-v%{tar_version}-src-tar.gz - -#We need this for ppc64 +Source0: http://www.seconix.com/pwlib-%{version}.tar.gz +#We still need this for ppc64 it was not updated in 1.8.4 Source1: config.guess License: MPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root -#Patch1: pwlib-1.6.3-libname.patch -#Patch2: pwlib-1.6.3-make_j.patch -#Patch3: pwlib-1.4.7-bison.patch -Patch4: pwlib-1.6.5-debuginfo.patch -#Patch5: pwlib-1.6.5-sasl_reorder.patch +Patch0: pwlib-1.6.5-debuginfo.patch BuildPrereq: expat openssl-devel pkgconfig %ifnarch s390 s390x @@ -45,16 +39,12 @@ The pwlib-devel package includes the libraries and header files for pwlib. %prep -%setup -q -n pwlib -#%patch1 -p1 -b .libname -##%patch2 -p1 -b .make_j -#%patch3 -p1 -b .bison -%patch4 -p1 -b .debuginfo -#%patch5 -p1 -b .sasl_reorder -cp -f %{SOURCE1} . +%setup -q +%patch0 -p1 -b .debuginfo +cp -f %{SOURCE1} . %build -%configure --enable-plugins #--enable-v4l2 +%configure --enable-plugins make %install @@ -101,6 +91,10 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Fri Mar 18 2005 Daniel Veillard 1.8.4-1 +- Updated to 1.8.4 from gnomemeeting release 1.8.1 +- cleanup and update of the spec file + * Thu Mar 17 2005 Christopher Aillon 1.8.3-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/pwlib/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Dec 2004 04:00:38 -0000 1.8 +++ sources 18 Mar 2005 09:36:18 -0000 1.9 @@ -1 +1 @@ -082e0ca640c3dd81c637b6d6a3c9b4b3 pwlib-v1_8_3-src-tar.gz +fc638a64216b7751271c539ee4ccd0a8 pwlib-1.8.4.tar.gz --- pwlib-1.6.3-libname.patch DELETED --- --- pwlib-1.6.3-make_j.patch DELETED --- --- pwlib-1.6.5-debuginfo.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 18 09:40:46 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 04:40:46 -0500 Subject: rpms/procmail/devel procmail.spec,1.14,1.15 Message-ID: <200503180940.j2I9ekEa032064@cvs.devel.redhat.com> Update of /cvs/dist/rpms/procmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31951 Modified Files: procmail.spec Log Message: rebuilt Index: procmail.spec =================================================================== RCS file: /cvs/dist/rpms/procmail/devel/procmail.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- procmail.spec 8 Nov 2004 15:15:25 -0000 1.14 +++ procmail.spec 18 Mar 2005 09:40:43 -0000 1.15 @@ -1,7 +1,7 @@ Summary: The procmail mail processing program. Name: procmail Version: 3.22 -Release: 15 +Release: 16 License: GPL or Artistic Group: System Environment/Daemons Source: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz @@ -58,6 +58,9 @@ %{_mandir}/man[15]/* %changelog +* Fri Mar 18 2005 Peter Vrabec 3.22-16 +- rebuilt + * Mon Nov 8 2004 Martin Stransky 3.22-15 - add largefiles patch to support 64-bit file I/O From fedora-cvs-commits at redhat.com Fri Mar 18 09:41:11 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 04:41:11 -0500 Subject: rpms/pwlib/devel pwlib-1.6.5-debuginfo.patch,1.2,1.3 Message-ID: <200503180941.j2I9fBXU032116@cvs.devel.redhat.com> Update of /cvs/dist/rpms/pwlib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32101 Added Files: pwlib-1.6.5-debuginfo.patch Log Message: readding pwlib-1.6.5-debuginfo.patch, missing ... Daniel pwlib-1.6.5-debuginfo.patch: unix.mak | 7 ------- 1 files changed, 7 deletions(-) Index: pwlib-1.6.5-debuginfo.patch =================================================================== RCS file: pwlib-1.6.5-debuginfo.patch diff -N pwlib-1.6.5-debuginfo.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pwlib-1.6.5-debuginfo.patch 18 Mar 2005 09:41:07 -0000 1.3 @@ -0,0 +1,16 @@ +--- pwlib/make/unix.mak.debuginfo 2004-08-09 17:12:30.277024591 +0100 ++++ pwlib/make/unix.mak 2004-08-09 17:13:01.344248482 +0100 +@@ -939,13 +939,6 @@ + OPTCCFLAGS += -O2 + endif + +-ifneq ($(OSTYPE),Carbon) +-ifneq ($(OSTYPE),Darwin) +-# Apple does not support -s to remove symbol table/relocation information +-LDFLAGS += -s +-endif +-endif +- + endif # DEBUG + + # define ESDDIR variables if installed From fedora-cvs-commits at redhat.com Fri Mar 18 09:53:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 04:53:36 -0500 Subject: rpms/star/devel star.spec,1.10,1.11 Message-ID: <200503180953.j2I9raUF002932@cvs.devel.redhat.com> Update of /cvs/dist/rpms/star/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2919 Modified Files: star.spec Log Message: rebuilt Index: star.spec =================================================================== RCS file: /cvs/dist/rpms/star/devel/star.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- star.spec 22 Nov 2004 14:57:57 -0000 1.10 +++ star.spec 18 Mar 2005 09:53:34 -0000 1.11 @@ -4,7 +4,7 @@ Summary: An archiving tool with ACL support Name: star Version: 1.5a54 -Release: 1 +Release: 2 URL: http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html Source: ftp://ftp.fokus.gmd.de/pub/unix/star/alpha/%{name}-%{version}.tar.gz Patch0: star-1.5-newMake.patch @@ -85,6 +85,9 @@ %{_mandir}/man1/*.1.gz %changelog +* Fri Mar 18 2005 Peter Vrabec +- rebuilt + * Mon Nov 22 2004 Peter Vrabec - upgrade 1.5a54-1 & rebuild From fedora-cvs-commits at redhat.com Fri Mar 18 10:32:12 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 05:32:12 -0500 Subject: rpms/openh323/devel .cvsignore, 1.8, 1.9 openh323.spec, 1.14, 1.15 sources, 1.8, 1.9 Message-ID: <200503181032.j2IAWCsT028245@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openh323/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28228 Modified Files: .cvsignore openh323.spec sources Log Message: Update to 1.15.3 and cleanup, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openh323/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Dec 2004 05:19:17 -0000 1.8 +++ .cvsignore 18 Mar 2005 10:32:09 -0000 1.9 @@ -1 +1,2 @@ openh323-v1_15_2-src-tar.gz +openh323-1.15.3.tar.gz Index: openh323.spec =================================================================== RCS file: /cvs/dist/rpms/openh323/devel/openh323.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- openh323.spec 17 Mar 2005 08:46:08 -0000 1.14 +++ openh323.spec 18 Mar 2005 10:32:09 -0000 1.15 @@ -1,21 +1,15 @@ Summary: Library for H323 spec. Name: openh323 -Version: 1.15.2 -%define tar_version 1_15_2 -Release: 3 +Version: 1.15.3 +Release: 1 URL: http://www.openh323.org/ -Source0: %{name}-v%{tar_version}-src-tar.gz +Source0: http://www.seconix.com/%{name}-%{version}.tar.gz -#Patch1: openh323-1.12.0-asnparser.patch -#Patch2: openh323-1.12.0-nosamples.patch -#Patch3: openh323-1.13.4-prefix.patch -#Patch4: openh323-1.13.4-PIC.patch -#Patch5: openh323-1.13.4-no_protected.patch License: MPL Group: System Environment/Libraries -Requires: pwlib >= 1.8.3 +Requires: pwlib >= 1.8.4 Requires: speex -BuildRequires: pwlib-devel >= 1.8.3 +BuildRequires: pwlib-devel >= 1.8.4 BuildRequires: XFree86-devel BuildRequires: speex-devel BuildRequires: openldap-devel @@ -29,31 +23,17 @@ Summary: Development package for openh323 Group: Development/Libraries Requires: openh323 = %{PACKAGE_VERSION} -Requires: pwlib-devel >= 1.8.3 +Requires: pwlib-devel >= 1.8.4 %description devel Static libraries and header files for development with openh323. %prep -%setup -q -n openh323 -#%patch1 -p1 -b .ansparser -#%patch2 -p1 -b .nosamples -#%patch3 -p1 -b .prefix -#%patch4 -p1 -b .PIC -#%patch5 -p1 -b .no_protected +%setup -q %build %configure --enable-localspeex=no --enable-plugins -#%ifarch ia64 -## Disable optimization due to g++ segfault (#116369) -#make optshared OPTCCFLAGS="$RPM_OPT_FLAGS" || true -#g++ -DP_USE_PRAGMA -fno-rtti -D_REENTRANT -Wall -DP_64BIT -fPIC -DPTRACING -Iinclude -DHAS_OSS -DPTRACING -I/usr/share/pwlib//include -DNDEBUG -x c++ -c src/h245_1.cxx -o lib/obj_linux_ia64_r/h245_1.o -#g++ -DP_USE_PRAGMA -fno-rtti -D_REENTRANT -Wall -DP_64BIT -fPIC -DPTRACING -Iinclude -DHAS_OSS -DPTRACING -I/usr/share/pwlib//include -DNDEBUG -x c++ -c src/h245_2.cxx -o lib/obj_linux_ia64_r/h245_2.o -#g++ -DP_USE_PRAGMA -fno-rtti -D_REENTRANT -Wall -DP_64BIT -fPIC -DPTRACING -Iinclude -DHAS_OSS -DPTRACING -I/usr/share/pwlib//include -DNDEBUG -x c++ -c src/h245_3.cxx -o lib/obj_linux_ia64_r/h245_3.o -#make optshared OPTCCFLAGS="$RPM_OPT_FLAGS" -#%else make optshared OPTCCFLAGS="$RPM_OPT_FLAGS" -#%endif %install rm -rf $RPM_BUILD_ROOT @@ -79,6 +59,9 @@ %{_datadir}/openh323 %changelog +* Fri Mar 18 2005 Daniel Veillard 1.15.3-1 +- update of the version from gnomemeeting-1.2.1 +- cleanup of the spec file * Thu Mar 17 2005 Christopher Aillon 1.15.2-3 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/openh323/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Dec 2004 05:19:17 -0000 1.8 +++ sources 18 Mar 2005 10:32:09 -0000 1.9 @@ -1 +1 @@ -53086e76eb4e2ff2a3b77f1d4e9acaa8 openh323-v1_15_2-src-tar.gz +f9d25921281843fd2304da494b2e04e2 openh323-1.15.3.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 18 10:33:22 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 05:33:22 -0500 Subject: rpms/openh323/devel openh323-1.12.0-asnparser.patch, 1.1, NONE openh323-1.12.0-nosamples.patch, 1.1, NONE openh323-1.13.4-PIC.patch, 1.1, NONE openh323-1.13.4-no_protected.patch, 1.1, NONE openh323-1.13.4-prefix.patch, 1.1, NONE Message-ID: <200503181033.j2IAXMZT028297@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openh323/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28286 Removed Files: openh323-1.12.0-asnparser.patch openh323-1.12.0-nosamples.patch openh323-1.13.4-PIC.patch openh323-1.13.4-no_protected.patch openh323-1.13.4-prefix.patch Log Message: Remove old patches, daniel --- openh323-1.12.0-asnparser.patch DELETED --- --- openh323-1.12.0-nosamples.patch DELETED --- --- openh323-1.13.4-PIC.patch DELETED --- --- openh323-1.13.4-no_protected.patch DELETED --- --- openh323-1.13.4-prefix.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 18 10:56:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 05:56:45 -0500 Subject: rpms/openh323/devel gcc4.patch,NONE,1.1 openh323.spec,1.15,1.16 Message-ID: <200503181056.j2IAuj4M010107@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openh323/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10092 Modified Files: openh323.spec Added Files: gcc4.patch Log Message: gcc4 raised an error, Daniel gcc4.patch: p64.cxx | 2 !! 1 files changed, 2 modifications(!) --- NEW FILE gcc4.patch --- *** openh323-1.15.3/src/vic/p64.cxx.orig 2005-03-18 11:52:49.146096610 +0100 --- openh323-1.15.3/src/vic/p64.cxx 2005-03-18 11:53:48.651046530 +0100 *************** *** 1125,1131 **** * If input buffer not aligned, prime bit-buffer * with 8 bits; otherwise, prime it with a 16. */ ! if ((int)bp & 1) { bs_ = (u_short*)(bp + 1); bb_ = *bp; nbb_ = 8 - sbit; --- 1125,1131 ---- * If input buffer not aligned, prime bit-buffer * with 8 bits; otherwise, prime it with a 16. */ ! if ((u_long)bp & 1) { bs_ = (u_short*)(bp + 1); bb_ = *bp; nbb_ = 8 - sbit; Index: openh323.spec =================================================================== RCS file: /cvs/dist/rpms/openh323/devel/openh323.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- openh323.spec 18 Mar 2005 10:32:09 -0000 1.15 +++ openh323.spec 18 Mar 2005 10:56:42 -0000 1.16 @@ -4,7 +4,7 @@ Release: 1 URL: http://www.openh323.org/ Source0: http://www.seconix.com/%{name}-%{version}.tar.gz - +Patch0: gcc4.patch License: MPL Group: System Environment/Libraries Requires: pwlib >= 1.8.4 @@ -29,6 +29,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-localspeex=no --enable-plugins From fedora-cvs-commits at redhat.com Fri Mar 18 11:19:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 06:19:36 -0500 Subject: rpms/openh323/devel gcc4.patch,1.1,1.2 Message-ID: <200503181119.j2IBJaxp013427@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openh323/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13412 Modified Files: gcc4.patch Log Message: One more patch, Daniel gcc4.patch: plugins/audio/Speex/speexcodec.cxx | 3 !!! src/vic/p64.cxx | 2 !! 2 files changed, 5 modifications(!) Index: gcc4.patch =================================================================== RCS file: /cvs/dist/rpms/openh323/devel/gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc4.patch 18 Mar 2005 10:56:42 -0000 1.1 +++ gcc4.patch 18 Mar 2005 11:19:34 -0000 1.2 @@ -17,3 +17,23 @@ bs_ = (u_short*)(bp + 1); bb_ = *bp; nbb_ = 8 - sbit; +*** openh323-1.15.3/plugins/audio/Speex/speexcodec.cxx.orig 2005-03-18 12:06:35.138471815 +0100 +--- openh323-1.15.3/plugins/audio/Speex/speexcodec.cxx 2005-03-18 12:18:45.958321765 +0100 +*************** +*** 103,109 **** + + static void * create_encoder(const struct PluginCodec_Definition * codec) + { +! int mode = (int)(codec->userData); + + struct PluginSpeexContext * context = new PluginSpeexContext; + context->bits = new SpeexBits; +--- 103,110 ---- + + static void * create_encoder(const struct PluginCodec_Definition * codec) + { +! long model = (long)(codec->userData); +! int mode = (int)model; + + struct PluginSpeexContext * context = new PluginSpeexContext; + context->bits = new SpeexBits; From fedora-cvs-commits at redhat.com Fri Mar 18 11:25:23 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 06:25:23 -0500 Subject: rpms/emacs/devel emacs-21.3-gcc4.patch, NONE, 1.1 emacs.spec, 1.38, 1.39 Message-ID: <200503181125.j2IBPN3h024439@cvs.devel.redhat.com> Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24427 Modified Files: emacs.spec Added Files: emacs-21.3-gcc4.patch Log Message: add emacs-21.3-gcc4.patch for emacsclient emacs-21.3-gcc4.patch: emacsclient.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE emacs-21.3-gcc4.patch --- --- emacs-21.3/lib-src/emacsclient.c~ 2002-12-04 21:38:25.000000000 +0900 +++ emacs-21.3/lib-src/emacsclient.c 2005-03-18 20:21:50.542628565 +0900 @@ -38,7 +38,6 @@ #endif /* not VMS */ char *getenv (), *getwd (); -char *getcwd (); /* This is defined with -D from the compilation command, which extracts it from ../lisp/version.el. */ Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- emacs.spec 9 Mar 2005 12:42:15 -0000 1.38 +++ emacs.spec 18 Mar 2005 11:25:21 -0000 1.39 @@ -35,6 +35,16 @@ Source27: rfc1345.el Source28: http://ftp.gnu.org/gnu/tramp/tramp-%{tramp_ver}.tar.gz Source29: tramp-init.el +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: glibc-devel, gcc, bzip2, ncurses-devel, zlib-devel, autoconf213 +Buildrequires: XFree86-devel, Xaw3d-devel, libpng-devel, libjpeg-devel, libungif-devel, libtiff-devel +Requires: fonts-xorg-75dpi +%ifarch %{ix86} +BuildRequires: setarch +%endif +Requires: emacs-common = %{version}-%{release} +Obsoletes: emacs-X11 +Conflicts: gettext < 0.10.40 Patch2: emacs-21.2-s390.patch Patch3: emacs-21.2-x86_64.patch Patch4: emacs-21.2-sticky-bit-80049.patch @@ -50,16 +60,7 @@ Patch14: emacs-xim-status-under-window-125413.patch Patch15: emacs-21.3-xterm-modifiers-137868.patch Patch16: movemail-CAN-2005-0100.patch -Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: glibc-devel, gcc, bzip2, ncurses-devel, zlib-devel, autoconf213 -Buildrequires: XFree86-devel, Xaw3d-devel, libpng-devel, libjpeg-devel, libungif-devel, libtiff-devel -Requires: fonts-xorg-75dpi -%ifarch %{ix86} -BuildRequires: setarch -%endif -Requires: emacs-common = %{version}-%{release} -Obsoletes: emacs-X11 -Conflicts: gettext < 0.10.40 +Patch17: emacs-21.3-gcc4.patch %description Emacs is a powerful, customizable, self-documenting, modeless text @@ -134,6 +135,7 @@ %patch14 -p1 -b .StatusArea %patch15 -p0 -b .modifier %patch16 -p1 -b .fmtstr +%patch17 -p1 -b .getcwd # patches 2 and 3 touch configure.in autoconf-2.13 @@ -346,6 +348,7 @@ %changelog * Wed Mar 9 2005 Jens Petersen - 21.3-26 - rebuild with gcc 4.0 + - add emacs-21.3-gcc4.patch for emacsclient * Mon Feb 28 2005 Jens Petersen - 21.3-25 - add tramp-2.1.3 to site-lisp (David Woodhouse, 149703) From fedora-cvs-commits at redhat.com Fri Mar 18 12:00:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 07:00:00 -0500 Subject: rpms/gnomemeeting/devel .cvsignore, 1.8, 1.9 gnomemeeting.spec, 1.20, 1.21 sources, 1.9, 1.10 gnomemeeting-1.2.0.libebook12.patch, 1.1, NONE Message-ID: <200503181200.j2IBxx90006341@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnomemeeting/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6326 Modified Files: .cvsignore gnomemeeting.spec sources Removed Files: gnomemeeting-1.2.0.libebook12.patch Log Message: Update to new release 1.2.1, a bit of cleanup, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnomemeeting/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Dec 2004 21:16:20 -0000 1.8 +++ .cvsignore 18 Mar 2005 11:59:57 -0000 1.9 @@ -1,2 +1,3 @@ gnomemeeting-1.0.2.tar.gz gnomemeeting-1.2.0.tar.gz +gnomemeeting-1.2.1.tar.gz Index: gnomemeeting.spec =================================================================== RCS file: /cvs/dist/rpms/gnomemeeting/devel/gnomemeeting.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnomemeeting.spec 17 Mar 2005 08:52:47 -0000 1.20 +++ gnomemeeting.spec 18 Mar 2005 11:59:57 -0000 1.21 @@ -1,20 +1,19 @@ Summary: A Gnome based H323 teleconferencing application Name: gnomemeeting -Version: 1.2.0 -Release: 6 +Version: 1.2.1 +Release: 1 URL: http://www.gnomemeeting.org/ Source0: http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/gnomemeeting-%{version}.tar.gz -Patch0: gnomemeeting-1.2.0.libebook12.patch License: GPL Group: Applications/Communications BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: openh323 >= 1.15.2 -Requires: pwlib >= 1.8.3 +Requires: openh323 >= 1.15.3 +Requires: pwlib >= 1.8.4 Requires: GConf2 >= 1.2.1 Requires: libgnomeui >= 2.0 Requires: libgnome >= 2.0 Requires: howl >= 0.9.7 -Requires: evolution-data-server >= 1.1.4.2 +Requires: evolution-data-server PreReq: scrollkeeper BuildRequires: gtk2-devel >= 2.0.0 BuildRequires: GConf2-devel >= 1.2.1 @@ -31,7 +30,7 @@ BuildRequires: alsa-lib-devel BuildRequires: gettext BuildRequires: howl-devel >= 0.9.7 -BuildRequires: evolution-data-server-devel >= 1.1.4.2 +BuildRequires: evolution-data-server-devel ExcludeArch: ppc64 %description @@ -40,7 +39,7 @@ %prep %setup -q -%patch0 -p1 +# %patch0 -p1 %build %configure @@ -86,6 +85,9 @@ %{_sysconfdir}/gconf/schemas/gnomemeeting.schemas %changelog +* Fri Mar 18 2005 Daniel Veillard 1.2.1-1 +- Update to new version 1.2.1 + * Thu Mar 17 2005 Christopher Aillon - 1.2.0-6 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnomemeeting/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Dec 2004 21:16:20 -0000 1.9 +++ sources 18 Mar 2005 11:59:57 -0000 1.10 @@ -1 +1 @@ -91028599e3822f7f071b64ecbb9c1452 gnomemeeting-1.2.0.tar.gz +93829f3eee783f32eaefebc9e717fb89 gnomemeeting-1.2.1.tar.gz --- gnomemeeting-1.2.0.libebook12.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 18 12:54:30 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 07:54:30 -0500 Subject: rpms/vim/devel 6.3.065, NONE, 1.1 6.3.066, NONE, 1.1 README.patches, 1.29, 1.30 vim.spec, 1.61, 1.62 Message-ID: <200503181254.j2ICsUfm029319@cvs.devel.redhat.com> Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25444 Modified Files: README.patches vim.spec Added Files: 6.3.065 6.3.066 Log Message: - patchlevel 66 --- NEW FILE 6.3.065 --- To: vim-dev at vim.org Subject: Patch 6.3.065 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.3.065 Problem: The euro digraph doesn't always work. Solution: Add an "e=" digraph for Unicode euro character and adjust the help files. Files: src/digraph.c, runtime/doc/digraph.txt *** ../vim-6.3.034/src/digraph.c Wed Jun 9 14:56:25 2004 --- src/digraph.c Fri Mar 18 10:50:52 2005 *************** *** 1428,1433 **** --- 1428,1434 ---- {'L', 'i', 0x20a4}, {'P', 't', 0x20a7}, {'W', '=', 0x20a9}, + {'=', 'e', 0x20ac}, /* euro */ {'o', 'C', 0x2103}, {'c', 'o', 0x2105}, {'o', 'F', 0x2109}, *** ../vim-6.3.034/runtime/doc/digraph.txt Wed Jun 9 14:56:28 2004 --- runtime/doc/digraph.txt Fri Mar 18 10:52:35 2005 *************** *** 1,4 **** ! *digraph.txt* For Vim version 6.3. Last change: 2001 Sep 03 VIM REFERENCE MANUAL by Bram Moolenaar --- 1,4 ---- ! *digraph.txt* For Vim version 6.3. Last change: 2005 Mar 18 VIM REFERENCE MANUAL by Bram Moolenaar *************** *** 28,34 **** *E104* *E39* :dig[raphs] {char1}{char2} {number} ... Add digraph {char1}{char2} to the list. {number} is ! the decimal representation of the character. Example: > :digr e: 235 a: 228 < Avoid defining a digraph with '_' (underscore) as the --- 28,35 ---- *E104* *E39* :dig[raphs] {char1}{char2} {number} ... Add digraph {char1}{char2} to the list. {number} is ! the decimal representation of the character. Normally ! it is the Unicode character, see |digraph-encoding|. Example: > :digr e: 235 a: 228 < Avoid defining a digraph with '_' (underscore) as the *************** *** 48,54 **** if you look at it on a system that does not support digraphs or if you print this file. ! The decimal number is the number of the character. ============================================================================== 2. Using digraphs *digraphs-use* --- 49,72 ---- if you look at it on a system that does not support digraphs or if you print this file. ! *digraph-encoding* ! The decimal number normally is the Unicode number of the character. Note that ! the meaning doesn't change when 'encoding' changes. The character will be ! converted from Unicode to 'encoding' when needed. This does require the ! conversion to be available, it might fail. ! ! When Vim was compiled without the +multi_byte feature, you need to specify the ! character in the encoding given with 'encoding'. You might want to use ! something like this: > ! ! if has("multi_byte") ! digraph oe 339 ! elseif &encoding == "iso-8859-15" ! digraph oe 189 ! endif ! ! This defines the "oe" digraph for a character that is number 339 in Unicode ! and 189 in latin9 (iso-8859-15). ============================================================================== 2. Using digraphs *digraphs-use* *************** *** 142,147 **** --- 160,173 ---- These are the RFC1345 digraphs for the one-byte characters. See the output of ":digraphs" for the others. The characters above 255 are only available when Vim was compiled with the |+multi_byte| feature. + + EURO + + Exception: RFC1345 doesn't specify the euro sign. In Vim the digraph =e was + added for this. Note the difference between latin1, where the digraph Cu is + used for the currency sign, and latin9 (iso-8859-15), where the digraph =e is + used for the euro sign, while both of them are the character 164, 0xa4. + *digraph-table* char digraph hex dec official name ~ ^@ NU 0x00 0 NULL (NUL) *** ../vim-6.3.034/src/version.c Fri Mar 11 19:16:20 2005 --- src/version.c Fri Mar 18 10:54:13 2005 *************** *** 643,644 **** --- 643,646 ---- { /* Add new patch number below this line */ + /**/ + 65, /**/ -- Lawmakers made it obligatory for everybody to take at least one bath each week -- on Saturday night. [real standing law in Vermont, United States of America] /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html /// --- NEW FILE 6.3.066 --- To: vim-dev at vim.org Subject: Patch 6.3.066 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.3.066 Problem: Backup file may get wrong permissions. Solution: Use permissions of original file for backup file in more places. Files: src/fileio.c *** ../vim-6.3.029/src/fileio.c Sat Sep 18 21:13:25 2004 --- src/fileio.c Fri Mar 18 12:56:41 2005 *************** *** 3314,3320 **** /* Open with O_EXCL to avoid the file being created while * we were sleeping (symlink hacker attack?) */ bfd = mch_open((char *)backup, ! O_WRONLY|O_CREAT|O_EXTRA|O_EXCL, 0666); if (bfd < 0) { vim_free(backup); --- 3314,3320 ---- /* Open with O_EXCL to avoid the file being created while * we were sleeping (symlink hacker attack?) */ bfd = mch_open((char *)backup, ! O_WRONLY|O_CREAT|O_EXTRA|O_EXCL, perm & 0777); if (bfd < 0) { vim_free(backup); *************** *** 3698,3704 **** while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append ? (forceit ? (O_APPEND | O_CREAT) : O_APPEND) : (O_CREAT | O_TRUNC)) ! , 0666)) < 0) { /* * A forced write will try to create a new file if the old one is --- 3698,3704 ---- while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append ? (forceit ? (O_APPEND | O_CREAT) : O_APPEND) : (O_CREAT | O_TRUNC)) ! , perm & 0777)) < 0) { /* * A forced write will try to create a new file if the old one is *************** *** 4104,4110 **** if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0) { if ((write_info.bw_fd = mch_open((char *)fname, ! O_WRONLY | O_CREAT | O_TRUNC | O_EXTRA, 0666)) >= 0) { /* copy the file. */ write_info.bw_buf = smallbuf; --- 4104,4111 ---- if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0) { if ((write_info.bw_fd = mch_open((char *)fname, ! O_WRONLY | O_CREAT | O_TRUNC | O_EXTRA, ! perm & 0777)) >= 0) { /* copy the file. */ write_info.bw_buf = smallbuf; *************** *** 4261,4267 **** if (org == NULL || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL, ! 0666)) < 0) EMSG(_("E206: patchmode: can't touch empty original file")); else close(empty_fd); --- 4262,4268 ---- if (org == NULL || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL, ! perm & 0777)) < 0) EMSG(_("E206: patchmode: can't touch empty original file")); else close(empty_fd); *************** *** 5693,5698 **** --- 5694,5703 ---- BPTR flock; #endif struct stat st; + long perm; + #ifdef HAVE_ACL + vim_acl_T acl; /* ACL from original file */ + #endif /* * When the names are identical, there is nothing to do. *************** *** 5743,5752 **** /* * Rename() failed, try copying the file. */ fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0); if (fd_in == -1) return -1; ! fd_out = mch_open((char *)to, O_CREAT|O_EXCL|O_WRONLY|O_EXTRA, 0666); if (fd_out == -1) { close(fd_in); --- 5748,5764 ---- /* * Rename() failed, try copying the file. */ + perm = mch_getperm(from); + #ifdef HAVE_ACL + /* For systems that support ACL: get the ACL from the original file. */ + acl = mch_get_acl(from); + #endif fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0); if (fd_in == -1) return -1; ! ! /* Create the new file with same permissions as the original. */ ! fd_out = mch_open((char *)to, O_CREAT|O_EXCL|O_WRONLY|O_EXTRA, (int)perm); if (fd_out == -1) { close(fd_in); *************** *** 5777,5782 **** --- 5789,5798 ---- errmsg = _("E210: Error reading \"%s\""); to = from; } + mch_setperm(to, perm); + #ifdef HAVE_ACL + mch_set_acl(to, acl); + #endif if (errmsg != NULL) { EMSG2(errmsg, to); *** ../vim-6.3.029/src/version.c Fri Mar 18 10:56:48 2005 --- src/version.c Fri Mar 18 13:36:18 2005 *************** *** 643,644 **** --- 643,646 ---- { /* Add new patch number below this line */ + /**/ + 66, /**/ -- Why is "abbreviation" such a long word? /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html /// Index: README.patches =================================================================== RCS file: /cvs/dist/rpms/vim/devel/README.patches,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- README.patches 14 Mar 2005 12:46:17 -0000 1.29 +++ README.patches 18 Mar 2005 12:54:28 -0000 1.30 @@ -20,6 +20,8 @@ After applying a patch, you need to compile Vim. There are no patches for binaries. +Checksums for the patch files can be found in the file MD5. + Individual patches for Vim 6.3: SIZE NAME FIXES @@ -87,3 +89,5 @@ 2337 6.3.062 ":normal! gQ" hangs 1434 6.3.063 after the CursorHold event 'mousefocus' may stop working 1586 6.3.064 line2byte(line("$") + 1) sometimes returns the wrong number + 4436 6.3.065 there was no digraph for euro in Unicode + 4728 6.3.066 permissions of backup file may be wrong Index: vim.spec =================================================================== RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- vim.spec 14 Mar 2005 12:46:17 -0000 1.61 +++ vim.spec 18 Mar 2005 12:54:28 -0000 1.62 @@ -21,7 +21,7 @@ %define baseversion 6.3 %define vimdir vim63 -%define patchlevel 064 +%define patchlevel 066 Summary: The VIM editor. Name: vim @@ -113,6 +113,10 @@ Patch060: ftp://ftp.vim.org/pub/vim/patches/6.3.060 Patch061: ftp://ftp.vim.org/pub/vim/patches/6.3.061 Patch062: ftp://ftp.vim.org/pub/vim/patches/6.3.062 +Patch063: ftp://ftp.vim.org/pub/vim/patches/6.3.063 +Patch064: ftp://ftp.vim.org/pub/vim/patches/6.3.064 +Patch065: ftp://ftp.vim.org/pub/vim/patches/6.3.065 +Patch066: ftp://ftp.vim.org/pub/vim/patches/6.3.066 Patch3000: vim-6.1-syntax.patch Patch3001: vim-6.2-rh1.patch @@ -302,6 +306,10 @@ %patch060 -p0 %patch061 -p0 %patch062 -p0 +%patch063 -p0 +%patch064 -p0 +%patch065 -p0 +%patch066 -p0 %patch3000 -p1 @@ -571,6 +579,9 @@ %endif %changelog +* Fri Mar 18 2005 Karsten Hopp 6.3.066-1 +- patchlevel 66 + * Mon Mar 14 2005 Karsten Hopp 6.3.064-1 - patchlevel 64 - fix selinux warning (#150126) From fedora-cvs-commits at redhat.com Fri Mar 18 14:07:26 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 09:07:26 -0500 Subject: rpms/postfix/devel .cvsignore, 1.11, 1.12 postfix-etc-init.d-postfix, 1.7, 1.8 postfix.spec, 1.25, 1.26 sources, 1.11, 1.12 Message-ID: <200503181407.j2IE7Qrv031073@cvs.devel.redhat.com> Update of /cvs/dist/rpms/postfix/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31059 Modified Files: .cvsignore postfix-etc-init.d-postfix postfix.spec sources Log Message: [tw] * Fri Mar 18 2005 Thomas Woerner 2:2.2.1-1 - new version 2.2.1 - allow to start postfix without alias_database (#149657) * Fri Mar 11 2005 Thomas Woerner 2:2.2.0-1 - new version 2.2.0 - cleanup of spec file: removed external TLS and IPV6 patches, removed smtp_sasl_proto patch - dropped samples directory till there are good examples again (was TLS and IPV6) - v2.2.0 fixes code problems: #132798 and #137858 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 11 Feb 2005 13:43:12 -0000 1.11 +++ .cvsignore 18 Mar 2005 14:07:24 -0000 1.12 @@ -8,3 +8,4 @@ tls+ipv6-1.25-pf-2.1.5.patch.gz ipv6-1.26-pf-2.1.5.patch.gz tls+ipv6-1.26-pf-2.1.5.patch.gz +postfix-2.2.1.tar.gz Index: postfix-etc-init.d-postfix =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/postfix-etc-init.d-postfix,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- postfix-etc-init.d-postfix 23 Nov 2004 13:05:31 -0000 1.7 +++ postfix-etc-init.d-postfix 18 Mar 2005 14:07:24 -0000 1.8 @@ -33,22 +33,24 @@ start() { # Start daemons. - echo -n "Starting postfix: " + echo -n $"Starting postfix: " alias_database=$(postconf -h alias_database 2>/dev/null) - RETVAL=1 - [ -z "$alias_database" ] && { - failure "determination of alias_database" - echo - return 0 - } - /usr/sbin/postalias ${alias_database//,} 2>/dev/null RETVAL=$? - [ $RETVAL -ne 0 ] && { - failure "postalias $alias_database" + if [ $RETVAL -ne 0 ]; then + failure $"determination of alias_database" echo - return 0 - } - /usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure + return 0 + fi + if [ -n "$alias_database" ]; then + /usr/sbin/postalias ${alias_database//,} 2>/dev/null + RETVAL=$? + if [ $RETVAL -ne 0 ]; then + failure $"postalias $alias_database" + echo + return 0 + fi + fi + /usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure $"postfix start" RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/postfix echo @@ -57,8 +59,8 @@ stop() { # Stop daemons. - echo -n "Shutting down postfix: " - /usr/sbin/postfix stop 2>/dev/null 1>&2 && success || failure + echo -n $"Shutting down postfix: " + /usr/sbin/postfix stop 2>/dev/null 1>&2 && success || failure $"postfix stop" RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/postfix echo @@ -66,25 +68,25 @@ } reload() { - echo -n "Reloading postfix: " - /usr/sbin/postfix reload 2>/dev/null 1>&2 && success || failure + echo -n $"Reloading postfix: " + /usr/sbin/postfix reload 2>/dev/null 1>&2 && success || failure $"postfix reload" RETVAL=$? echo return $RETVAL } abort() { - /usr/sbin/postfix abort 2>/dev/null 1>&2 && success || failure + /usr/sbin/postfix abort 2>/dev/null 1>&2 && success || failure $"postfix abort" return $? } flush() { - /usr/sbin/postfix flush 2>/dev/null 1>&2 && success || failure + /usr/sbin/postfix flush 2>/dev/null 1>&2 && success || failure $"postfix flush" return $? } check() { - /usr/sbin/postfix check 2>/dev/null 1>&2 && success || failure + /usr/sbin/postfix check 2>/dev/null 1>&2 && success || failure $"postfix check" return $? } @@ -124,7 +126,7 @@ [ -f /var/lock/subsys/postfix ] && restart || : ;; *) - echo "Usage: postfix {start|stop|restart|reload|abort|flush|check|status|condrestart}" + echo $"Usage: postfix {start|stop|restart|reload|abort|flush|check|status|condrestart}" exit 1 esac Index: postfix.spec =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- postfix.spec 11 Feb 2005 13:43:12 -0000 1.25 +++ postfix.spec 18 Mar 2005 14:07:24 -0000 1.26 @@ -17,7 +17,6 @@ %define SASL 1 %endif -%define tlsno pfixtls-0.8.18-2.1.3-0.9.7d %if %{PFLOGSUMM} %define pflogsumm_ver 1.1.0 %endif @@ -43,8 +42,8 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 2.1.5 -Release: 5.1 +Version: 2.2.1 +Release: 1 Epoch: 2 Group: System Environment/Daemons URL: http://www.postfix.org @@ -63,36 +62,8 @@ # Sources 50-99 are upstream [patch] contributions -# A note about the various TLS and IPV6 patch files. TLS was -# originally added to Postfix by Lutz Jaenicke, this is what is in -# Source50. In addition to the source patch it includes documentation -# and examples. Dean Strik created a patch to support IPv6, this was -# taken from the work done by Mark Huizer, and then substantially -# improved by Jun-ichiro 'itojun' Hagino (known as the KAME -# patch). Dean provides his patch in two forms, one with IPv6 only (Source52), -# and one with IPv6 and TLS (Source51). The TLS support in Dean Stick's patch -# comes from the TLS patch done by Lutz Jaenicke. However Dean Strick -# did not include the TLS documentation and examples that are in Lutz -# Jaenicke's tarball. Depending on what this RPM builds we use some -# combination of patches and files from Sources 50-52. -# -# The TLS documentation and examples always comes from Source50, the -# Lutz Jaenicke contribution. We can do this because even if we don't -# use this patch to add TLS, but rather use Dean Strik's tls+ipv6 -# patch is still based on Lutz Jaenicke's contribution. -# -# If we are building with IPv6 and no TLS then Source52 is used. If we -# are building with both IPv6 and TLS then Source51 is used and we -# include the doc and examples from Source50, but not Source50's -# patch. If we are building with TLS and no IPv6 then we use the -# original Source50 patch and doc. - -Source50: ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%{tlsno}.tar.gz -Source51: ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.26/tls+ipv6-1.26-pf-2.1.5.patch.gz -Source52: ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.26/ipv6-1.26-pf-2.1.5.patch.gz -%if %{PFLOGSUMM} +# Postfix Log Entry Summarizer: http://jimsun.linxnet.com/postfix_contrib.html Source53: http://jimsun.linxnet.com/downloads/pflogsumm-%{pflogsumm_ver}.tar.gz -%endif # Sources >= 100 are config files @@ -102,7 +73,6 @@ # Patches Patch1: postfix-2.1.1-config.patch -Patch2: postfix-smtp_sasl_proto.c.patch Patch3: postfix-alternatives.patch Patch4: postfix-hostname-fqdn.patch Patch5: postfix-2.1.1-pie.patch @@ -155,54 +125,8 @@ umask 022 %setup -q -# -# IPv6 and TLS are sort of hand in hand. We need to apply them in the -# following order: -# - IPv6 + TLS (if both are enabled) -# - IPv6 only -# - TLS only -# The last else block with patch fuzz factor enabled fixes master.cf -# by force if we're compiling without TLS -# -%if %{IPV6} && %{TLS} -echo "TLS and IPv6, patching with %{SOURCE51}" -gzip -dc %{SOURCE51} | patch -p1 -b -z .ipv6tls -%endif - -%if %{IPV6} && !%{TLS} -echo "IPv6 Only, patching with %{SOURCE52}" -gzip -dc %{SOURCE52} | patch -p1 -b -z .ipv6 -%endif - -%if %{TLS} -# It does not matter which TLS patch we are using, we always need the -# doc and examples from Lutz Jaenicke tarball so unpack it now. -gzip -dc %{SOURCE50} | tar xf - -if [ $? -ne 0 ]; then - exit $? -fi -%endif - -%if %{IPV6} && %{TLS} -# TLS and IPv6 -%patch1 -p1 -b .config -%endif - -%if !%{IPV6} && %{TLS} -echo "TLS Only, patching with %{tlsno}/pfixtls.diff" -patch -p1 < %{tlsno}/pfixtls.diff -%patch1 -p1 -b .config -%endif - -%if !%{IPV6} && !%{TLS} -# No TLS. Without the TLS patch the context lines in this patch don't -# match. Set fuzz to ignore all context lines, this is a bit -# dangerous. -patch --fuzz=3 -p1 -b -z .config < %{P:1} -%endif - # Apply obligatory patches -%patch2 -p1 -b .auth +%patch1 -p1 -b .config %patch3 -p1 -b .alternatives %patch4 -p1 -b .postfix-hostname-fqdn %patch5 -p1 -b .pie @@ -266,13 +190,16 @@ %endif %if %{TLS} if pkg-config openssl ; then - CCARGS="${CCARGS} -DHAS_SSL `pkg-config --cflags openssl`" + CCARGS="${CCARGS} -DUSE_TLS `pkg-config --cflags openssl`" AUXLIBS="${AUXLIBS} `pkg-config --libs openssl`" else - CCARGS="${CCARGS} -DHAS_SSL -I/usr/include/openssl" + CCARGS="${CCARGS} -DUSE_TLS -I/usr/include/openssl" AUXLIBS="${AUXLIBS} -lssl -lcrypto" fi %endif +%if %{IPV6} != 1 + CCARGS="${CCARGS} -DNO_IPV6" +%endif export CCARGS AUXLIBS make -f Makefile.init makefiles @@ -308,21 +235,6 @@ sample_directory=%{postfix_sample_dir} \ readme_directory=%{postfix_readme_dir} || exit 1 -# Move around the TLS docs -%if %{TLS} -mkdir -p $RPM_BUILD_ROOT%{postfix_doc_dir}/TLS -cp %{tlsno}/doc/* $RPM_BUILD_ROOT%{postfix_doc_dir}/TLS -for i in ACKNOWLEDGEMENTS CHANGES INSTALL README TODO; do - cp %{tlsno}/$i $RPM_BUILD_ROOT%{postfix_doc_dir}/TLS -done -mkdir -p $RPM_BUILD_ROOT%{postfix_doc_dir}/TLS/contributed -for i in 00README loadCAcert.pl Postfix_SSL-HOWTO.pdf SSL_CA-HOWTO.pdf fp.csh make-postfix-cert.sh; do - cp %{tlsno}/contributed/$i $RPM_BUILD_ROOT%{postfix_doc_dir}/TLS/contributed -done -# fix path to perl -perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl,g" $RPM_BUILD_ROOT%{postfix_doc_dir}/TLS/contributed/loadCAcert.pl -%endif - # This installs into the /etc/rc.d/init.d directory /bin/mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d install -c %{_sourcedir}/postfix-etc-init.d-postfix \ @@ -381,14 +293,6 @@ install -c qshape.1 $RPM_BUILD_ROOT%{_mandir}/man1/qshape.1 install -c auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{postfix_command_dir}/qshape -mkdir -p $RPM_BUILD_ROOT%{postfix_sample_dir} -%if %{IPV6} - install -c conf/sample-ipv6.cf $RPM_BUILD_ROOT%{postfix_sample_dir}/sample-ipv6.cf -%endif -%if %{TLS} - install -c conf/sample-tls.cf $RPM_BUILD_ROOT%{postfix_sample_dir}/sample-tls.cf -%endif - rm -f $RPM_BUILD_ROOT/etc/postfix/aliases mkdir -p $RPM_BUILD_ROOT/usr/lib @@ -486,11 +390,8 @@ %doc %attr(0644, root, root) %{postfix_doc_dir}/README-* %dir %attr(0755, root, root) %{postfix_readme_dir} %doc %attr(0644, root, root) %{postfix_readme_dir}/* -%dir %attr(0755, root, root) %{postfix_sample_dir} -%doc %attr(0644, root, root) %{postfix_sample_dir}/* -%dir %attr(0755, root, root) %{postfix_doc_dir}/TLS -%doc %attr(0644, root, root) %{postfix_doc_dir}/TLS/* -%dir %attr(0755, root, root) %{postfix_doc_dir}/TLS/contributed +#%dir %attr(0755, root, root) %{postfix_sample_dir} +#%doc %attr(0644, root, root) %{postfix_sample_dir}/* %dir %attr(0755, root, root) %{postfix_config_dir} %dir %attr(0755, root, root) %{postfix_daemon_dir} @@ -530,6 +431,7 @@ %attr(0644, root, root) %{postfix_config_dir}/LICENSE %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/access %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/canonical +%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/generic %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/header_checks %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/main.cf %attr(0644, root, root) %{postfix_config_dir}/main.cf.default @@ -539,6 +441,7 @@ %attr(0644, root, root) %{postfix_config_dir}/postfix-files %attr(0755, root, root) %{postfix_config_dir}/postfix-script %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/relocated +%attr(0755, root, root) %{postfix_config_dir}/TLS_LICENSE %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/transport %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/virtual %attr(0755, root, root) %{postfix_daemon_dir}/* @@ -556,6 +459,18 @@ %changelog +* Fri Mar 18 2005 Thomas Woerner 2:2.2.1-1 +- new version 2.2.1 +- allow to start postfix without alias_database (#149657) + +* Fri Mar 11 2005 Thomas Woerner 2:2.2.0-1 +- new version 2.2.0 +- cleanup of spec file: removed external TLS and IPV6 patches, removed + smtp_sasl_proto patch +- dropped samples directory till there are good examples again (was TLS and + IPV6) +- v2.2.0 fixes code problems: #132798 and #137858 + * Fri Feb 11 2005 Thomas Woerner 2:2.1.5-5.1 - fixed open relay bug in postfix ipv6 patch: new version 1.26 (#146731) - fixed permissions on doc directory (#147280) Index: sources =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 11 Feb 2005 13:43:12 -0000 1.11 +++ sources 18 Mar 2005 14:07:24 -0000 1.12 @@ -1,5 +1,2 @@ -d3211ebd4d2fbbc9c78235666ed355ac pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz 1f78fcaf2a36ec3520ecff286a45251a pflogsumm-1.1.0.tar.gz -bcaa4aac80595d04c60c72844203a04d postfix-2.1.5.tar.gz -3d6ab04897b06cf2672700367b9d9f65 ipv6-1.26-pf-2.1.5.patch.gz -3d3bbabe5c17d5d0809c698ad1df1e64 tls+ipv6-1.26-pf-2.1.5.patch.gz +36b982392b2a490f3c861e5e609124cc postfix-2.2.1.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 18 14:11:12 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 09:11:12 -0500 Subject: rpms/system-config-services/devel .cvsignore, 1.15, 1.16 sources, 1.19, 1.20 system-config-services.spec, 1.18, 1.19 Message-ID: <200503181411.j2IEBC6t031161@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-services/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31146 Modified Files: .cvsignore sources system-config-services.spec Log Message: don't read from /dev/null when restarting xinetd/services to prevent hangs build toolbar in glade to avoid DeprecationWarnings (#134978) dynamic, translated column titles for runlevel columns Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 17 Feb 2005 22:37:30 -0000 1.15 +++ .cvsignore 18 Mar 2005 14:11:10 -0000 1.16 @@ -1 +1 @@ -system-config-services-0.8.19.tar.gz +system-config-services-0.8.20.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 17 Feb 2005 22:37:30 -0000 1.19 +++ sources 18 Mar 2005 14:11:10 -0000 1.20 @@ -1 +1 @@ -b1b34ca1161f239cb339a86e4e1c0670 system-config-services-0.8.19.tar.gz +85de376af1039c5b41f96b19e8027c27 system-config-services-0.8.20.tar.gz Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- system-config-services.spec 17 Feb 2005 22:37:30 -0000 1.18 +++ system-config-services.spec 18 Mar 2005 14:11:10 -0000 1.19 @@ -1,7 +1,7 @@ # -*- RPM-SPEC -*- Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.8.19 +Version: 0.8.20 Release: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz @@ -59,6 +59,11 @@ %{_mandir}/*/system-config-services.8* %changelog +* Fri Mar 18 2005 Nils Philippsen 0.8.20-1 +- don't read from /dev/null when restarting xinetd/services to prevent hangs +- build toolbar in glade to avoid DeprecationWarnings (#134978) +- dynamic, translated column titles for runlevel columns + * Thu Feb 17 2005 Daniel J Walsh 0.8.19-1 - Added patch from Charlie Brej From fedora-cvs-commits at redhat.com Fri Mar 18 14:13:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 09:13:05 -0500 Subject: rpms/system-config-services/FC-3 .cvsignore, 1.13, 1.14 sources, 1.17, 1.18 system-config-services.spec, 1.16, 1.17 Message-ID: <200503181413.j2IED5g7031231@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-services/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv31216 Modified Files: .cvsignore sources system-config-services.spec Log Message: don't read from /dev/null when restarting xinetd/services to prevent hangs build toolbar in glade to avoid DeprecationWarnings (#134978) dynamic, translated column titles for runlevel columns Added patch from Charlie Brej Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-services/FC-3/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 28 Jan 2005 16:13:58 -0000 1.13 +++ .cvsignore 18 Mar 2005 14:13:03 -0000 1.14 @@ -1 +1 @@ -system-config-services-0.8.18.tar.gz +system-config-services-0.8.20.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-services/FC-3/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 28 Jan 2005 16:13:58 -0000 1.17 +++ sources 18 Mar 2005 14:13:03 -0000 1.18 @@ -1 +1 @@ -8b8fd8f5744282c5b120a26a1a562e25 system-config-services-0.8.18.tar.gz +85de376af1039c5b41f96b19e8027c27 system-config-services-0.8.20.tar.gz Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/FC-3/system-config-services.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- system-config-services.spec 28 Jan 2005 16:13:58 -0000 1.16 +++ system-config-services.spec 18 Mar 2005 14:13:03 -0000 1.17 @@ -1,8 +1,8 @@ # -*- RPM-SPEC -*- Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.8.18 -Release: 0.fc3.1 +Version: 0.8.20 +Release: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -59,7 +59,15 @@ %{_mandir}/*/system-config-services.8* %changelog -* Fri Jan 28 2005 Nils Philippsen 0.8.18-0.fc3.1 +* Fri Mar 18 2005 Nils Philippsen 0.8.20-1 +- don't read from /dev/null when restarting xinetd/services to prevent hangs +- build toolbar in glade to avoid DeprecationWarnings (#134978) +- dynamic, translated column titles for runlevel columns + +* Thu Feb 17 2005 Daniel J Walsh 0.8.19-1 +- Added patch from Charlie Brej + +* Fri Jan 28 2005 Nils Philippsen 0.8.18-1 - fix off-by-one which prevented saving changes to the last service in the list (#139456) From fedora-cvs-commits at redhat.com Fri Mar 18 14:13:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 09:13:31 -0500 Subject: rpms/system-config-services/FC-3 system-config-services.spec, 1.17, 1.18 Message-ID: <200503181413.j2IEDVKi031282@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-services/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv31257 Modified Files: system-config-services.spec Log Message: fix release Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/FC-3/system-config-services.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- system-config-services.spec 18 Mar 2005 14:13:03 -0000 1.17 +++ system-config-services.spec 18 Mar 2005 14:13:29 -0000 1.18 @@ -2,7 +2,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services Version: 0.8.20 -Release: 1 +Release: 0.fc3.1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -59,7 +59,7 @@ %{_mandir}/*/system-config-services.8* %changelog -* Fri Mar 18 2005 Nils Philippsen 0.8.20-1 +* Fri Mar 18 2005 Nils Philippsen 0.8.20-0.fc3.1 - don't read from /dev/null when restarting xinetd/services to prevent hangs - build toolbar in glade to avoid DeprecationWarnings (#134978) - dynamic, translated column titles for runlevel columns From fedora-cvs-commits at redhat.com Fri Mar 18 14:32:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 09:32:28 -0500 Subject: rpms/gnomemeeting/devel gnomemeeting.spec,1.21,1.22 Message-ID: <200503181432.j2IEWSEw013133@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnomemeeting/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13120 Modified Files: gnomemeeting.spec Log Message: Reenabling ppc64, .spec cleanup, Daniel Index: gnomemeeting.spec =================================================================== RCS file: /cvs/dist/rpms/gnomemeeting/devel/gnomemeeting.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gnomemeeting.spec 18 Mar 2005 11:59:57 -0000 1.21 +++ gnomemeeting.spec 18 Mar 2005 14:32:26 -0000 1.22 @@ -1,7 +1,7 @@ Summary: A Gnome based H323 teleconferencing application Name: gnomemeeting Version: 1.2.1 -Release: 1 +Release: 2 URL: http://www.gnomemeeting.org/ Source0: http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/gnomemeeting-%{version}.tar.gz License: GPL @@ -31,7 +31,6 @@ BuildRequires: gettext BuildRequires: howl-devel >= 0.9.7 BuildRequires: evolution-data-server-devel -ExcludeArch: ppc64 %description GnomeMeeting is a tool to communicate with video and audio over the internet. @@ -85,172 +84,118 @@ %{_sysconfdir}/gconf/schemas/gnomemeeting.schemas %changelog +* Fri Mar 18 2005 Daniel Veillard 1.2.1-2 +- Reenabled ppc64 * Fri Mar 18 2005 Daniel Veillard 1.2.1-1 - Update to new version 1.2.1 - * Thu Mar 17 2005 Christopher Aillon - 1.2.0-6 - Rebuild - * Wed Feb 9 2005 David Malcolm - 1.2.0-5 - rebuild - * Thu Feb 3 2005 Daniel Reed 1.2.0-4 - rebuild with evil patch to look for libebook-1.2.pc instead of libebook-1.0.pc (neither -2 nor -3 went through, but were tagged) - * Thu Feb 3 2005 Matthias Clasen - 1.2.0-3 - rebuild - * Fri Jan 28 2005 Florian La Roche - rebuild - * Mon Dec 20 2004 Daniel Reed 1.2.0-1 - version bump - * Wed Aug 18 2004 Daniel Reed 1.0.2-8 - remove ExcludeArch - * Thu Aug 12 2004 Daniel Reed 1.0.2-7 - ExcludeArch: ppc64 to temporarily work around #129699 - * Wed Aug 11 2004 Daniel Reed 1.0.2-6 - remove ExclusiveArch - * Mon Aug 2 2004 Daniel Reed 1.0.2-4 - spec cleanup - * Tue Jun 15 2004 Elliot Lee - rebuilt - * Sat Apr 10 2004 Warren Togami 1.0.2-2 - BR scrollkeeper alsa-lib-devel gettext - * Fri Apr 2 2004 Alex Larsson 1.0.2-1 - update to 1.0.2 - * Tue Mar 02 2004 Elliot Lee - rebuilt - * Thu Feb 26 2004 Alexander Larsson 1.0-1 - update to 1.0 final - * Mon Feb 23 2004 Alexander Larsson 1.0-0.pre2.0 - update to 1.0pre2 - * Fri Feb 13 2004 Elliot Lee - rebuilt - * Wed Sep 10 2003 Alexander Larsson 0.98.5-1 - update to 0.98.5 (bugfix release which fixes a libxml parser crash with for threaded apps, no other code changes) - * Wed Sep 3 2003 Alexander Larsson 0.98.4-1 - update to 0.98.4 - * Fri Jul 4 2003 Alexander Larsson 0.98.0-1 - Update to 0.98.0 - * Wed Jun 04 2003 Elliot Lee - rebuilt - * Tue Mar 4 2003 Alexander Larsson 0.96.1-1 - Update to 0.96.1, remove clearcall patch - * Mon Feb 24 2003 Elliot Lee - debuginfo rebuild - * Mon Feb 24 2003 Alexander Larsson 0.96.0-3 - Fixed bad bug with pc-to-phone calls (#84941) - * Mon Jan 27 2003 Alexander Larsson 0.96.0-2 - new tarball from upstream - * Thu Jan 23 2003 Alexander Larsson 0.96.0-1 - update to 0.96.0 (final) - * Wed Jan 22 2003 Tim Powers 0.95.0-2 - rebuilt - * Wed Jan 8 2003 Alexander Larsson 0.95.0-1 - Update to 0.95.0 - * Tue Jan 7 2003 Nalin Dahyabhai 0.94.1-4 - Rebuild - * Thu Dec 12 2002 Nalin Dahyabhai - Use OpenSSL's pkg-config data, if available - * Thu Oct 24 2002 Alexander Larsson 0.94.1-3 - Buildrequire openh323-devel 1.9.10-4 - * Thu Oct 24 2002 Alexander Larsson 0.94.1-2 - Add patch to force speex enabled - * Wed Oct 23 2002 Alexander Larsson 0.94.1-1 - Update to 0.94.1 - * Wed Oct 9 2002 Alexander Larsson 0.93.1-5 - Add 64bit patch - Added ldap patch - libdir fixes - * Tue Aug 27 2002 Nalin Dahyabhai 0.93.1-4 - rebuild - * Sat Aug 10 2002 Elliot Lee - rebuilt with gcc-3.2 (we hope) - * Thu Aug 8 2002 Alexander Larsson - Fix menu desktopfile link, fixes #70652 - * Tue Jul 23 2002 Alexander Larsson 0.93.0-4 - Move desktop file to redhat-menus. Add symlink instead. - * Tue Jul 23 2002 Tim Powers 0.93.0-3 - build using gcc-3.2-0.1 - * Wed Jul 17 2002 Alexander Larsson 0.93.0-2 - Add gnomemeeting.server to %files - * Thu Jul 11 2002 Alexander Larsson 0.93.0-1 - Update to 0.93.0 - * Thu Jul 4 2002 Alexander Larsson - Add configure patch for 64bit systems - * Mon Mar 11 2002 Alex Larsson 0.85.1-3 - Update to new tarball from damien - * Fri Mar 8 2002 Alex Larsson 0.85.1-1 - Update to 0.85.1 from upstream - * Wed Feb 27 2002 Alex Larsson 0.84.0-3 - Require GConf 1.0.8-4 - * Wed Feb 27 2002 Alex Larsson 0.84.0-2 - Require GConf 1.0.8-2, shutdown gconf in %post - * Mon Feb 25 2002 Alex Larsson 0.84.0-1 - Update to 0.84 - * Tue Dec 4 2001 Alex Larsson - Updated to 0.12.2 - * Sat Dec 1 2001 Alex Larsson - Update to 0.12 - * Wed Sep 27 2001 Alex Larsson 0.11-2 - Fix translations. Had wrong name in find_lang - * Wed Sep 19 2001 Alex Larsson 0.11-1 - Update to 0.11 - * Wed Aug 15 2001 Alexander Larsson 0.10-2 - Added include order patch - * Wed Aug 15 2001 Alexander Larsson 0.10-1 - Updated to 0.10 - * Thu Jul 5 2001 Alex Larsson - Initial build. - - From fedora-cvs-commits at redhat.com Fri Mar 18 15:51:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 10:51:10 -0500 Subject: rpms/gnome-vfs2/devel .cvsignore, 1.19, 1.20 gnome-vfs2.spec, 1.52, 1.53 sources, 1.19, 1.20 Message-ID: <200503181551.j2IFpAw8012833@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12814 Modified Files: .cvsignore gnome-vfs2.spec sources Log Message: * Fri Mar 18 2005 David Zeuthen 2.10.0-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 11 Feb 2005 16:50:17 -0000 1.19 +++ .cvsignore 18 Mar 2005 15:51:06 -0000 1.20 @@ -6,3 +6,4 @@ gnome-vfs-2.8.2.tar.bz2 gnome-vfs-2.9.90.tar.bz2 gnome-vfs-2.9.91.tar.bz2 +gnome-vfs-2.10.0.tar.bz2 Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- gnome-vfs2.spec 8 Mar 2005 02:12:26 -0000 1.52 +++ gnome-vfs2.spec 18 Mar 2005 15:51:06 -0000 1.53 @@ -8,8 +8,8 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 -Version: 2.9.91 -Release: 8 +Version: 2.10.0 +Release: 1 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -195,6 +195,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Fri Mar 18 2005 David Zeuthen 2.10.0-1 +- New upstream version + * Mon Mar 7 2005 David Zeuthen - 2.9.91-8 - More gcc 4.0 build fixes Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 11 Feb 2005 16:50:17 -0000 1.19 +++ sources 18 Mar 2005 15:51:06 -0000 1.20 @@ -1 +1 @@ -cd911b30c917089cd3d90b8651173511 gnome-vfs-2.9.91.tar.bz2 +bb9df65d6a77414bbde9f1bc429c9d97 gnome-vfs-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 16:04:08 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:04:08 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec, 1.53, 1.54 gnome-vfs-multithreaded-cancellation.patch, 1.2, NONE Message-ID: <200503181604.j2IG48UX024170@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24140 Modified Files: gnome-vfs2.spec Removed Files: gnome-vfs-multithreaded-cancellation.patch Log Message: * Fri Mar 18 2005 David Zeuthen 2.10.0-2 - Drop a patch that was applied upstream Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- gnome-vfs2.spec 18 Mar 2005 15:51:06 -0000 1.53 +++ gnome-vfs2.spec 18 Mar 2005 16:03:57 -0000 1.54 @@ -9,7 +9,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.10.0 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -46,9 +46,6 @@ # send to upstream Patch101: gnome-vfs-2.8.2-schema_about_for_upstream.patch -#Already in cvs upstream: -Patch102: gnome-vfs-multithreaded-cancellation.patch - # Default Patch104: gnome-vfs-2.8.2-browser_default.patch @@ -105,8 +102,6 @@ # send to upstream %patch101 -p1 -b .schema_about -%patch102 -p0 -b .multithread - %patch104 -p1 -b .browser_default %patch201 -p0 -b .console @@ -195,6 +190,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Fri Mar 18 2005 David Zeuthen 2.10.0-2 +- Drop a patch that was applied upstream + * Fri Mar 18 2005 David Zeuthen 2.10.0-1 - New upstream version --- gnome-vfs-multithreaded-cancellation.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 18 16:05:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:05:41 -0500 Subject: rpms/eel2/devel .cvsignore, 1.19, 1.20 eel2.spec, 1.21, 1.22 sources, 1.19, 1.20 Message-ID: <200503181605.j2IG5fPS024246@cvs.devel.redhat.com> Update of /cvs/dist/rpms/eel2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24231 Modified Files: .cvsignore eel2.spec sources Log Message: * Fri Mar 18 2005 David Zeuthen 2.10.0-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 11 Feb 2005 16:39:51 -0000 1.19 +++ .cvsignore 18 Mar 2005 16:05:39 -0000 1.20 @@ -3,3 +3,4 @@ eel-2.8.1.tar.bz2 eel-2.9.90.tar.bz2 eel-2.9.91.tar.bz2 +eel-2.10.0.tar.bz2 Index: eel2.spec =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- eel2.spec 2 Mar 2005 15:26:26 -0000 1.21 +++ eel2.spec 18 Mar 2005 16:05:39 -0000 1.22 @@ -8,15 +8,15 @@ %define libart_lgpl_version 2.3.8 %define gail_version 0.17-2 %define desktop_file_utils_version 0.7 -%define gnome_menus_version 2.9.1 -%define gnome_desktop_version 2.1.4 +%define gnome_menus_version 2.10.0 +%define gnome_desktop_version 2.10.0 %define po_package eel-2.0 Name: eel2 Summary: Eazel Extensions Library. -Version: 2.9.91 -Release: 2 +Version: 2.10.0 +Release: 1 License: GPL Group: System Environment/Libraries Source: eel-%{version}.tar.bz2 @@ -105,6 +105,9 @@ %{_includedir}/eel-2 %changelog +* Fri Mar 18 2005 David Zeuthen 2.10.0-1 +- New upstream version + * Wed Mar 2 2005 Alex Larsson 2.9.91-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 11 Feb 2005 16:39:51 -0000 1.19 +++ sources 18 Mar 2005 16:05:39 -0000 1.20 @@ -1 +1 @@ -44082b0bea4763038fca2f09c76b73a4 eel-2.9.91.tar.bz2 +465cd522fabfed5668e70d7eae5f99e0 eel-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 16:09:20 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:09:20 -0500 Subject: rpms/file-roller/devel .cvsignore, 1.20, 1.21 file-roller.spec, 1.27, 1.28 sources, 1.21, 1.22 Message-ID: <200503181609.j2IG9Ksr024416@cvs.devel.redhat.com> Update of /cvs/dist/rpms/file-roller/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24405 Modified Files: .cvsignore file-roller.spec sources Log Message: * Fri Mar 18 2005 David Zeuthen 2.10.0-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 3 Mar 2005 16:16:37 -0000 1.20 +++ .cvsignore 18 Mar 2005 16:09:16 -0000 1.21 @@ -6,3 +6,4 @@ file-roller-2.9.4.tar.bz2 file-roller-2.9.91.tar.bz2 file-roller-2.9.92.tar.bz2 +file-roller-2.10.0.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- file-roller.spec 3 Mar 2005 16:16:37 -0000 1.27 +++ file-roller.spec 18 Mar 2005 16:09:16 -0000 1.28 @@ -9,7 +9,7 @@ Summary: File Roller is a tool for viewing and creating archives. Name: file-roller -Version: 2.9.92 +Version: 2.10.0 Release: 1 License: GPL @@ -110,6 +110,9 @@ %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so %changelog +* Fri Mar 18 2005 David Zeuthen 2.10.0-1 +- New upstream version + * Thu Mar 3 2005 Marco Pesenti Gritti 2.9.92-1 - Update to 2.9.92 Index: sources =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 3 Mar 2005 16:19:12 -0000 1.21 +++ sources 18 Mar 2005 16:09:16 -0000 1.22 @@ -1 +1 @@ -0d88d809a448afdc6220cf144448e045 file-roller-2.9.92.tar.bz2 +0cb5b09aad7c9d352922994a6e8cf088 file-roller-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 16:24:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:24:41 -0500 Subject: rpms/gnome-keyring/devel .cvsignore, 1.8, 1.9 gnome-keyring.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200503181624.j2IGOfH4006383@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnome-keyring/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27875 Modified Files: .cvsignore gnome-keyring.spec sources Log Message: * Fri Mar 18 2005 David Zeuthen 0.4.2-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-keyring/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Feb 2005 21:20:31 -0000 1.8 +++ .cvsignore 18 Mar 2005 16:24:39 -0000 1.9 @@ -1,3 +1,4 @@ gnome-keyring-0.3.3.tar.bz2 gnome-keyring-0.4.0.tar.bz2 gnome-keyring-0.4.1.tar.bz2 +gnome-keyring-0.4.2.tar.bz2 Index: gnome-keyring.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gnome-keyring.spec 2 Mar 2005 15:49:43 -0000 1.10 +++ gnome-keyring.spec 18 Mar 2005 16:24:39 -0000 1.11 @@ -2,8 +2,8 @@ Summary: A framework for managing user passwords and other secrets Name: gnome-keyring -Version: 0.4.1 -Release: 2 +Version: 0.4.2 +Release: 1 License: GPL/LGPL Group: System Environment/Libraries Source: gnome-keyring-%{version}.tar.bz2 @@ -65,6 +65,9 @@ %{_includedir}/* %changelog +* Fri Mar 18 2005 David Zeuthen 0.4.2-1 +- New upstream version + * Wed Mar 2 2005 Alex Larsson 0.4.1-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-keyring/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Feb 2005 21:20:31 -0000 1.8 +++ sources 18 Mar 2005 16:24:39 -0000 1.9 @@ -1 +1 @@ -031901a50273cc5a39b1305924613a1b gnome-keyring-0.4.1.tar.bz2 +220930f6685780089cc5c769dd4ad561 gnome-keyring-0.4.2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 16:35:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:35:25 -0500 Subject: rpms/boost/devel boost-base.patch, 1.2, 1.3 boost-gcc-tools.patch, 1.4, 1.5 boost.spec, 1.10, 1.11 Message-ID: <200503181635.j2IGZPQl006670@cvs.devel.redhat.com> Update of /cvs/dist/rpms/boost/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6655 Modified Files: boost-base.patch boost-gcc-tools.patch boost.spec Log Message: * Fri Mar 18 2005 Benjamin Kosnik 1.32.0-5 - Revert boost-base.patch to old behavior. - Use SONAMEVERSION instead of dllversion. boost-base.patch: boost-base.jam | 8 !!!!!!!! 1 files changed, 8 modifications(!) Index: boost-base.patch =================================================================== RCS file: /cvs/dist/rpms/boost/devel/boost-base.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- boost-base.patch 17 Mar 2005 01:12:29 -0000 1.2 +++ boost-base.patch 18 Mar 2005 16:35:21 -0000 1.3 @@ -1,23 +1,28 @@ -*** tools/build/v1/boost-base.jam.orig 2005-03-15 22:38:05.110845776 -0600 ---- tools/build/v1/boost-base.jam 2005-03-15 22:39:21.250352319 -0600 +Index: tools/build/v1/boost-base.jam +=================================================================== +RCS file: /cvsroot/boost/boost/tools/build/v1/boost-base.jam,v +retrieving revision 1.129 +diff -c -p -r1.129 boost-base.jam +*** tools/build/v1/boost-base.jam 28 Jan 2004 22:50:17 -0000 1.129 +--- tools/build/v1/boost-base.jam 1 Apr 2004 22:48:45 -0000 *************** rule common-variant-tag ( toolset varian -*** 2651,2660 **** - version-tag = $(version-tag:J="_") ; - } +*** 2621,2630 **** + local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(version-number[1]) ] ; + version-tag = $(version-tag:J="_") ; ! tags += $(toolset-tag:J=) ; - tags += $(thread-tag:J=) ; +! tags += $(thread-tag:J=) ; ! tags += $(runtime-tag:J=) ; ! tags += $(version-tag) ; if $(tags) { ---- 2651,2660 ---- - version-tag = $(version-tag:J="_") ; - } +--- 2621,2630 ---- + local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(version-number[1]) ] ; + version-tag = $(version-tag:J="_") ; ! # tags += $(toolset-tag:J=) ; - tags += $(thread-tag:J=) ; +! # tags += $(thread-tag:J=) ; ! # tags += $(runtime-tag:J=) ; ! # tags += $(version-tag) ; boost-gcc-tools.patch: gcc-tools.jam | 5 +!!!! 1 files changed, 1 insertion(+), 4 modifications(!) Index: boost-gcc-tools.patch =================================================================== RCS file: /cvs/dist/rpms/boost/devel/boost-gcc-tools.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- boost-gcc-tools.patch 17 Mar 2005 01:12:29 -0000 1.4 +++ boost-gcc-tools.patch 18 Mar 2005 16:35:21 -0000 1.5 @@ -1,5 +1,5 @@ -*** tools/build/v1/gcc-tools.jam.orig 2005-03-15 22:41:36.879694255 -0600 ---- tools/build/v1/gcc-tools.jam 2005-03-15 22:42:01.449887423 -0600 +*** tools/build/v1/gcc-tools.jam.orig 2005-03-18 09:58:30.227128264 -0600 +--- tools/build/v1/gcc-tools.jam 2005-03-18 10:00:20.235025969 -0600 *************** flags gcc LINKFLAGS static *** 60,66 **** flags gcc CFLAGS on : -g ; @@ -17,3 +17,30 @@ # Other optimizations we might want for GCC # -fforce-mem -fomit-frame-pointer +*************** flags gcc FINDLIBS ; +*** 352,357 **** +--- 352,358 ---- + flags gcc DLLVERSION ; + DLLVERSION = $(DLLVERSION[1]) ; + DLLVERSION ?= $(BOOST_VERSION) ; ++ SONAMEVERSION = 1 ; + + flags gcc TARGET_TYPE ; + +*************** rule Link-action +*** 387,393 **** + if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) + { + OUTTAG on $(<) = ".$(DLLVERSION)" ; +! SOTAG on $(<) = ".$(DLLVERSION)" ; + ACTION_1 on $(<) = "" ; + } + else +--- 388,394 ---- + if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) + { + OUTTAG on $(<) = ".$(DLLVERSION)" ; +! SOTAG on $(<) = ".$(SONAMEVERSION)" ; + ACTION_1 on $(<) = "" ; + } + else Index: boost.spec =================================================================== RCS file: /cvs/dist/rpms/boost/devel/boost.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- boost.spec 17 Mar 2005 01:12:29 -0000 1.10 +++ boost.spec 18 Mar 2005 16:35:21 -0000 1.11 @@ -3,7 +3,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.32.0 -Release: 4 +Release: 5 License: Boost Software License URL: http://www.boost.org/ Group: System Environment/Libraries @@ -16,7 +16,6 @@ Patch0: boost-base.patch Patch1: boost-gcc-tools.patch Patch2: boost-thread.patch -Patch3: boost-config-compiler-gcc.patch %description Boost provides free peer-reviewed portable C++ source libraries. The @@ -44,7 +43,6 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p0 %build #build bjam @@ -53,7 +51,8 @@ BJAM=`find tools/build/jam_src/ -name bjam -a -type f` PYTHON_VERSION=`python -V 2>&1 |sed 's,.* \([0-9]\.[0-9]\)\(\.[0-9]\)\?.*,\1,'` PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION" -$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release 1" stage +#$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release 1" stage +$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release" stage %install mkdir -p $RPM_BUILD_ROOT%{_libdir} @@ -101,6 +100,10 @@ %{_libdir}/*.a %changelog +* Fri Mar 18 2005 Benjamin Kosnik 1.32.0-5 +- Revert boost-base.patch to old behavior. +- Use SONAMEVERSION instead of dllversion. + * Wed Mar 16 2005 Benjamin Kosnik 1.32.0-4 - (#142612: Compiling Boost 1.32.0 Failed in RHEL 3.0 on Itanium2) - (#150069: libboost_python.so is missing) @@ -110,7 +113,7 @@ - Change boost-base.patch to show thread tags. - Change boost-gcc-tools.patch to use SOTAG, compile with dllversion. - Add symbolic links to files. -- Sanity check can compile with gcc-3.3.x, gcc-3.4.2. +- Sanity check can compile with gcc-3.3.x, gcc-3.4.2, gcc-4.0.x., gcc-4.1.x. * Thu Dec 02 2004 Benjamin Kosnik 1.32.0-3 - (#122817: libboost_*.so symlinks missing) From fedora-cvs-commits at redhat.com Fri Mar 18 16:36:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:36:43 -0500 Subject: rpms/libgnome/devel libgnome-2.9.1-popt.patch, NONE, 1.1 libgnome.spec, 1.22, 1.23 Message-ID: <200503181636.j2IGahoS006757@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libgnome/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6743 Modified Files: libgnome.spec Added Files: libgnome-2.9.1-popt.patch Log Message: Fix s390 libgnome-2.9.1-popt.patch: gnome-gconf.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE libgnome-2.9.1-popt.patch --- --- libgnome-2.9.1/libgnome/gnome-gconf.c.popt 2005-03-18 11:34:23.000000000 -0500 +++ libgnome-2.9.1/libgnome/gnome-gconf.c 2005-03-18 11:34:42.000000000 -0500 @@ -27,6 +27,8 @@ #include #include +#include + #define GCONF_ENABLE_INTERNALS #include #include Index: libgnome.spec =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libgnome.spec 17 Mar 2005 20:02:31 -0000 1.22 +++ libgnome.spec 18 Mar 2005 16:36:41 -0000 1.23 @@ -12,7 +12,7 @@ Summary: GNOME base library Name: libgnome Version: 2.9.1 -Release: 2 +Release: 3 URL: ftp://ftp.gnome.org/ Source0: %{name}-%{version}.tar.bz2 Source1: desktop_gnome_peripherals_monitor.schemas @@ -49,6 +49,7 @@ Patch4: libgnome-2.7.2-default-cursor.patch Patch5: libgnome-2.8.0-default-browser.patch Patch6: libgnome-2.8.0-stat-homedir.patch +Patch7: libgnome-2.9.1-popt.patch # Added to avoid the warning messages about utmp group, bug #24171 # fixme, just libzvt? @@ -101,6 +102,7 @@ %patch4 -p1 -b .default-cursor %patch5 -p1 -b .default-browser %patch6 -p1 -b .stat-homedir +%patch7 -p1 -b .popt %build intltoolize -f @@ -155,6 +157,9 @@ %{_datadir}/gtk-doc %changelog +* Fri Mar 18 2005 Matthias Clasen - 2.9.1-3 +- Fix the build on s390 + * Thu Mar 17 2005 Matthias Clasen - 2.9.1-2 - Switch to Clearlooks as default gtk theme, gnome as default icon theme From fedora-cvs-commits at redhat.com Fri Mar 18 16:37:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:37:31 -0500 Subject: rpms/boost/FC-3 boost-base.patch, 1.2, 1.3 boost-gcc-tools.patch, 1.4, 1.5 boost.spec, 1.12, 1.13 boost-config-compiler-gcc.patch, 1.1, NONE Message-ID: <200503181637.j2IGbUj1006851@cvs.devel.redhat.com> Update of /cvs/dist/rpms/boost/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv6828/FC-3 Modified Files: boost-base.patch boost-gcc-tools.patch boost.spec Removed Files: boost-config-compiler-gcc.patch Log Message: auto-import boost-1.32.0-5.fc3 on branch FC-3 from boost-1.32.0-5.fc3.src.rpm boost-base.patch: boost-base.jam | 8 !!!!!!!! 1 files changed, 8 modifications(!) Index: boost-base.patch =================================================================== RCS file: /cvs/dist/rpms/boost/FC-3/boost-base.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- boost-base.patch 17 Mar 2005 02:21:38 -0000 1.2 +++ boost-base.patch 18 Mar 2005 16:37:27 -0000 1.3 @@ -1,23 +1,28 @@ -*** tools/build/v1/boost-base.jam.orig 2005-03-15 22:38:05.110845776 -0600 ---- tools/build/v1/boost-base.jam 2005-03-15 22:39:21.250352319 -0600 +Index: tools/build/v1/boost-base.jam +=================================================================== +RCS file: /cvsroot/boost/boost/tools/build/v1/boost-base.jam,v +retrieving revision 1.129 +diff -c -p -r1.129 boost-base.jam +*** tools/build/v1/boost-base.jam 28 Jan 2004 22:50:17 -0000 1.129 +--- tools/build/v1/boost-base.jam 1 Apr 2004 22:48:45 -0000 *************** rule common-variant-tag ( toolset varian -*** 2651,2660 **** - version-tag = $(version-tag:J="_") ; - } +*** 2621,2630 **** + local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(version-number[1]) ] ; + version-tag = $(version-tag:J="_") ; ! tags += $(toolset-tag:J=) ; - tags += $(thread-tag:J=) ; +! tags += $(thread-tag:J=) ; ! tags += $(runtime-tag:J=) ; ! tags += $(version-tag) ; if $(tags) { ---- 2651,2660 ---- - version-tag = $(version-tag:J="_") ; - } +--- 2621,2630 ---- + local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(version-number[1]) ] ; + version-tag = $(version-tag:J="_") ; ! # tags += $(toolset-tag:J=) ; - tags += $(thread-tag:J=) ; +! # tags += $(thread-tag:J=) ; ! # tags += $(runtime-tag:J=) ; ! # tags += $(version-tag) ; boost-gcc-tools.patch: gcc-tools.jam | 5 +!!!! 1 files changed, 1 insertion(+), 4 modifications(!) Index: boost-gcc-tools.patch =================================================================== RCS file: /cvs/dist/rpms/boost/FC-3/boost-gcc-tools.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- boost-gcc-tools.patch 17 Mar 2005 02:21:38 -0000 1.4 +++ boost-gcc-tools.patch 18 Mar 2005 16:37:27 -0000 1.5 @@ -1,5 +1,5 @@ -*** tools/build/v1/gcc-tools.jam.orig 2005-03-15 22:41:36.879694255 -0600 ---- tools/build/v1/gcc-tools.jam 2005-03-15 22:42:01.449887423 -0600 +*** tools/build/v1/gcc-tools.jam.orig 2005-03-18 09:58:30.227128264 -0600 +--- tools/build/v1/gcc-tools.jam 2005-03-18 10:00:20.235025969 -0600 *************** flags gcc LINKFLAGS static *** 60,66 **** flags gcc CFLAGS on : -g ; @@ -17,3 +17,30 @@ # Other optimizations we might want for GCC # -fforce-mem -fomit-frame-pointer +*************** flags gcc FINDLIBS ; +*** 352,357 **** +--- 352,358 ---- + flags gcc DLLVERSION ; + DLLVERSION = $(DLLVERSION[1]) ; + DLLVERSION ?= $(BOOST_VERSION) ; ++ SONAMEVERSION = 1 ; + + flags gcc TARGET_TYPE ; + +*************** rule Link-action +*** 387,393 **** + if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) + { + OUTTAG on $(<) = ".$(DLLVERSION)" ; +! SOTAG on $(<) = ".$(DLLVERSION)" ; + ACTION_1 on $(<) = "" ; + } + else +--- 388,394 ---- + if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN) + { + OUTTAG on $(<) = ".$(DLLVERSION)" ; +! SOTAG on $(<) = ".$(SONAMEVERSION)" ; + ACTION_1 on $(<) = "" ; + } + else Index: boost.spec =================================================================== RCS file: /cvs/dist/rpms/boost/FC-3/boost.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- boost.spec 17 Mar 2005 02:21:38 -0000 1.12 +++ boost.spec 18 Mar 2005 16:37:27 -0000 1.13 @@ -3,7 +3,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.32.0 -Release: 4.fc3 +Release: 5.fc3 License: Boost Software License URL: http://www.boost.org/ Group: System Environment/Libraries @@ -16,7 +16,6 @@ Patch0: boost-base.patch Patch1: boost-gcc-tools.patch Patch2: boost-thread.patch -Patch3: boost-config-compiler-gcc.patch %description Boost provides free peer-reviewed portable C++ source libraries. The @@ -44,7 +43,6 @@ %patch0 -p0 %patch1 -p0 %patch2 -p0 -%patch3 -p0 %build #build bjam @@ -53,7 +51,8 @@ BJAM=`find tools/build/jam_src/ -name bjam -a -type f` PYTHON_VERSION=`python -V 2>&1 |sed 's,.* \([0-9]\.[0-9]\)\(\.[0-9]\)\?.*,\1,'` PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION" -$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release 1" stage +#$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release 1" stage +$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release" stage %install mkdir -p $RPM_BUILD_ROOT%{_libdir} @@ -101,6 +100,10 @@ %{_libdir}/*.a %changelog +* Fri Mar 18 2005 Benjamin Kosnik 1.32.0-5 +- Revert boost-base.patch to old behavior. +- Use SONAMEVERSION instead of dllversion. + * Wed Mar 16 2005 Benjamin Kosnik 1.32.0-4 - (#142612: Compiling Boost 1.32.0 Failed in RHEL 3.0 on Itanium2) - (#150069: libboost_python.so is missing) @@ -110,7 +113,7 @@ - Change boost-base.patch to show thread tags. - Change boost-gcc-tools.patch to use SOTAG, compile with dllversion. - Add symbolic links to files. -- Sanity check can compile with gcc-3.3.x, gcc-3.4.2. +- Sanity check can compile with gcc-3.3.x, gcc-3.4.2, gcc-4.0.x., gcc-4.1.x. * Thu Dec 02 2004 Benjamin Kosnik 1.32.0-3 - (#122817: libboost_*.so symlinks missing) --- boost-config-compiler-gcc.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 18 16:40:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:40:38 -0500 Subject: rpms/iptables/devel iptables-1.3.0-no_root.patch, NONE, 1.1 iptables-config, 1.3, 1.4 iptables.spec, 1.29, 1.30 Message-ID: <200503181640.j2IGecOE006973@cvs.devel.redhat.com> Update of /cvs/dist/rpms/iptables/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6955 Modified Files: iptables-config iptables.spec Added Files: iptables-1.3.0-no_root.patch Log Message: [tw] - Remove unnecessary explicit kernel dep (#146142) - Fixed out of bounds accesses (#131848): Thanks to Steve Grubb for the patch - Adapted iptables-config to reference to modprobe.conf (#150143) - Remove misleading message (#140154): Thanks to Ulrich Drepper for the patch iptables-1.3.0-no_root.patch: iptables.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE iptables-1.3.0-no_root.patch --- --- iptables-1.3.0/iptables.c.no_root 2005-03-18 17:29:57.109501987 +0100 +++ iptables-1.3.0/iptables.c 2005-03-18 17:29:58.321405982 +0100 @@ -2300,7 +2300,7 @@ *handle = iptc_init(*table); if (!*handle) - exit_error(VERSION_PROBLEM, + exit_error(errno == EPERM ? OTHER_PROBLEM : VERSION_PROBLEM, "can't initialize iptables table `%s': %s", *table, iptc_strerror(errno)); Index: iptables-config =================================================================== RCS file: /cvs/dist/rpms/iptables/devel/iptables-config,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- iptables-config 17 Sep 2004 10:41:31 -0000 1.3 +++ iptables-config 18 Mar 2005 16:40:36 -0000 1.4 @@ -2,7 +2,7 @@ # Default: -none- # Space separated list of nat helpers (e.g. 'ip_nat_ftp ip_nat_irc'), which # are loaded after the firewall rules are applied. Options for the helpers are -# stored in /etc/modules.conf. +# stored in /etc/modprobe.conf. IPTABLES_MODULES="" # Unload modules on restart and stop Index: iptables.spec =================================================================== RCS file: /cvs/dist/rpms/iptables/devel/iptables.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- iptables.spec 22 Feb 2005 11:09:58 -0000 1.29 +++ iptables.spec 18 Mar 2005 16:40:36 -0000 1.30 @@ -4,7 +4,7 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities. Version: 1.3.0 -Release: 1 +Release: 2 Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config @@ -15,14 +15,15 @@ Patch4: iptables-1.2.9-netlink.patch Patch5: iptables-1.3.0-selinux.patch Patch6: iptables-1.2.10-counters.patch -Patch8: iptables-1.2.11-cleanup.patch +Patch8: iptables-1.3.0-cleanup.patch Patch9: iptables-1.3.0-autoload.patch +Patch10: iptables-1.3.0-no_root.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %{_tmppath}/%{name}-buildroot License: GPL BuildPrereq: /usr/bin/perl -Requires: kernel >= 2.4.20 +Conflicts: kernel < 2.4.20 Requires(post,postun): chkconfig Prefix: %{_prefix} @@ -74,6 +75,7 @@ %patch6 -p1 -b .counters %patch8 -p1 -b .cleanup %patch9 -p1 -b .autoload +%patch10 -p1 -b .no_root # Put it to a reasonable place find . -type f -exec perl -pi -e "s,/usr/local,%{prefix},g" {} \; @@ -148,6 +150,14 @@ %endif %changelog +* Fri Mar 18 2005 Thomas Woerner 1.3.0-2 +- Remove unnecessary explicit kernel dep (#146142) +- Fixed out of bounds accesses (#131848): Thanks to Steve Grubb + for the patch +- Adapted iptables-config to reference to modprobe.conf (#150143) +- Remove misleading message (#140154): Thanks to Ulrich Drepper + for the patch + * Mon Feb 21 2005 Thomas Woerner 1.3.0-1 - new version 1.3.0 From fedora-cvs-commits at redhat.com Fri Mar 18 16:45:15 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:45:15 -0500 Subject: rpms/iptables/devel iptables-1.3.0-cleanup.patch,NONE,1.1 Message-ID: <200503181645.j2IGjFuH009542@cvs.devel.redhat.com> Update of /cvs/dist/rpms/iptables/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7042 Added Files: iptables-1.3.0-cleanup.patch Log Message: [tw] forgot to add one patch iptables-1.3.0-cleanup.patch: libipt_REJECT.c | 20 +++++++++++++------- libipt_rpc.c | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) --- NEW FILE iptables-1.3.0-cleanup.patch --- --- iptables-1.3.0/extensions/libipt_rpc.c.cleanup 2005-03-18 16:25:34.174370567 +0100 +++ iptables-1.3.0/extensions/libipt_rpc.c 2005-03-18 16:25:32.000000000 +0100 @@ -252,7 +252,7 @@ idup = 0; memset(buf, 0, sizeof(buf)); - dst = (char *)buf - 1; + dst = (char *)buf; } } --- iptables-1.3.0/extensions/libipt_REJECT.c.cleanup 2005-03-18 16:29:21.611549462 +0100 +++ iptables-1.3.0/extensions/libipt_REJECT.c 2005-03-18 16:31:26.951045260 +0100 @@ -147,13 +147,16 @@ { const struct ipt_reject_info *reject = (const struct ipt_reject_info *)target->data; - unsigned int i; + unsigned int i, limit=sizeof(reject_table)/sizeof(struct reject_names); - for (i = 0; i < sizeof(reject_table)/sizeof(struct reject_names); i++) { + for (i = 0; i < limit; i++) { if (reject_table[i].with == reject->with) break; } - printf("reject-with %s ", reject_table[i].name); + if (i < limit) + printf("reject-with %s ", reject_table[i].name); + else + fprintf(stderr, "reject-with: error reject->with not found "); } /* Saves ipt_reject in parsable form to stdout. */ @@ -161,13 +164,16 @@ { const struct ipt_reject_info *reject = (const struct ipt_reject_info *)target->data; - unsigned int i; + unsigned int i, limit=sizeof(reject_table)/sizeof(struct reject_names); - for (i = 0; i < sizeof(reject_table)/sizeof(struct reject_names); i++) + for (i = 0; i < limit; i++) { if (reject_table[i].with == reject->with) break; - - printf("--reject-with %s ", reject_table[i].name); + } + if (i < limit) + printf("--reject-with %s ", reject_table[i].name); + else + fprintf(stderr, "--reject-with error reject->with not found"); } static struct iptables_target reject = { From fedora-cvs-commits at redhat.com Fri Mar 18 16:58:39 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 11:58:39 -0500 Subject: rpms/libgnomeprint22/devel .cvsignore, 1.10, 1.11 libgnomeprint22.spec, 1.19, 1.20 sources, 1.10, 1.11 Message-ID: <200503181658.j2IGwdOM021488@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libgnomeprint22/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21446 Modified Files: .cvsignore libgnomeprint22.spec sources Log Message: * Fri Mar 18 2005 David Zeuthen - 2.10.1-1 - New upstream version; drop the async patches as they are now upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnomeprint22/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Jan 2005 20:09:25 -0000 1.10 +++ .cvsignore 18 Mar 2005 16:58:36 -0000 1.11 @@ -1,2 +1,4 @@ libgnomeprint-2.8.0.tar.bz2 libgnomeprint-2.8.2.tar.bz2 +libgnomeprint-2.10.0.tar.bz2 +libgnomeprint-2.10.1.tar.bz2 Index: libgnomeprint22.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libgnomeprint22.spec 2 Mar 2005 10:41:17 -0000 1.19 +++ libgnomeprint22.spec 18 Mar 2005 16:58:36 -0000 1.20 @@ -15,8 +15,8 @@ Summary: Printing library for GNOME. Name: libgnomeprint22 -Version: 2.8.2 -Release: 2 +Version: 2.10.1 +Release: 1 License: LGPL Group: System Environment/Base Source: libgnomeprint-%{version}.tar.bz2 @@ -98,8 +98,8 @@ %setup -q -n libgnomeprint-%{version} #%patch1 -p1 -b .nognomecommon #%patch5 -p1 -b .session-printing -%patch7 -p1 -b .async-ppd -%patch8 -p1 -b .async-printers +#%patch7 -p1 -b .async-ppd +#%patch8 -p1 -b .async-printers %build @@ -145,6 +145,9 @@ %{_datadir}/gtk-doc %changelog +* Fri Mar 18 2005 David Zeuthen - 2.10.1-1 +- New upstream version; drop the async patches as they are now upstream + * Wed Mar 2 2005 Tomas Mraz - 2.8.2-2 - Rebuild with openssl-0.9.7e Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnomeprint22/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Jan 2005 20:09:25 -0000 1.10 +++ sources 18 Mar 2005 16:58:36 -0000 1.11 @@ -1 +1 @@ -8361c4e1bc3d87b91435807d0c06a3e4 libgnomeprint-2.8.2.tar.bz2 +0605d3f8335c1637dd47699507dacd1d libgnomeprint-2.10.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 17:19:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 12:19:45 -0500 Subject: rpms/libgnomecups/devel .cvsignore, 1.11, 1.12 libgnomecups.spec, 1.26, 1.27 sources, 1.11, 1.12 libgnomecups-0.1.12-threading.patch, 1.1, NONE libgnomecups-async-ppd.patch, 1.2, NONE Message-ID: <200503181719.j2IHJjFq025208@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libgnomecups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25185 Modified Files: .cvsignore libgnomecups.spec sources Removed Files: libgnomecups-0.1.12-threading.patch libgnomecups-async-ppd.patch Log Message: * Fri Mar 18 2005 David Zeuthen - 0.2.0-1 - New upstream version; drop patches that are upstreamed Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnomecups/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Jan 2005 20:50:39 -0000 1.11 +++ .cvsignore 18 Mar 2005 17:19:43 -0000 1.12 @@ -2,3 +2,4 @@ libgnomecups-0.1.12.tar.bz2 libgnomecups-0.1.13.tar.bz2 libgnomecups-0.1.14.tar.bz2 +libgnomecups-0.2.0.tar.bz2 Index: libgnomecups.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libgnomecups.spec 8 Mar 2005 03:19:59 -0000 1.26 +++ libgnomecups.spec 18 Mar 2005 17:19:43 -0000 1.27 @@ -1,7 +1,7 @@ Summary: GNOME library for CUPS integration Name: libgnomecups -Version: 0.1.14 -Release: 3 +Version: 0.2.0 +Release: 1 License: LGPL Group: Development/Libraries URL: http://www.gnome.org @@ -12,10 +12,8 @@ BuildRequires: glib2-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: %{name}-%{version}.tar.bz2 -Patch1: libgnomecups-async-ppd.patch Patch2: libgnomecups-no-gnome-common.patch Patch3: libgnomecups-dbus.patch -Patch4: libgnomecups-0.1.12-threading.patch Patch5: libgnomecups-0.1.14-go-direct.patch %description @@ -32,10 +30,8 @@ %prep %setup -q -%patch1 -p0 -b .async-ppd %patch2 -p1 -b .no-gnome-common %patch3 -p1 -b .dbus -%patch4 -p1 -b .threading %patch5 -p1 -b .go-direct %build @@ -71,6 +67,9 @@ %{_libdir}/*.so %changelog +* Fri Mar 18 2005 David Zeuthen - 0.2.0-1 +- New upstream version; drop patches that are upstreamed + * Fri Mar 4 2005 John (J5) Palmieri 0.1.14-3 - edit dbus patch - don't free const variable Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnomecups/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Jan 2005 20:50:39 -0000 1.11 +++ sources 18 Mar 2005 17:19:43 -0000 1.12 @@ -1 +1,2 @@ cb383a9502950aaeeb67be3514755321 libgnomecups-0.1.14.tar.bz2 +227cb2b119412b164bece23b287a130d libgnomecups-0.2.0.tar.bz2 --- libgnomecups-0.1.12-threading.patch DELETED --- --- libgnomecups-async-ppd.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 18 17:24:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 12:24:36 -0500 Subject: rpms/ImageMagick/devel ImageMagick.spec,1.28,1.29 Message-ID: <200503181724.j2IHOaFA000433@cvs.devel.redhat.com> Update of /cvs/dist/rpms/ImageMagick/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29031 Modified Files: ImageMagick.spec Log Message: Index: ImageMagick.spec =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ImageMagick.spec 17 Mar 2005 14:56:12 -0000 1.28 +++ ImageMagick.spec 18 Mar 2005 17:24:31 -0000 1.29 @@ -20,7 +20,7 @@ Source1: magick_small.png Patch1: ImageMagick-6.2.0-lprhack.patch Patch2: ImageMagick-6.2.0-hp2xx.patch -Patch3: ImageMagick-6.0.7-vsnprint.patch +#Patch3: ImageMagick-6.0.7-vsnprint.patch Url: http://www.imagemagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -106,7 +106,7 @@ %setup -q -n %{name}-%{VER} %patch1 -p1 -b .lpr %patch2 -p1 -b .hp2xx -%patch3 -p1 -b .vsnprintf +#%patch3 -p1 -b .vsnprintf %build libtoolize --copy --force From fedora-cvs-commits at redhat.com Fri Mar 18 17:25:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 12:25:10 -0500 Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.20,1.21 Message-ID: <200503181725.j2IHPA34003993@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libgnomeprint22/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3942 Modified Files: libgnomeprint22.spec Log Message: * Fri Mar 18 2005 David Zeuthen - 2.10.1-2 - Require libgnomecups >= 0.2.0-1 and rebuild Index: libgnomeprint22.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libgnomeprint22.spec 18 Mar 2005 16:58:36 -0000 1.20 +++ libgnomeprint22.spec 18 Mar 2005 17:25:08 -0000 1.21 @@ -16,7 +16,7 @@ Summary: Printing library for GNOME. Name: libgnomeprint22 Version: 2.10.1 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Base Source: libgnomeprint-%{version}.tar.bz2 @@ -29,7 +29,7 @@ PreReq: perl Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: libgnomecups >= 0.1.11-2 +Requires: libgnomecups >= 0.2.0-1 Requires: pango >= %{pango_version} BuildPrereq: glib2-devel >= %{glib2_version} @@ -145,6 +145,9 @@ %{_datadir}/gtk-doc %changelog +* Fri Mar 18 2005 David Zeuthen - 2.10.1-2 +- Require libgnomecups >= 0.2.0-1 and rebuild + * Fri Mar 18 2005 David Zeuthen - 2.10.1-1 - New upstream version; drop the async patches as they are now upstream From fedora-cvs-commits at redhat.com Fri Mar 18 17:28:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 12:28:44 -0500 Subject: rpms/evolution/devel .cvsignore, 1.28, 1.29 evolution.spec, 1.63, 1.64 sources, 1.28, 1.29 Message-ID: <200503181728.j2IHSiSR004058@cvs.devel.redhat.com> Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4047 Modified Files: .cvsignore evolution.spec sources Log Message: 2.2.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 18 Mar 2005 01:08:57 -0000 1.28 +++ .cvsignore 18 Mar 2005 17:28:40 -0000 1.29 @@ -1 +1 @@ -evolution-2.2.1.tar.bz2 +evolution-2.2.1.1.tar.bz2 Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- evolution.spec 18 Mar 2005 01:08:57 -0000 1.63 +++ evolution.spec 18 Mar 2005 17:28:40 -0000 1.64 @@ -35,7 +35,7 @@ %define nntp_support 1 Name: evolution -Version: 2.2.1 +Version: 2.2.1.1 Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -345,6 +345,9 @@ %{_libdir}/evolution/%{evo_major}/*/*.a %changelog +* Fri Mar 18 2005 David Malcolm - 2.2.1.1-1 +- 2.1.1.1 + * Thu Mar 17 2005 David Malcolm - 2.2.1-1 - 2.2.1 - Updated requirements: Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 18 Mar 2005 01:08:57 -0000 1.28 +++ sources 18 Mar 2005 17:28:40 -0000 1.29 @@ -1 +1 @@ -97b7d0257f3c8994964f703673661d34 evolution-2.2.1.tar.bz2 +0d41c89ace6485da3ef9c76ece68ae9c evolution-2.2.1.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 17:29:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 12:29:04 -0500 Subject: rpms/ImageMagick/devel ImageMagick.spec,1.29,1.30 Message-ID: <200503181729.j2IHT4sD004130@cvs.devel.redhat.com> Update of /cvs/dist/rpms/ImageMagick/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4109 Modified Files: ImageMagick.spec Log Message: Fix typo Index: ImageMagick.spec =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ImageMagick.spec 18 Mar 2005 17:24:31 -0000 1.29 +++ ImageMagick.spec 18 Mar 2005 17:29:00 -0000 1.30 @@ -20,7 +20,7 @@ Source1: magick_small.png Patch1: ImageMagick-6.2.0-lprhack.patch Patch2: ImageMagick-6.2.0-hp2xx.patch -#Patch3: ImageMagick-6.0.7-vsnprint.patch +Patch3: ImageMagick-6.0.7-vsnprintf.patch Url: http://www.imagemagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -106,7 +106,7 @@ %setup -q -n %{name}-%{VER} %patch1 -p1 -b .lpr %patch2 -p1 -b .hp2xx -#%patch3 -p1 -b .vsnprintf +%patch3 -p1 -b .vsnprintf %build libtoolize --copy --force From fedora-cvs-commits at redhat.com Fri Mar 18 17:37:54 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 12:37:54 -0500 Subject: rpms/ImageMagick/devel ImageMagick-6.2.0-vsnprintf.patch, NONE, 1.1 ImageMagick.spec, 1.30, 1.31 Message-ID: <200503181737.j2IHbs9c004460@cvs.devel.redhat.com> Update of /cvs/dist/rpms/ImageMagick/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4446 Modified Files: ImageMagick.spec Added Files: ImageMagick-6.2.0-vsnprintf.patch Log Message: Fix the patch ImageMagick-6.2.0-vsnprintf.patch: studio.h | 5 ----- 1 files changed, 5 deletions(-) --- NEW FILE ImageMagick-6.2.0-vsnprintf.patch --- --- ImageMagick-6.2.0/magick/studio.h.vsnprintf 2005-03-18 12:36:54.000000000 -0500 +++ ImageMagick-6.2.0/magick/studio.h 2005-03-18 12:37:02.000000000 -0500 @@ -175,11 +175,6 @@ strlcpy(char *,const char *,size_t); #endif -#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_PROTOTYPE) -extern int - vsnprintf(char *,size_t,const char *,va_list); -#endif - #if !defined(magick_attribute) # if !defined(__GNUC__) # define magick_attribute(x) /* nothing */ Index: ImageMagick.spec =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ImageMagick.spec 18 Mar 2005 17:29:00 -0000 1.30 +++ ImageMagick.spec 18 Mar 2005 17:37:52 -0000 1.31 @@ -20,7 +20,7 @@ Source1: magick_small.png Patch1: ImageMagick-6.2.0-lprhack.patch Patch2: ImageMagick-6.2.0-hp2xx.patch -Patch3: ImageMagick-6.0.7-vsnprintf.patch +Patch3: ImageMagick-6.2.0-vsnprintf.patch Url: http://www.imagemagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel From fedora-cvs-commits at redhat.com Fri Mar 18 18:02:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 13:02:29 -0500 Subject: rpms/ImageMagick/devel ImageMagick.spec,1.31,1.32 Message-ID: <200503181802.j2II2T8N018914@cvs.devel.redhat.com> Update of /cvs/dist/rpms/ImageMagick/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18902 Modified Files: ImageMagick.spec Log Message: Fix file list Index: ImageMagick.spec =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ImageMagick.spec 18 Mar 2005 17:37:52 -0000 1.31 +++ ImageMagick.spec 18 Mar 2005 18:02:27 -0000 1.32 @@ -212,7 +212,8 @@ %doc README.txt LICENSE NOTICE AUTHORS NEWS %attr(755,root,root) %{_libdir}/libMagick.so.* %attr(755,root,root) %{_libdir}/libWand.so.* -%{_libdir}/ImageMagick-* +%{_libdir}/ImageMagick-%{VER} +%{_datadir}/ImageMagick-%{VER}/config %{_bindir}/[a-z]* %{_mandir}/*/* #/etc/X11/applnk/Graphics/ImageMagick.desktop From fedora-cvs-commits at redhat.com Fri Mar 18 18:09:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 13:09:28 -0500 Subject: rpms/autofs/devel autofs-4.1.3-init-script-browse.patch,1.1,1.2 Message-ID: <200503181809.j2II9SQU019107@cvs.devel.redhat.com> Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19092 Modified Files: autofs-4.1.3-init-script-browse.patch Log Message: Added missing 'fi' to init script patch. autofs-4.1.3-init-script-browse.patch: rc.autofs.in | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Index: autofs-4.1.3-init-script-browse.patch =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs-4.1.3-init-script-browse.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- autofs-4.1.3-init-script-browse.patch 17 Mar 2005 21:42:00 -0000 1.1 +++ autofs-4.1.3-init-script-browse.patch 18 Mar 2005 18:09:25 -0000 1.2 @@ -1,6 +1,6 @@ --- autofs-4.1.3/samples/rc.autofs.in.orig 2005-03-02 14:08:02.892128400 -0500 +++ autofs-4.1.3/samples/rc.autofs.in 2005-03-02 14:24:22.390222056 -0500 -@@ -232,9 +232,12 @@ function getmounts() +@@ -232,9 +232,13 @@ function getmounts() fi # Dont even deal with conflicts between --ghost and [no]browse # Its just insane to configure things like that. @@ -12,6 +12,7 @@ + echo "$options" | grep -q -- ',browse' ; + then + startupoptions="$startupoptions --ghost" ++ fi fi # Check for verbose if echo "$DAEMONOPTIONS $options" | \ From fedora-cvs-commits at redhat.com Fri Mar 18 18:10:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 13:10:05 -0500 Subject: rpms/autofs/FC-3 autofs-4.1.3-init-script-browse.patch,1.1,1.2 Message-ID: <200503181810.j2IIA5sA019140@cvs.devel.redhat.com> Update of /cvs/dist/rpms/autofs/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv19124 Modified Files: autofs-4.1.3-init-script-browse.patch Log Message: Added missing 'fi' to init script patch. autofs-4.1.3-init-script-browse.patch: rc.autofs.in | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Index: autofs-4.1.3-init-script-browse.patch =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-3/autofs-4.1.3-init-script-browse.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- autofs-4.1.3-init-script-browse.patch 17 Mar 2005 21:40:24 -0000 1.1 +++ autofs-4.1.3-init-script-browse.patch 18 Mar 2005 18:10:02 -0000 1.2 @@ -1,6 +1,6 @@ --- autofs-4.1.3/samples/rc.autofs.in.orig 2005-03-02 14:08:02.892128400 -0500 +++ autofs-4.1.3/samples/rc.autofs.in 2005-03-02 14:24:22.390222056 -0500 -@@ -232,9 +232,12 @@ function getmounts() +@@ -232,9 +232,13 @@ function getmounts() fi # Dont even deal with conflicts between --ghost and [no]browse # Its just insane to configure things like that. @@ -12,6 +12,7 @@ + echo "$options" | grep -q -- ',browse' ; + then + startupoptions="$startupoptions --ghost" ++ fi fi # Check for verbose if echo "$DAEMONOPTIONS $options" | \ From fedora-cvs-commits at redhat.com Fri Mar 18 18:18:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 13:18:51 -0500 Subject: rpms/kernel/FC-3 linux-2.6.11-ext3-release-race.patch, NONE, 1.1 kernel-2.6.spec, 1.788, 1.789 Message-ID: <200503181818.j2IIIp46022471@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv22453 Modified Files: kernel-2.6.spec Added Files: linux-2.6.11-ext3-release-race.patch Log Message: Kjournald oops race. (#146344) linux-2.6.11-ext3-release-race.patch: transaction.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6.11-ext3-release-race.patch --- --- linux-2.6.9/fs/jbd/transaction.c.=K0002=.orig +++ linux-2.6.9/fs/jbd/transaction.c @@ -1812,10 +1812,10 @@ static int journal_unmap_buffer(journal_ JBUFFER_TRACE(jh, "checkpointed: add to BJ_Forget"); ret = __dispose_buffer(jh, journal->j_running_transaction); + journal_put_journal_head(jh); spin_unlock(&journal->j_list_lock); jbd_unlock_bh_state(bh); spin_unlock(&journal->j_state_lock); - journal_put_journal_head(jh); return ret; } else { /* There is no currently-running transaction. So the @@ -1826,10 +1826,10 @@ static int journal_unmap_buffer(journal_ JBUFFER_TRACE(jh, "give to committing trans"); ret = __dispose_buffer(jh, journal->j_committing_transaction); + journal_put_journal_head(jh); spin_unlock(&journal->j_list_lock); jbd_unlock_bh_state(bh); spin_unlock(&journal->j_state_lock); - journal_put_journal_head(jh); return ret; } else { /* The orphan record's transaction has @@ -1850,10 +1850,10 @@ static int journal_unmap_buffer(journal_ journal->j_running_transaction); jh->b_next_transaction = NULL; } + journal_put_journal_head(jh); spin_unlock(&journal->j_list_lock); jbd_unlock_bh_state(bh); spin_unlock(&journal->j_state_lock); - journal_put_journal_head(jh); return 0; } else { /* Good, the buffer belongs to the running transaction. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v retrieving revision 1.788 retrieving revision 1.789 diff -u -r1.788 -r1.789 --- kernel-2.6.spec 16 Mar 2005 06:41:53 -0000 1.788 +++ kernel-2.6.spec 18 Mar 2005 18:18:48 -0000 1.789 @@ -297,6 +297,7 @@ # Misc bits. Patch1700: linux-2.6.10-revert-module-invalidparam.patch +Patch1710: linux-2.6.11-ext3-release-race.patch Patch1760: linux-2.6.9-module_version.patch Patch1910: linux-2.6.9-spinlock-debug-panic.patch @@ -582,6 +583,8 @@ # Misc fixes # Don't barf on obsolete module parameters. %patch1700 -p1 +# Fix kjournald oops race +%patch1710 -p1 # Add missing MODULE_VERSION tags to some modules. %patch1760 -p1 # Make spinlock debugging panic instead of continue. @@ -897,6 +900,9 @@ %endif %changelog +* Fri Mar 18 2005 Dave Jones +- Kjournald oops race. (#146344) + * Tue Mar 15 2005 Dave Jones - Update to 2.6.11.4 From fedora-cvs-commits at redhat.com Fri Mar 18 18:24:12 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 13:24:12 -0500 Subject: rpms/libgtop2/devel libgtop2.spec,1.13,1.14 Message-ID: <200503181824.j2IIOCtL022561@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libgtop2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22530 Modified Files: libgtop2.spec Log Message: * Fri Mar 18 2005 David Zeuthen - 2.9.92-1 - New upstream version Index: libgtop2.spec =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libgtop2.spec 4 Mar 2005 22:16:34 -0000 1.13 +++ libgtop2.spec 18 Mar 2005 18:24:10 -0000 1.14 @@ -6,8 +6,8 @@ Name: libgtop2 Summary: libgtop library (version 2) -Version: 2.9.91 -Release: 2 +Version: 2.9.92 +Release: 1 License: GPL URL: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0 Group: System Environment/Libraries @@ -82,6 +82,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Fri Mar 18 2005 David Zeuthen - 2.9.92-1 +- New upstream version + * Fri Mar 4 2005 David Zeuthen - 2.9.91-2 - Rebuild From fedora-cvs-commits at redhat.com Fri Mar 18 18:24:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 13:24:52 -0500 Subject: rpms/libgtop2/devel .cvsignore,1.10,1.11 sources,1.10,1.11 Message-ID: <200503181824.j2IIOqA0001064@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libgtop2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1050 Modified Files: .cvsignore sources Log Message: forgot to upload new tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 9 Feb 2005 19:10:41 -0000 1.10 +++ .cvsignore 18 Mar 2005 18:24:49 -0000 1.11 @@ -2,3 +2,4 @@ libgtop-2.8.0.tar.bz2 libgtop-2.9.90.tar.bz2 libgtop-2.9.91.tar.bz2 +libgtop-2.9.92.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 9 Feb 2005 19:10:41 -0000 1.10 +++ sources 18 Mar 2005 18:24:49 -0000 1.11 @@ -1 +1 @@ -ce0412b797130596a6d7d503a494d2ce libgtop-2.9.91.tar.bz2 +3fedd8f34f1438c5be3b82d9185f42fe libgtop-2.9.92.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 18:25:26 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 13:25:26 -0500 Subject: rpms/kernel/devel linux-2.6.11-ext3-release-race.patch, NONE, 1.1 kernel-2.6.spec, 1.1185, 1.1186 Message-ID: <200503181825.j2IIPQQR001092@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1077 Modified Files: kernel-2.6.spec Added Files: linux-2.6.11-ext3-release-race.patch Log Message: kjournald release race. (#146344) linux-2.6.11-ext3-release-race.patch: transaction.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6.11-ext3-release-race.patch --- --- linux-2.6.9/fs/jbd/transaction.c.=K0002=.orig +++ linux-2.6.9/fs/jbd/transaction.c @@ -1812,10 +1812,10 @@ static int journal_unmap_buffer(journal_ JBUFFER_TRACE(jh, "checkpointed: add to BJ_Forget"); ret = __dispose_buffer(jh, journal->j_running_transaction); + journal_put_journal_head(jh); spin_unlock(&journal->j_list_lock); jbd_unlock_bh_state(bh); spin_unlock(&journal->j_state_lock); - journal_put_journal_head(jh); return ret; } else { /* There is no currently-running transaction. So the @@ -1826,10 +1826,10 @@ static int journal_unmap_buffer(journal_ JBUFFER_TRACE(jh, "give to committing trans"); ret = __dispose_buffer(jh, journal->j_committing_transaction); + journal_put_journal_head(jh); spin_unlock(&journal->j_list_lock); jbd_unlock_bh_state(bh); spin_unlock(&journal->j_state_lock); - journal_put_journal_head(jh); return ret; } else { /* The orphan record's transaction has @@ -1850,10 +1850,10 @@ static int journal_unmap_buffer(journal_ journal->j_running_transaction); jh->b_next_transaction = NULL; } + journal_put_journal_head(jh); spin_unlock(&journal->j_list_lock); jbd_unlock_bh_state(bh); spin_unlock(&journal->j_state_lock); - journal_put_journal_head(jh); return 0; } else { /* Good, the buffer belongs to the running transaction. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1185 retrieving revision 1.1186 diff -u -r1.1185 -r1.1186 --- kernel-2.6.spec 17 Mar 2005 14:59:57 -0000 1.1185 +++ kernel-2.6.spec 18 Mar 2005 18:25:23 -0000 1.1186 @@ -315,6 +315,7 @@ Patch1710: linux-2.6.11-selinux-execute-perm-checking.patch Patch1720: linux-2.6.9-module_version.patch Patch1730: linux-2.6.9-spinlock-debug-panic.patch +Patch1740: linux-2.6.11-ext3-release-race.patch Patch2000: linux-2.6.11-vm-taint.patch Patch2001: linux-2.6.9-vm-oomkiller-debugging.patch @@ -691,6 +692,8 @@ %patch1720 -p1 # Make spinlock debugging panic instead of continue. %patch1730 -p1 +# kjournald release race +%patch1740 -p1 # # VM related fixes. @@ -1098,6 +1101,9 @@ %endif %changelog +* Fri Mar 18 2005 Dave Jones +- kjournald release race. (#146344) + * Thu Mar 17 2005 Rik van Riel - upgrade to latest upstream Xen code From fedora-cvs-commits at redhat.com Fri Mar 18 18:25:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 13:25:43 -0500 Subject: rpms/kernel/FC-3 kernel-2.6.spec,1.789,1.790 Message-ID: <200503181825.j2IIPhat001118@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv1102 Modified Files: kernel-2.6.spec Log Message: bump From fedora-cvs-commits at redhat.com Fri Mar 18 19:01:13 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 14:01:13 -0500 Subject: rpms/libgtop2/devel .cvsignore, 1.11, 1.12 libgtop2.spec, 1.14, 1.15 sources, 1.11, 1.12 Message-ID: <200503181901.j2IJ1Drk015739@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libgtop2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15693 Modified Files: .cvsignore libgtop2.spec sources Log Message: * Fri Mar 18 2005 David Zeuthen - 2.10.0-1 - Even newer upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 18 Mar 2005 18:24:49 -0000 1.11 +++ .cvsignore 18 Mar 2005 19:01:06 -0000 1.12 @@ -3,3 +3,4 @@ libgtop-2.9.90.tar.bz2 libgtop-2.9.91.tar.bz2 libgtop-2.9.92.tar.bz2 +libgtop-2.10.0.tar.bz2 Index: libgtop2.spec =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libgtop2.spec 18 Mar 2005 18:24:10 -0000 1.14 +++ libgtop2.spec 18 Mar 2005 19:01:06 -0000 1.15 @@ -6,7 +6,7 @@ Name: libgtop2 Summary: libgtop library (version 2) -Version: 2.9.92 +Version: 2.10.0 Release: 1 License: GPL URL: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0 @@ -51,7 +51,7 @@ %makeinstall ## no dumb daemon thing -/bin/rm $RPM_BUILD_ROOT%{_bindir}/* +/bin/rm -f $RPM_BUILD_ROOT%{_bindir}/* # kill .la files /bin/rm $RPM_BUILD_ROOT%{_libdir}/*.la @@ -82,6 +82,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Fri Mar 18 2005 David Zeuthen - 2.10.0-1 +- Even newer upstream version + * Fri Mar 18 2005 David Zeuthen - 2.9.92-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 18 Mar 2005 18:24:49 -0000 1.11 +++ sources 18 Mar 2005 19:01:06 -0000 1.12 @@ -1 +1 @@ -3fedd8f34f1438c5be3b82d9185f42fe libgtop-2.9.92.tar.bz2 +9a52cd5332a13e57ca606d8a85a67c97 libgtop-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 19:30:15 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 14:30:15 -0500 Subject: rpms/libtermcap/devel termcap-2.0.8-octal.patch, NONE, 1.1 termcap-2.0.8-shrink.patch, NONE, 1.1 libtermcap.spec, 1.12, 1.13 Message-ID: <200503181930.j2IJUFAJ030305@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libtermcap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30284 Modified Files: libtermcap.spec Added Files: termcap-2.0.8-octal.patch termcap-2.0.8-shrink.patch Log Message: - don't trip over capabilities which end in '^' or '\' - don't accept numbers with '8' or '9' in them as valid octal numbers termcap-2.0.8-octal.patch: termcap.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE termcap-2.0.8-octal.patch --- Don't accept octal numbers which contain '8' or '9', because they're just weird. --- termcap-2.0.8/termcap.c 2005-03-18 14:26:45.449079197 -0500 +++ termcap-2.0.8/termcap.c 2005-03-18 14:26:50.554412482 -0500 @@ -115,11 +115,11 @@ /* Escaped character. */ c = *s++; - if (c >= '0' && c <= '9') { + if (c >= '0' && c <= '7') { /* Octal number. */ c -= '0'; i = 0; - while(*s >= '0' && *s <= '9' && ++i < 3) { + while(*s >= '0' && *s <= '7' && ++i < 3) { c = (c * 8) + (*s - '0'); s++; } @@ -608,11 +608,11 @@ /* Escaped character. */ c = *s++; - if (c >= '0' && c <= '9') { + if (c >= '0' && c <= '7') { /* Octal number. */ c -= '0'; i = 0; - while(*s >= '0' && *s <= '9' && ++i < 3) { + while(*s >= '0' && *s <= '7' && ++i < 3) { c = (c * 8) + (*s - '0'); s++; } termcap-2.0.8-shrink.patch: termcap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE termcap-2.0.8-shrink.patch --- Don't blow up if the last character in the string happens to be '\' or '^'. --- termcap-2.0.8/termcap.c 2005-03-18 14:24:52.767794472 -0500 +++ termcap-2.0.8/termcap.c 2005-03-18 14:24:46.507612002 -0500 @@ -110,7 +110,7 @@ /* Translate escaped characters and hat-notation. */ while((c = *s++)) { start = s - 1; - if (c == '\\') { + if ((c == '\\') && (*s)) { /* Escaped character. */ c = *s++; @@ -131,7 +131,7 @@ break; } } - } else if (c == '^') + } else if ((c == '^') && (*s)) /* Hat notation. */ c = *s++ & 0x1f; Index: libtermcap.spec =================================================================== RCS file: /cvs/dist/rpms/libtermcap/devel/libtermcap.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libtermcap.spec 16 Mar 2005 21:44:45 -0000 1.12 +++ libtermcap.spec 18 Mar 2005 19:30:03 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A basic system library for accessing the termcap database. Name: libtermcap Version: 2.0.8 -Release: 40 +Release: 41 Source: ftp://metalab.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.bz2 Url: ftp://metalab.unc.edu/pub/Linux/GCC/ License: LGPL @@ -21,6 +21,8 @@ Patch11: termcap-2.0.8-glibc22.patch Patch12: libtermcap-2.0.8-ia64.patch Patch13: termcap-116934.patch +Patch14: termcap-2.0.8-shrink.patch +Patch15: termcap-2.0.8-octal.patch Requires: /etc/termcap BuildPrereq: texinfo BuildRoot: /var/tmp/%{name}-root @@ -62,6 +64,8 @@ %patch12 -p1 -b .ia64 %endif %patch13 -p1 -b .116934 +%patch14 -p1 -b .shrink +%patch15 -p1 -b .octal %build make AR=%{__ar} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -I." @@ -118,6 +122,10 @@ %{_infodir}/termcap.info* %changelog +* Fri Mar 18 2005 Nalin Dahyabhai 2.0.8-41 +- don't trip over capabilities which end in '^' or '\' +- don't accept numbers with '8' or '9' in them as valid octal numbers + * Wed Mar 16 2005 Nalin Dahyabhai 2.0.8-40 - rebuild From fedora-cvs-commits at redhat.com Fri Mar 18 20:10:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 15:10:00 -0500 Subject: rpms/openoffice.org/devel workspace-gcj4.patch,1.1,1.2 Message-ID: <200503182010.j2IKA0bD013379@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13364 Modified Files: workspace-gcj4.patch Log Message: jimmy the patch to workaround a gcj jar to so foo under ppc workspace-gcj4.patch: bin/deliver.pl | 0 config_office/configure.in | 21 +++++++++++++++++++++ config_office/set_soenv.in | 8 +++++++- inc/settings.mk | 0 solenv/bin/deliver.pl | 22 ++++++++++++++++++++++ solenv/inc/settings.mk | 5 ++--- 6 files changed, 52 insertions(+), 4 deletions(-) Index: workspace-gcj4.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace-gcj4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workspace-gcj4.patch 18 Mar 2005 08:54:42 -0000 1.1 +++ workspace-gcj4.patch 18 Mar 2005 20:09:56 -0000 1.2 @@ -69,13 +69,32 @@ if ( $platform =~ m/darwin/ ) { ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH, "e" ); } +Index: inc/settings.mk +=================================================================== +RCS file: /cvs/tools/solenv/inc/settings.mk,v +retrieving revision 1.166 +diff -u -p -r1.166 settings.mk +--- openoffice.org.orig/solenv/inc/settings.mk 1 Mar 2005 16:14:15 -0000 1.166 ++++ openoffice.org/solenv/inc/settings.mk 18 Mar 2005 11:46:02 -0000 +@@ -207,9 +207,8 @@ JAVADOC=javadoc -J-Xmx120m + + #required arguments + .IF "$(JDK)" == "gcj" +-#JAVAC=$(JAVACOMPILER) -g -fno-assert -Wno-deprecated -C +-JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -g -fno-assert -Wno-deprecated -C +-JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.runtime.VMClassLoader.library_control=never ++JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C ++JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE) + .ELSE + JAVAC=$(JAVACOMPILER) + JAVAI=$(JAVAINTERPRETER) Index: bin/deliver.pl =================================================================== RCS file: /cvs/tools/solenv/bin/deliver.pl,v retrieving revision 1.78 diff -u -p -r1.78 deliver.pl --- openoffice.org.orig/solenv/bin/deliver.pl 14 Jan 2005 11:33:44 -0000 1.78 -+++ openoffice.org/solenv/bin/deliver.pl 18 Mar 2005 08:07:14 -0000 ++++ openoffice.org/solenv/bin/deliver.pl 18 Mar 2005 10:08:25 -0000 @@ -702,6 +702,15 @@ sub is_unstripped { return ''; } @@ -100,10 +119,10 @@ + my $file = shift; + my $to = $file.".so"; + print "CACHEJAR: $file -> $to with $ENV{GCJ_DATABASE}\n"; -+ print "Caching 1/2: $ENV{JAVACOMPILER} -shared -findirect-dispatch -fjni -o $to $file\n"; -+ execute_system("$ENV{JAVACOMPILER} -shared -findirect-dispatch -fjni -o $to $file"); ++ print "Caching 1/2: $ENV{JAVACOMPILER} -shared -O2 -findirect-dispatch -fjni -o $to $file\n"; ++ system("$ENV{JAVACOMPILER} -shared -O2 -findirect-dispatch -fjni -o $to $file"); + print "Caching 2/2: $ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to\n"; -+ execute_system("$ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to"); ++ system("$ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to"); +}; + sub copy_if_newer @@ -119,19 +138,3 @@ # handle special packaging of *.dylib files for Mac OS X if ( $^O eq 'darwin' ) { -Index: inc/settings.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/settings.mk,v -retrieving revision 1.166 -diff -u -p -r1.166 settings.mk ---- openoffice.org.orig/solenv/inc/settings.mk 1 Mar 2005 16:14:15 -0000 1.166 -+++ openoffice.org/solenv/inc/settings.mk 18 Mar 2005 08:07:43 -0000 -@@ -209,7 +209,7 @@ JAVADOC=javadoc -J-Xmx120m - .IF "$(JDK)" == "gcj" - #JAVAC=$(JAVACOMPILER) -g -fno-assert -Wno-deprecated -C - JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -g -fno-assert -Wno-deprecated -C --JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.runtime.VMClassLoader.library_control=never -+JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE) - .ELSE - JAVAC=$(JAVACOMPILER) - JAVAI=$(JAVAINTERPRETER) From fedora-cvs-commits at redhat.com Fri Mar 18 20:36:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 15:36:43 -0500 Subject: rpms/kernel/FC-3 jwltest-b44-bounce-bufs.patch, NONE, 1.1.4.1 jwltest-e1000-update-5_7_6-k2.patch, NONE, 1.1.2.1 jwltest-e1000-watchdog.patch, NONE, 1.1.2.1 jwltest-e1000-workqueue-flush.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.790, 1.790.2.1 linux-2.6.9-module_version.patch, 1.6, 1.6.2.1 Message-ID: <200503182036.j2IKahqi028095@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv28076 Modified Files: Tag: private-linville-fc3-jwltest-3-branch kernel-2.6.spec linux-2.6.9-module_version.patch Added Files: Tag: private-linville-fc3-jwltest-3-branch jwltest-b44-bounce-bufs.patch jwltest-e1000-update-5_7_6-k2.patch jwltest-e1000-watchdog.patch jwltest-e1000-workqueue-flush.patch Log Message: jwltest-b44-bounce-bufs.patch: b44.c | 36 +++++++++++++++++++++--------------- b44.h | 3 +-- 2 files changed, 22 insertions(+), 17 deletions(-) --- NEW FILE jwltest-b44-bounce-bufs.patch --- --- linux-2.6.11/drivers/net/b44.h.orig 2005-03-09 16:44:40.753866914 -0500 +++ linux-2.6.11/drivers/net/b44.h 2005-03-09 16:44:50.197605243 -0500 @@ -397,7 +397,6 @@ struct b44 { struct ring_info *rx_buffers; struct ring_info *tx_buffers; - unsigned char *tx_bufs; u32 dma_offset; u32 flags; @@ -429,7 +428,7 @@ struct b44 { struct pci_dev *pdev; struct net_device *dev; - dma_addr_t rx_ring_dma, tx_ring_dma,tx_bufs_dma; + dma_addr_t rx_ring_dma, tx_ring_dma; u32 rx_pending; u32 tx_pending; --- linux-2.6.11/drivers/net/b44.c.orig 2005-03-09 16:44:40.755866647 -0500 +++ linux-2.6.11/drivers/net/b44.c 2005-03-09 16:44:50.199604976 -0500 @@ -908,6 +908,7 @@ static void b44_tx_timeout(struct net_de static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct b44 *bp = netdev_priv(dev); + struct sk_buff *bounce_skb; dma_addr_t mapping; u32 len, entry, ctrl; @@ -923,15 +924,31 @@ static int b44_start_xmit(struct sk_buff return 1; } - entry = bp->tx_prod; mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE); if(mapping+len > B44_DMA_MASK) { /* Chip can't handle DMA to/from >1GB, use bounce buffer */ - pci_unmap_single(bp->pdev, mapping, len,PCI_DMA_TODEVICE); - memcpy(bp->tx_bufs+entry*TX_PKT_BUF_SZ,skb->data,skb->len); - mapping = pci_map_single(bp->pdev, bp->tx_bufs+entry*TX_PKT_BUF_SZ, len, PCI_DMA_TODEVICE); + pci_unmap_single(bp->pdev, mapping, len, PCI_DMA_TODEVICE); + + bounce_skb = __dev_alloc_skb(TX_PKT_BUF_SZ, + GFP_ATOMIC|GFP_DMA); + if (!bounce_skb) + return NETDEV_TX_BUSY; + + mapping = pci_map_single(bp->pdev, bounce_skb->data, + len, PCI_DMA_TODEVICE); + if(mapping+len > B44_DMA_MASK) { + pci_unmap_single(bp->pdev, mapping, + len, PCI_DMA_TODEVICE); + dev_kfree_skb_any(bounce_skb); + return NETDEV_TX_BUSY; + } + + memcpy(skb_put(bounce_skb, len), skb->data, skb->len); + dev_kfree_skb_any(skb); + skb = bounce_skb; } + entry = bp->tx_prod; bp->tx_buffers[entry].skb = skb; pci_unmap_addr_set(&bp->tx_buffers[entry], mapping, mapping); @@ -1078,11 +1095,6 @@ static void b44_free_consistent(struct b bp->tx_ring, bp->tx_ring_dma); bp->tx_ring = NULL; } - if (bp->tx_bufs) { - pci_free_consistent(bp->pdev, B44_TX_RING_SIZE * TX_PKT_BUF_SZ, - bp->tx_bufs, bp->tx_bufs_dma); - bp->tx_bufs = NULL; - } } /* @@ -1105,12 +1117,6 @@ static int b44_alloc_consistent(struct b goto out_err; memset(bp->tx_buffers, 0, size); - size = B44_TX_RING_SIZE * TX_PKT_BUF_SZ; - bp->tx_bufs = pci_alloc_consistent(bp->pdev, size, &bp->tx_bufs_dma); - if (!bp->tx_bufs) - goto out_err; - memset(bp->tx_bufs, 0, size); - size = DMA_TABLE_BYTES; bp->rx_ring = pci_alloc_consistent(bp->pdev, size, &bp->rx_ring_dma); if (!bp->rx_ring) jwltest-e1000-update-5_7_6-k2.patch: e1000.h | 3 e1000_ethtool.c | 11 +- e1000_hw.c | 86 +++++++++-------- e1000_hw.h | 11 +- e1000_main.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 309 insertions(+), 77 deletions(-) --- NEW FILE jwltest-e1000-update-5_7_6-k2.patch --- --- linux-2.6.11/drivers/net/e1000/e1000_hw.c.orig 2005-03-18 15:21:34.767630045 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_hw.c 2005-03-18 15:22:07.541256468 -0500 @@ -1572,7 +1572,8 @@ e1000_phy_force_speed_duplex(struct e100 if(mii_status_reg & MII_SR_LINK_STATUS) break; msec_delay(100); } - if((i == 0) && (hw->phy_type == e1000_phy_m88)) { + if((i == 0) && + (hw->phy_type == e1000_phy_m88)) { /* We didn't get link. Reset the DSP and wait again for link. */ ret_val = e1000_phy_reset_dsp(hw); if(ret_val) { @@ -2503,7 +2504,7 @@ e1000_read_phy_reg(struct e1000_hw *hw, } } - ret_val = e1000_read_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT & reg_addr, + ret_val = e1000_read_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr, phy_data); return ret_val; @@ -2609,7 +2610,7 @@ e1000_write_phy_reg(struct e1000_hw *hw, } } - ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT & reg_addr, + ret_val = e1000_write_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr, phy_data); return ret_val; @@ -2955,8 +2956,7 @@ e1000_phy_m88_get_info(struct e1000_hw * /* Check polarity status */ ret_val = e1000_check_polarity(hw, &polarity); if(ret_val) - return ret_val; - + return ret_val; phy_info->cable_polarity = polarity; ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data); @@ -2966,9 +2966,9 @@ e1000_phy_m88_get_info(struct e1000_hw * phy_info->mdix_mode = (phy_data & M88E1000_PSSR_MDIX) >> M88E1000_PSSR_MDIX_SHIFT; - if(phy_data & M88E1000_PSSR_1000MBS) { - /* Cable Length Estimation and Local/Remote Receiver Informatoion - * are only valid at 1000 Mbps + if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) { + /* Cable Length Estimation and Local/Remote Receiver Information + * are only valid at 1000 Mbps. */ phy_info->cable_length = ((phy_data & M88E1000_PSSR_CABLE_LENGTH) >> M88E1000_PSSR_CABLE_LENGTH_SHIFT); @@ -4639,41 +4639,44 @@ e1000_get_bus_info(struct e1000_hw *hw) { uint32_t status; - if(hw->mac_type < e1000_82543) { + switch (hw->mac_type) { + case e1000_82542_rev2_0: + case e1000_82542_rev2_1: hw->bus_type = e1000_bus_type_unknown; hw->bus_speed = e1000_bus_speed_unknown; hw->bus_width = e1000_bus_width_unknown; - return; - } - - status = E1000_READ_REG(hw, STATUS); - hw->bus_type = (status & E1000_STATUS_PCIX_MODE) ? - e1000_bus_type_pcix : e1000_bus_type_pci; + break; + default: + status = E1000_READ_REG(hw, STATUS); + hw->bus_type = (status & E1000_STATUS_PCIX_MODE) ? + e1000_bus_type_pcix : e1000_bus_type_pci; - if(hw->device_id == E1000_DEV_ID_82546EB_QUAD_COPPER) { - hw->bus_speed = (hw->bus_type == e1000_bus_type_pci) ? - e1000_bus_speed_66 : e1000_bus_speed_120; - } else if(hw->bus_type == e1000_bus_type_pci) { - hw->bus_speed = (status & E1000_STATUS_PCI66) ? - e1000_bus_speed_66 : e1000_bus_speed_33; - } else { - switch (status & E1000_STATUS_PCIX_SPEED) { - case E1000_STATUS_PCIX_SPEED_66: - hw->bus_speed = e1000_bus_speed_66; - break; - case E1000_STATUS_PCIX_SPEED_100: - hw->bus_speed = e1000_bus_speed_100; - break; - case E1000_STATUS_PCIX_SPEED_133: - hw->bus_speed = e1000_bus_speed_133; - break; - default: - hw->bus_speed = e1000_bus_speed_reserved; - break; + if(hw->device_id == E1000_DEV_ID_82546EB_QUAD_COPPER) { + hw->bus_speed = (hw->bus_type == e1000_bus_type_pci) ? + e1000_bus_speed_66 : e1000_bus_speed_120; + } else if(hw->bus_type == e1000_bus_type_pci) { + hw->bus_speed = (status & E1000_STATUS_PCI66) ? + e1000_bus_speed_66 : e1000_bus_speed_33; + } else { + switch (status & E1000_STATUS_PCIX_SPEED) { + case E1000_STATUS_PCIX_SPEED_66: + hw->bus_speed = e1000_bus_speed_66; + break; + case E1000_STATUS_PCIX_SPEED_100: + hw->bus_speed = e1000_bus_speed_100; + break; + case E1000_STATUS_PCIX_SPEED_133: + hw->bus_speed = e1000_bus_speed_133; + break; + default: + hw->bus_speed = e1000_bus_speed_reserved; + break; + } } + hw->bus_width = (status & E1000_STATUS_BUS64) ? + e1000_bus_width_64 : e1000_bus_width_32; + break; } - hw->bus_width = (status & E1000_STATUS_BUS64) ? - e1000_bus_width_64 : e1000_bus_width_32; } /****************************************************************************** * Reads a value from one of the devices registers using port I/O (as opposed @@ -4738,6 +4741,7 @@ e1000_get_cable_length(struct e1000_hw * uint16_t agc_value = 0; uint16_t cur_agc, min_agc = IGP01E1000_AGC_LENGTH_TABLE_SIZE; uint16_t i, phy_data; + uint16_t cable_length; DEBUGFUNC("e1000_get_cable_length"); @@ -4749,10 +4753,11 @@ e1000_get_cable_length(struct e1000_hw * &phy_data); if(ret_val) return ret_val; + cable_length = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >> + M88E1000_PSSR_CABLE_LENGTH_SHIFT; /* Convert the enum value to ranged values */ - switch((phy_data & M88E1000_PSSR_CABLE_LENGTH) >> - M88E1000_PSSR_CABLE_LENGTH_SHIFT) { + switch (cable_length) { case e1000_cable_length_50: *min_length = 0; *max_length = e1000_igp_cable_length_50; @@ -4919,8 +4924,7 @@ e1000_check_downshift(struct e1000_hw *h return ret_val; hw->speed_downgraded = (phy_data & IGP01E1000_PLHR_SS_DOWNGRADE) ? 1 : 0; - } - else if(hw->phy_type == e1000_phy_m88) { + } else if(hw->phy_type == e1000_phy_m88) { ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data); if(ret_val) --- linux-2.6.11/drivers/net/e1000/e1000_hw.h.orig 2005-03-18 15:21:34.770629645 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_hw.h 2005-03-18 15:22:07.549255401 -0500 @@ -369,6 +369,7 @@ int32_t e1000_set_d3_lplu_state(struct e #define E1000_DEV_ID_82546GB_SERDES 0x107B #define E1000_DEV_ID_82546GB_PCIE 0x108A #define E1000_DEV_ID_82547EI 0x1019 + #define NODE_ADDRESS_SIZE 6 #define ETH_LENGTH_OF_ADDRESS 6 @@ -1734,6 +1735,9 @@ struct e1000_hw { #define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */ #define PHY_EXT_STATUS 0x0F /* Extended Status Reg */ +#define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */ +#define MAX_PHY_MULTI_PAGE_REG 0xF /* Registers equal on all pages */ + /* M88E1000 Specific Registers */ #define M88E1000_PHY_SPEC_CTRL 0x10 /* PHY Specific Control Register */ #define M88E1000_PHY_SPEC_STATUS 0x11 /* PHY Specific Status Register */ @@ -1794,8 +1798,7 @@ struct e1000_hw { #define IGP01E1000_ANALOG_REGS_PAGE 0x20C0 -#define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */ -#define MAX_PHY_MULTI_PAGE_REG 0xF /*Registers that are equal on all pages*/ + /* PHY Control Register */ #define MII_CR_SPEED_SELECT_MSB 0x0040 /* bits 6,13: 10=1000, 01=100, 00=10 */ #define MII_CR_COLL_TEST_ENABLE 0x0080 /* Collision test enable */ @@ -2098,7 +2101,11 @@ struct e1000_hw { #define IGP01E1000_ANALOG_FUSE_FINE_1 0x0080 #define IGP01E1000_ANALOG_FUSE_FINE_10 0x0500 + /* Bit definitions for valid PHY IDs. */ +/* I = Integrated + * E = External + */ #define M88E1000_E_PHY_ID 0x01410C50 #define M88E1000_I_PHY_ID 0x01410C30 #define M88E1011_I_PHY_ID 0x01410C20 --- linux-2.6.11/drivers/net/e1000/e1000.h.orig 2005-03-18 15:21:34.764630445 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000.h 2005-03-18 15:22:07.532257669 -0500 @@ -138,6 +138,7 @@ struct e1000_adapter; #define E1000_RX_BUFFER_WRITE 16 /* Must be power of 2 */ #define AUTO_ALL_MODES 0 +#define E1000_EEPROM_82544_APM 0x0004 #define E1000_EEPROM_APME 0x0400 #ifndef E1000_MASTER_SLAVE @@ -209,6 +210,7 @@ struct e1000_adapter { /* TX */ struct e1000_desc_ring tx_ring; + struct e1000_buffer previous_buffer_info; spinlock_t tx_lock; uint32_t txd_cmd; uint32_t tx_int_delay; @@ -222,6 +224,7 @@ struct e1000_adapter { uint32_t tx_fifo_size; atomic_t tx_fifo_stall; boolean_t pcix_82544; + boolean_t detect_tx_hung; /* RX */ struct e1000_desc_ring rx_ring; --- linux-2.6.11/drivers/net/e1000/e1000_ethtool.c.orig 2005-03-18 15:21:34.762630712 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_ethtool.c 2005-03-18 15:22:07.526258470 -0500 @@ -1310,7 +1310,7 @@ e1000_run_loopback_test(struct e1000_ada struct e1000_desc_ring *txdr = &adapter->test_tx_ring; struct e1000_desc_ring *rxdr = &adapter->test_rx_ring; struct pci_dev *pdev = adapter->pdev; - int i; + int i, ret_val; E1000_WRITE_REG(&adapter->hw, RDT, rxdr->count - 1); @@ -1330,11 +1330,12 @@ e1000_run_loopback_test(struct e1000_ada rxdr->buffer_info[i].length, PCI_DMA_FROMDEVICE); - if (!e1000_check_lbtest_frame(rxdr->buffer_info[i++].skb, 1024)) - return 0; - } while (i < 64); + ret_val = e1000_check_lbtest_frame(rxdr->buffer_info[i].skb, + 1024); + i++; + } while (ret_val != 0 && i < 64); - return 13; + return ret_val; } static int --- linux-2.6.11/drivers/net/e1000/e1000_main.c.orig 2005-03-18 15:21:34.773629245 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_main.c 2005-03-18 15:22:07.557254333 -0500 @@ -35,6 +35,14 @@ * - More errlogging support from Jon Mason * - Fix TSO issues on PPC64 machines -- Jon Mason * + * 5.7.1 12/16/04 + * - Resurrect 82547EI/GI related fix in e1000_intr to avoid deadlocks. This + * fix was removed as it caused system instability. The suspected cause of + * this is the called to e1000_irq_disable in e1000_intr. Inlined the + * required piece of e1000_irq_disable into e1000_intr - Anton Blanchard + * 5.7.0 12/10/04 + * - include fix to the condition that determines when to quit NAPI - Robert Olsson + * - use netif_poll_{disable/enable} to synchronize between NAPI and i/f up/down * 5.6.5 11/01/04 * - Enabling NETIF_F_SG without checksum offload is illegal - John Mason @@ -57,7 +65,7 @@ char e1000_driver_string[] = "Intel(R) P #else #define DRIVERNAPI "-NAPI" #endif -char e1000_driver_version[] = "5.6.10.1-k2"DRIVERNAPI; +char e1000_driver_version[] = "5.7.6-k2"DRIVERNAPI; char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation."; /* e1000_pci_tbl - PCI Device ID Table @@ -81,6 +89,7 @@ static struct pci_device_id e1000_pci_tb INTEL_E1000_ETHERNET_DEVICE(0x1011), INTEL_E1000_ETHERNET_DEVICE(0x1012), INTEL_E1000_ETHERNET_DEVICE(0x1013), + INTEL_E1000_ETHERNET_DEVICE(0x1014), INTEL_E1000_ETHERNET_DEVICE(0x1015), INTEL_E1000_ETHERNET_DEVICE(0x1016), INTEL_E1000_ETHERNET_DEVICE(0x1017), @@ -308,6 +317,9 @@ e1000_up(struct e1000_adapter *adapter) mod_timer(&adapter->watchdog_timer, jiffies); e1000_irq_enable(adapter); +#ifdef CONFIG_E1000_NAPI + netif_poll_enable(netdev); +#endif return 0; } @@ -321,6 +333,10 @@ e1000_down(struct e1000_adapter *adapter del_timer_sync(&adapter->tx_fifo_stall_timer); del_timer_sync(&adapter->watchdog_timer); del_timer_sync(&adapter->phy_info_timer); + +#ifdef CONFIG_E1000_NAPI + netif_poll_disable(netdev); +#endif adapter->link_speed = 0; adapter->link_duplex = 0; netif_carrier_off(netdev); @@ -414,6 +430,7 @@ e1000_probe(struct pci_dev *pdev, int i; int err; uint16_t eeprom_data; + uint16_t eeprom_apme_mask = E1000_EEPROM_APME; if((err = pci_enable_device(pdev))) return err; @@ -510,9 +527,6 @@ e1000_probe(struct pci_dev *pdev, } #ifdef NETIF_F_TSO - /* Disbaled for now until root-cause is found for - * hangs reported against non-IA archs. TSO can be - * enabled using ethtool -K eth tso on */ if((adapter->hw.mac_type >= e1000_82544) && (adapter->hw.mac_type != e1000_82547)) netdev->features |= NETIF_F_TSO; @@ -584,6 +598,11 @@ e1000_probe(struct pci_dev *pdev, case e1000_82542_rev2_1: case e1000_82543: break; + case e1000_82544: + e1000_read_eeprom(&adapter->hw, + EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data); + eeprom_apme_mask = E1000_EEPROM_82544_APM; + break; case e1000_82546: case e1000_82546_rev_3: if((E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_FUNC_1) @@ -598,7 +617,7 @@ e1000_probe(struct pci_dev *pdev, EEPROM_INIT_CONTROL3_PORT_A, 1, &eeprom_data); break; } - if(eeprom_data & E1000_EEPROM_APME) + if(eeprom_data & eeprom_apme_mask) adapter->wol |= E1000_WUFC_MAG; /* reset the hardware with the new settings */ @@ -807,6 +826,31 @@ e1000_close(struct net_device *netdev) } /** + * e1000_check_64k_bound - check that memory doesn't cross 64kB boundary + * @adapter: address of board private structure + * @begin: address of beginning of memory + * @end: address of end of memory + **/ +static inline boolean_t +e1000_check_64k_bound(struct e1000_adapter *adapter, + void *start, unsigned long len) +{ + unsigned long begin = (unsigned long) start; + unsigned long end = begin + len; + + /* first rev 82545 and 82546 need to not allow any memory + * write location to cross a 64k boundary due to errata 23 */ + if (adapter->hw.mac_type == e1000_82545 || + adapter->hw.mac_type == e1000_82546 ) { + + /* check buffer doesn't cross 64kB */ + return ((begin ^ (end - 1)) >> 16) != 0 ? FALSE : TRUE; + } + + return TRUE; +} + +/** * e1000_setup_tx_resources - allocate Tx resources (Descriptors) * @adapter: board private structure * @@ -824,7 +868,7 @@ e1000_setup_tx_resources(struct e1000_ad txdr->buffer_info = vmalloc(size); if(!txdr->buffer_info) { DPRINTK(PROBE, ERR, - "Unble to Allocate Memory for the Transmit descriptor ring\n"); + "Unable to Allocate Memory for the Transmit descriptor ring\n"); return -ENOMEM; } memset(txdr->buffer_info, 0, size); @@ -836,11 +880,42 @@ e1000_setup_tx_resources(struct e1000_ad txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma); if(!txdr->desc) { +setup_tx_desc_die: DPRINTK(PROBE, ERR, - "Unble to Allocate Memory for the Transmit descriptor ring\n"); + "Unable to Allocate Memory for the Transmit descriptor ring\n"); vfree(txdr->buffer_info); return -ENOMEM; } + + /* fix for errata 23, cant cross 64kB boundary */ + if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) { + void *olddesc = txdr->desc; + dma_addr_t olddma = txdr->dma; + DPRINTK(TX_ERR,ERR,"txdr align check failed: %u bytes at %p\n", + txdr->size, txdr->desc); + /* try again, without freeing the previous */ + txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma); + /* failed allocation, critial failure */ + if(!txdr->desc) { + pci_free_consistent(pdev, txdr->size, olddesc, olddma); + goto setup_tx_desc_die; + } + + if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) { + /* give up */ + pci_free_consistent(pdev, txdr->size, + txdr->desc, txdr->dma); + pci_free_consistent(pdev, txdr->size, olddesc, olddma); + DPRINTK(PROBE, ERR, + "Unable to Allocate aligned Memory for the Transmit" + " descriptor ring\n"); + vfree(txdr->buffer_info); + return -ENOMEM; + } else { + /* free old, move on with the new one since its okay */ + pci_free_consistent(pdev, txdr->size, olddesc, olddma); + } + } memset(txdr->desc, 0, txdr->size); txdr->next_to_use = 0; @@ -945,7 +1020,7 @@ e1000_setup_rx_resources(struct e1000_ad rxdr->buffer_info = vmalloc(size); if(!rxdr->buffer_info) { DPRINTK(PROBE, ERR, - "Unble to Allocate Memory for the Recieve descriptor ring\n"); + "Unable to Allocate Memory for the Recieve descriptor ring\n"); return -ENOMEM; } memset(rxdr->buffer_info, 0, size); @@ -958,11 +1033,43 @@ e1000_setup_rx_resources(struct e1000_ad rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma); if(!rxdr->desc) { +setup_rx_desc_die: DPRINTK(PROBE, ERR, "Unble to Allocate Memory for the Recieve descriptor ring\n"); vfree(rxdr->buffer_info); return -ENOMEM; } + + /* fix for errata 23, cant cross 64kB boundary */ + if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) { + void *olddesc = rxdr->desc; + dma_addr_t olddma = rxdr->dma; + DPRINTK(RX_ERR,ERR, + "rxdr align check failed: %u bytes at %p\n", + rxdr->size, rxdr->desc); + /* try again, without freeing the previous */ + rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma); + /* failed allocation, critial failure */ + if(!rxdr->desc) { + pci_free_consistent(pdev, rxdr->size, olddesc, olddma); + goto setup_rx_desc_die; + } + + if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) { + /* give up */ + pci_free_consistent(pdev, rxdr->size, + rxdr->desc, rxdr->dma); + pci_free_consistent(pdev, rxdr->size, olddesc, olddma); + DPRINTK(PROBE, ERR, + "Unable to Allocate aligned Memory for the" + " Receive descriptor ring\n"); + vfree(rxdr->buffer_info); + return -ENOMEM; + } else { + /* free old, move on with the new one since its okay */ + pci_free_consistent(pdev, rxdr->size, olddesc, olddma); + } + } memset(rxdr->desc, 0, rxdr->size); rxdr->next_to_clean = 0; @@ -1096,6 +1203,7 @@ e1000_unmap_and_free_tx_resource(struct struct e1000_buffer *buffer_info) { struct pci_dev *pdev = adapter->pdev; + if(buffer_info->dma) { pci_unmap_page(pdev, buffer_info->dma, @@ -1124,6 +1232,11 @@ e1000_clean_tx_ring(struct e1000_adapter /* Free all the Tx ring sk_buffs */ + if (likely(adapter->previous_buffer_info.skb != NULL)) { + e1000_unmap_and_free_tx_resource(adapter, + &adapter->previous_buffer_info); + } + for(i = 0; i < tx_ring->count; i++) { buffer_info = &tx_ring->buffer_info[i]; e1000_unmap_and_free_tx_resource(adapter, buffer_info); @@ -1425,7 +1538,6 @@ e1000_watchdog(unsigned long data) struct e1000_adapter *adapter = (struct e1000_adapter *) data; struct net_device *netdev = adapter->netdev; struct e1000_desc_ring *txdr = &adapter->tx_ring; - unsigned int i; uint32_t link; e1000_check_for_link(&adapter->hw); @@ -1505,12 +1617,8 @@ e1000_watchdog(unsigned long data) /* Cause software interrupt to ensure rx ring is cleaned */ E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_RXDMT0); - /* Early detection of hung controller */ - i = txdr->next_to_clean; - if(txdr->buffer_info[i].dma && - time_after(jiffies, txdr->buffer_info[i].time_stamp + HZ) && - !(E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_TXOFF)) - netif_stop_queue(netdev); + /* Force detection of hung controller every watchdog period*/ + adapter->detect_tx_hung = TRUE; /* Reset the timer */ mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ); @@ -1522,7 +1630,7 @@ e1000_watchdog(unsigned long data) #define E1000_TX_FLAGS_VLAN_MASK 0xffff0000 #define E1000_TX_FLAGS_VLAN_SHIFT 16 -static inline boolean_t +static inline int e1000_tso(struct e1000_adapter *adapter, struct sk_buff *skb) { #ifdef NETIF_F_TSO @@ -1531,8 +1639,19 @@ e1000_tso(struct e1000_adapter *adapter, uint32_t cmd_length = 0; uint16_t ipcse, tucse, mss; uint8_t ipcss, ipcso, tucss, tucso, hdr_len; +#if 0 /* Not in RHEL4 (see below)... */ + int err; +#endif if(skb_shinfo(skb)->tso_size) { +#if 0 /* Not in RHEL4... */ + if (skb_header_cloned(skb)) { + err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); + if (err) + return err; + } +#endif + hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2)); mss = skb_shinfo(skb)->tso_size; skb->nh.iph->tot_len = 0; @@ -1569,11 +1688,11 @@ e1000_tso(struct e1000_adapter *adapter, if(++i == adapter->tx_ring.count) i = 0; adapter->tx_ring.next_to_use = i; - return TRUE; + return 1; } #endif - return FALSE; + return 0; } static inline boolean_t @@ -1798,6 +1917,7 @@ e1000_xmit_frame(struct sk_buff *skb, st unsigned int nr_frags = 0; unsigned int mss = 0; int count = 0; + int tso; unsigned int f; len -= skb->data_len; @@ -1869,7 +1989,13 @@ e1000_xmit_frame(struct sk_buff *skb, st first = adapter->tx_ring.next_to_use; - if(likely(e1000_tso(adapter, skb))) + tso = e1000_tso(adapter, skb); + if (tso < 0) { + dev_kfree_skb_any(skb); + return NETDEV_TX_OK; + } + + if (likely(tso)) tx_flags |= E1000_TX_FLAGS_TSO; else if(likely(e1000_tx_csum(adapter, skb))) tx_flags |= E1000_TX_FLAGS_CSUM; @@ -2151,10 +2277,28 @@ e1000_intr(int irq, void *data, struct p __netif_rx_schedule(netdev); } #else + /* Writing IMC and IMS is needed for 82547. + Due to Hub Link bus being occupied, an interrupt + de-assertion message is not able to be sent. + When an interrupt assertion message is generated later, + two messages are re-ordered and sent out. + That causes APIC to think 82547 is in de-assertion + state, while 82547 is in assertion state, resulting + in dead lock. Writing IMC forces 82547 into + de-assertion state. + */ + if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2){ + atomic_inc(&adapter->irq_sem); + E1000_WRITE_REG(&adapter->hw, IMC, ~0); + } + for(i = 0; i < E1000_MAX_INTR; i++) if(unlikely(!e1000_clean_rx_irq(adapter) & !e1000_clean_tx_irq(adapter))) break; + + if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2) + e1000_irq_enable(adapter); #endif return IRQ_HANDLED; @@ -2174,24 +2318,21 @@ e1000_clean(struct net_device *netdev, i int tx_cleaned; int work_done = 0; - if (!netif_carrier_ok(netdev)) - goto quit_polling; - tx_cleaned = e1000_clean_tx_irq(adapter); e1000_clean_rx_irq(adapter, &work_done, work_to_do); *budget -= work_done; netdev->quota -= work_done; - /* if no Rx and Tx cleanup work was done, exit the polling mode */ - if(!tx_cleaned || (work_done < work_to_do) || + /* if no Tx and not enough Rx work done, exit the polling mode */ + if((!tx_cleaned && (work_done < work_to_do)) || !netif_running(netdev)) { -quit_polling: netif_rx_complete(netdev); + netif_rx_complete(netdev); e1000_irq_enable(adapter); return 0; } - return (work_done >= work_to_do); + return 1; } #endif @@ -2215,11 +2356,34 @@ e1000_clean_tx_irq(struct e1000_adapter eop_desc = E1000_TX_DESC(*tx_ring, eop); while(eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) { + /* pre-mature writeback of Tx descriptors */ + /* clear (free buffers and unmap pci_mapping) */ + /* previous_buffer_info */ + if (likely(adapter->previous_buffer_info.skb != NULL)) { + e1000_unmap_and_free_tx_resource(adapter, + &adapter->previous_buffer_info); + } + for(cleaned = FALSE; !cleaned; ) { tx_desc = E1000_TX_DESC(*tx_ring, i); buffer_info = &tx_ring->buffer_info[i]; + cleaned = (i == eop); + + /* pre-mature writeback of Tx descriptors */ + /* save the cleaning of the this for the */ + /* next iteration */ + if (cleaned) { + memcpy(&adapter->previous_buffer_info, + buffer_info, + sizeof(struct e1000_buffer)); + memset(buffer_info, + 0, + sizeof(struct e1000_buffer)); + } else { + e1000_unmap_and_free_tx_resource(adapter, + buffer_info); + } - e1000_unmap_and_free_tx_resource(adapter, buffer_info); tx_desc->buffer_addr = 0; tx_desc->lower.data = 0; tx_desc->upper.data = 0; @@ -2241,6 +2405,16 @@ e1000_clean_tx_irq(struct e1000_adapter netif_wake_queue(netdev); spin_unlock(&adapter->tx_lock); + + if(adapter->detect_tx_hung) { + /* detect a transmit hang in hardware, this serializes the + * check with the clearing of time_stamp and movement of i */ + adapter->detect_tx_hung = FALSE; + if(tx_ring->buffer_info[i].dma && + time_after(jiffies, tx_ring->buffer_info[i].time_stamp + HZ) && + !(E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_TXOFF)) + netif_stop_queue(netdev); + } return cleaned; } @@ -2407,19 +2581,43 @@ e1000_alloc_rx_buffers(struct e1000_adap struct e1000_rx_desc *rx_desc; struct e1000_buffer *buffer_info; struct sk_buff *skb; - unsigned int i; + unsigned int i, bufsz; i = rx_ring->next_to_use; buffer_info = &rx_ring->buffer_info[i]; while(!buffer_info->skb) { - skb = dev_alloc_skb(adapter->rx_buffer_len + NET_IP_ALIGN); + bufsz = adapter->rx_buffer_len + NET_IP_ALIGN; + skb = dev_alloc_skb(bufsz); if(unlikely(!skb)) { /* Better luck next round */ break; } + /* fix for errata 23, cant cross 64kB boundary */ + if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) { + struct sk_buff *oldskb = skb; + DPRINTK(RX_ERR,ERR, + "skb align check failed: %u bytes at %p\n", + bufsz, skb->data); + /* try again, without freeing the previous */ + skb = dev_alloc_skb(bufsz); + if (!skb) { + dev_kfree_skb(oldskb); + break; + } + if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) { + /* give up */ + dev_kfree_skb(skb); + dev_kfree_skb(oldskb); + break; /* while !buffer_info->skb */ + } else { + /* move on with the new one */ + dev_kfree_skb(oldskb); + } + } + /* Make buffer alignment 2 beyond a 16 byte boundary * this will result in a 16 byte aligned IP header after * the 14 byte MAC header is removed @@ -2435,6 +2633,25 @@ e1000_alloc_rx_buffers(struct e1000_adap adapter->rx_buffer_len, PCI_DMA_FROMDEVICE); + /* fix for errata 23, cant cross 64kB boundary */ + if(!e1000_check_64k_bound(adapter, + (void *)(unsigned long)buffer_info->dma, + adapter->rx_buffer_len)) { + DPRINTK(RX_ERR,ERR, + "dma align check failed: %u bytes at %ld\n", + adapter->rx_buffer_len, (unsigned long)buffer_info->dma); + + dev_kfree_skb(skb); + buffer_info->skb = NULL; + + pci_unmap_single(pdev, + buffer_info->dma, + adapter->rx_buffer_len, + PCI_DMA_FROMDEVICE); + + break; /* while !buffer_info->skb */ + } + rx_desc = E1000_RX_DESC(*rx_ring, i); rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma); jwltest-e1000-watchdog.patch: e1000.h | 1 + e1000_main.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) --- NEW FILE jwltest-e1000-watchdog.patch --- --- linux-2.6.11/drivers/net/e1000/e1000.h.orig 2005-03-18 15:25:19.291666832 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000.h 2005-03-18 15:26:23.723067936 -0500 @@ -203,6 +203,7 @@ struct e1000_adapter { spinlock_t stats_lock; atomic_t irq_sem; struct work_struct tx_timeout_task; + struct work_struct watchdog_task; uint8_t fc_autoneg; struct timer_list blink_timer; --- linux-2.6.11/drivers/net/e1000/e1000_main.c.orig 2005-03-18 15:25:19.381654822 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_main.c 2005-03-18 15:26:23.728067269 -0500 @@ -143,6 +143,7 @@ static void e1000_clean_rx_ring(struct e static void e1000_set_multi(struct net_device *netdev); static void e1000_update_phy_info(unsigned long data); static void e1000_watchdog(unsigned long data); +static void e1000_watchdog_task(struct e1000_adapter *adapter); static void e1000_82547_tx_fifo_stall(unsigned long data); static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev); static struct net_device_stats * e1000_get_stats(struct net_device *netdev); @@ -576,6 +577,9 @@ e1000_probe(struct pci_dev *pdev, adapter->watchdog_timer.function = &e1000_watchdog; adapter->watchdog_timer.data = (unsigned long) adapter; + INIT_WORK(&adapter->watchdog_task, + (void (*)(void *))e1000_watchdog_task, adapter); + init_timer(&adapter->phy_info_timer); adapter->phy_info_timer.function = &e1000_update_phy_info; adapter->phy_info_timer.data = (unsigned long) adapter; @@ -1531,13 +1535,20 @@ e1000_82547_tx_fifo_stall(unsigned long /** * e1000_watchdog - Timer Call-back - * @data: pointer to netdev cast into an unsigned long + * @data: pointer to adapter cast into an unsigned long **/ - static void e1000_watchdog(unsigned long data) { struct e1000_adapter *adapter = (struct e1000_adapter *) data; + + /* Do the rest outside of interrupt context */ + schedule_work(&adapter->watchdog_task); +} + +static void +e1000_watchdog_task(struct e1000_adapter *adapter) +{ struct net_device *netdev = adapter->netdev; struct e1000_desc_ring *txdr = &adapter->tx_ring; uint32_t link; jwltest-e1000-workqueue-flush.patch: e1000_main.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE jwltest-e1000-workqueue-flush.patch --- --- linux-2.6.11/drivers/net/e1000/e1000_main.c.orig 2005-03-18 15:28:40.346833843 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_main.c 2005-03-18 15:29:22.822164850 -0500 @@ -666,6 +666,8 @@ e1000_remove(struct pci_dev *pdev) struct e1000_adapter *adapter = netdev->priv; uint32_t manc; + flush_scheduled_work(); + if(adapter->hw.mac_type >= e1000_82540 && adapter->hw.media_type == e1000_media_type_copper) { manc = E1000_READ_REG(&adapter->hw, MANC); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v retrieving revision 1.790 retrieving revision 1.790.2.1 diff -u -r1.790 -r1.790.2.1 --- kernel-2.6.spec 18 Mar 2005 18:25:40 -0000 1.790 +++ kernel-2.6.spec 18 Mar 2005 20:36:40 -0000 1.790.2.1 @@ -21,7 +21,8 @@ %define sublevel 11 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) +#%define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) +%define rhbsys .jwltest.3 %if %{FC3} %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC3%{rhbsys} %endif @@ -285,6 +286,10 @@ Patch1359: linux-2.6.9-net-e1000-post-mature-writeback.patch Patch1361: linux-2.6.9-net-e1000-64k-align-check-dma.patch Patch1362: linux-2.6.9-net-airo-nullptr.patch +Patch1363: jwltest-b44-bounce-bufs.patch +Patch1364: jwltest-e1000-update-5_7_6-k2.patch +Patch1365: jwltest-e1000-watchdog.patch +Patch1366: jwltest-e1000-workqueue-flush.patch # USB bits Patch1400: linux-2.6.10-usb-use_both_schemes.patch @@ -565,6 +570,14 @@ #%patch1361 -p1 # NULL out ptrs in airo after kfree'ing them. %patch1362 -p1 +# Improve B44 bounce buffer allocation +%patch1363 -p1 +# E1000 update to 5.7.6-k2 +%patch1364 -p1 +# E1000 move body of watchdog to workqueue +%patch1365 -p1 +# E1000 flush workqueues at remove +%patch1366 -p1 # USB Bits. # Enable both old and new style USB initialisation. linux-2.6.9-module_version.patch: linux-2.6.10/drivers/scsi/gdth.c | 1 + linux-2.6.9/drivers/block/DAC960.c | 1 + linux-2.6.9/drivers/block/cciss.c | 1 + linux-2.6.9/drivers/block/cpqarray.c | 1 + linux-2.6.9/drivers/message/fusion/mptbase.c | 1 + linux-2.6.9/drivers/net/b44.c | 1 + linux-2.6.9/drivers/net/e1000/e1000_main.c | 4 +++- linux-2.6.9/drivers/net/ixgb/ixgb_main.c | 4 +++- linux-2.6.9/drivers/net/ns83820.c | 1 + linux-2.6.9/drivers/net/tg3.c | 1 + linux-2.6.9/drivers/scsi/3w-9xxx.c | 9 +++++---- linux-2.6.9/drivers/scsi/ahci.c | 1 + 12 files changed, 20 insertions(+), 6 deletions(-) Index: linux-2.6.9-module_version.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-module_version.patch,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- linux-2.6.9-module_version.patch 10 Mar 2005 00:26:59 -0000 1.6 +++ linux-2.6.9-module_version.patch 18 Mar 2005 20:36:40 -0000 1.6.2.1 @@ -26,8 +26,8 @@ #else #define DRIVERNAPI "-NAPI" #endif --char e1000_driver_version[] = "5.6.10.1-k2"DRIVERNAPI; -+#define DRV_VERSION "5.6.10.1-k2"DRIVERNAPI; +-char e1000_driver_version[] = "5.7.6-k2"DRIVERNAPI; ++#define DRV_VERSION "5.7.6-k2"DRIVERNAPI; +char e1000_driver_version[] = DRV_VERSION; char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation."; From fedora-cvs-commits at redhat.com Fri Mar 18 20:47:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 15:47:51 -0500 Subject: rpms/selinux-policy-strict/devel policy-20050317.patch, NONE, 1.1 .cvsignore, 1.100, 1.101 policy-20050311.patch, 1.3, 1.4 selinux-policy-strict.spec, 1.255, 1.256 sources, 1.106, 1.107 policy-20050201.patch, 1.10, NONE policy-20050208.patch, 1.5, NONE policy-20050210.patch, 1.5, NONE policy-20050217.patch, 1.4, NONE policy-20050224.patch, 1.12, NONE Message-ID: <200503182047.j2IKlpUw031373@cvs.devel.redhat.com> Update of /cvs/dist/rpms/selinux-policy-strict/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31358 Modified Files: .cvsignore policy-20050311.patch selinux-policy-strict.spec sources Added Files: policy-20050317.patch Removed Files: policy-20050201.patch policy-20050208.patch policy-20050210.patch policy-20050217.patch policy-20050224.patch Log Message: * Fri Mar 18 2005 Dan Walsh 1.23.3-2 - Allow cups/lpd to bind to a port policy-20050317.patch: ChangeLog | 5 ----- domains/program/crond.te | 4 ++-- domains/program/logrotate.te | 2 +- domains/program/syslogd.te | 13 +++++++++++-- domains/program/unused/apache.te | 2 ++ domains/program/unused/arpwatch.te | 6 ++++++ domains/program/unused/consoletype.te | 1 + domains/program/unused/cups.te | 2 ++ domains/program/unused/dhcpc.te | 1 + domains/program/unused/dovecot.te | 17 +++++++++++++++-- domains/program/unused/firstboot.te | 2 ++ domains/program/unused/games.te | 3 +++ domains/program/unused/mozilla.te | 3 +++ domains/program/unused/mrtg.te | 2 +- domains/program/unused/mta.te | 11 +---------- file_contexts/program/dovecot.fc | 3 +++ macros/program/games_domain.te | 19 +++++++++++++++++-- macros/program/gift_macros.te | 16 +++++++--------- macros/program/mozilla_macros.te | 12 ++++++++---- macros/program/mplayer_macros.te | 20 ++++++++++++-------- macros/program/screen_macros.te | 2 +- macros/program/tvtime_macros.te | 10 ++++++++-- macros/program/x_client_macros.te | 32 ++------------------------------ tunables/distro.tun | 2 +- tunables/tunable.tun | 12 ++++++------ 25 files changed, 116 insertions(+), 86 deletions(-) --- NEW FILE policy-20050317.patch --- diff --exclude-from=exclude -N -u -r nsapolicy/ChangeLog policy-1.23.3/ChangeLog --- nsapolicy/ChangeLog 2005-03-17 10:18:56.000000000 -0500 +++ policy-1.23.3/ChangeLog 2005-03-17 10:51:55.000000000 -0500 @@ -1,8 +1,3 @@ -1.23.3 2005-03-15 - * Added policy for nx_server from Thomas Bleher. - * Added policies for clockspeed, daemontools, djbdns, ucspi-tcp, and - publicfile from Petre Rodan. - 1.23.2 2005-03-14 * Merged diffs from Dan Walsh. Dan's patch includes Ivan Gyurdiev's gift policy. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/crond.te policy-1.23.3/domains/program/crond.te --- nsapolicy/domains/program/crond.te 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.3/domains/program/crond.te 2005-03-17 16:46:53.000000000 -0500 @@ -205,11 +205,11 @@ r_dir_file(system_crond_t, file_context_t) can_getsecurity(system_crond_t) } -allow system_crond_t removable_t:filesystem { getattr }; +allow system_crond_t removable_t:filesystem getattr; # # Required for webalizer # ifdef(`apache.te', ` allow system_crond_t httpd_log_t:file { getattr read }; ') -dontaudit crond_t self:capability { sys_tty_config }; +dontaudit crond_t self:capability sys_tty_config; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/logrotate.te policy-1.23.3/domains/program/logrotate.te --- nsapolicy/domains/program/logrotate.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/logrotate.te 2005-03-18 15:43:30.000000000 -0500 @@ -128,7 +128,7 @@ allow logrotate_t fs_t:filesystem getattr; can_exec(logrotate_t, shell_exec_t) -can_exec(logrotate_t, hostname_exec_t) +ifdef(`hostname.te', `can_exec(logrotate_t, hostname_exec_t)') can_exec(logrotate_t,logfile) allow logrotate_t net_conf_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/syslogd.te policy-1.23.3/domains/program/syslogd.te --- nsapolicy/domains/program/syslogd.te 2005-02-24 14:51:07.000000000 -0500 +++ policy-1.23.3/domains/program/syslogd.te 2005-03-17 15:10:27.000000000 -0500 @@ -36,7 +36,7 @@ allow syslogd_t etc_t:file r_file_perms; # Use capabilities. -allow syslogd_t self:capability { dac_override net_bind_service sys_resource sys_tty_config }; +allow syslogd_t self:capability { dac_override net_admin net_bind_service sys_resource sys_tty_config }; # Modify/create log files. create_append_log_file(syslogd_t, var_log_t) @@ -103,5 +103,14 @@ allow syslogd_t { tmpfs_t devpts_t }:dir search; dontaudit syslogd_t unlabeled_t:file read; dontaudit syslogd_t { userpty_type devpts_t }:chr_file getattr; -allow syslogd_t self:capability net_admin; allow syslogd_t self:netlink_route_socket r_netlink_socket_perms; +ifdef(`targeted_policy', ` +allow syslogd_t var_run_t:fifo_file { ioctl read write }; +') + +bool use_syslogng false; + +if (use_syslogng) { +allow syslogd_t proc_kmsg_t:file write; +allow syslogd_t self:capability { sys_admin chown }; +} diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apache.te policy-1.23.3/domains/program/unused/apache.te --- nsapolicy/domains/program/unused/apache.te 2005-03-15 08:02:23.000000000 -0500 +++ policy-1.23.3/domains/program/unused/apache.te 2005-03-17 15:19:16.000000000 -0500 @@ -270,9 +270,11 @@ if (use_nfs_home_dirs && httpd_enable_homedirs) { httpd_home_dirs(nfs_t) } + if (use_samba_home_dirs && httpd_enable_homedirs) { httpd_home_dirs(cifs_t) } + r_dir_file(httpd_t, fonts_t) # diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/arpwatch.te policy-1.23.3/domains/program/unused/arpwatch.te --- nsapolicy/domains/program/unused/arpwatch.te 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.3/domains/program/unused/arpwatch.te 2005-03-17 15:36:40.000000000 -0500 @@ -40,3 +40,9 @@ allow initrc_t arpwatch_data_t:file create; ')dnl end distro_gentoo +# why is mail delivered to a directory of type arpwatch_data_t? +allow mta_delivery_agent arpwatch_data_t:dir search; +allow { system_mail_t mta_user_agent } arpwatch_tmp_t:file rw_file_perms; +ifdef(`hide_broken_symptoms', ` +dontaudit { system_mail_t mta_user_agent } arpwatch_t:packet_socket { read write }; +') diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/consoletype.te policy-1.23.3/domains/program/unused/consoletype.te --- nsapolicy/domains/program/unused/consoletype.te 2005-03-15 08:02:23.000000000 -0500 +++ policy-1.23.3/domains/program/unused/consoletype.te 2005-03-17 11:37:45.000000000 -0500 @@ -22,6 +22,7 @@ domain_auto_trans(initrc_t, consoletype_exec_t, consoletype_t) allow consoletype_t tty_device_t:chr_file { getattr ioctl write }; +allow consoletype_t devtty_t:chr_file { read write }; allow consoletype_t initrc_devpts_t:chr_file { read write getattr ioctl }; ifdef(`xdm.te', ` diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cups.te policy-1.23.3/domains/program/unused/cups.te --- nsapolicy/domains/program/unused/cups.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/cups.te 2005-03-18 11:28:15.000000000 -0500 @@ -71,6 +71,8 @@ can_exec(cupsd_t, cupsd_exec_t) allow cupsd_t cupsd_exec_t:dir search; allow cupsd_t cupsd_exec_t:lnk_file read; +allow cupsd_t reserved_port_t:tcp_socket name_bind; +dontaudit cupsd_t reserved_port_type:tcp_socket name_bind; allow cupsd_t self:unix_stream_socket create_socket_perms; allow cupsd_t self:unix_dgram_socket create_socket_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/dhcpc.te policy-1.23.3/domains/program/unused/dhcpc.te --- nsapolicy/domains/program/unused/dhcpc.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/dhcpc.te 2005-03-18 15:40:57.000000000 -0500 @@ -86,6 +86,7 @@ # Use capabilities allow dhcpc_t self:capability { dac_override fsetid net_admin net_raw net_bind_service sys_resource sys_tty_config }; +dontaudit dhcpc_t self:capability sys_admin; # for access("/etc/bashrc", X_OK) on Red Hat dontaudit dhcpc_t self:capability { dac_read_search sys_module }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/dovecot.te policy-1.23.3/domains/program/unused/dovecot.te --- nsapolicy/domains/program/unused/dovecot.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/dovecot.te 2005-03-17 14:38:20.000000000 -0500 @@ -3,13 +3,19 @@ # Author: Russell Coker # X-Debian-Packages: dovecot-imapd, dovecot-pop3d +# +# Main dovecot daemon +# daemon_domain(dovecot, `, privhome') +etc_domain(dovecot); allow dovecot_t dovecot_var_run_t:sock_file create_file_perms; can_exec(dovecot_t, dovecot_exec_t) type dovecot_cert_t, file_type, sysadmfile; +type dovecot_passwd_t, file_type, sysadmfile; +type dovecot_spool_t, file_type, sysadmfile; allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot }; allow dovecot_t self:process setrlimit; @@ -25,9 +31,10 @@ can_exec(dovecot_t, bin_t) allow dovecot_t pop_port_t:tcp_socket name_bind; -allow dovecot_t urandom_device_t:chr_file read; +allow dovecot_t urandom_device_t:chr_file { getattr read }; allow dovecot_t cert_t:dir search; allow dovecot_t dovecot_cert_t:file { getattr read }; +allow dovecot_t cert_t:dir search; allow dovecot_t { self proc_t }:file { getattr read }; allow dovecot_t self:fifo_file rw_file_perms; @@ -36,11 +43,17 @@ allow dovecot_t tmp_t:dir search; rw_dir_file(dovecot_t, mail_spool_t) +create_dir_file(dovecot_t, dovecot_spool_t) +create_dir_file(mta_delivery_agent, dovecot_spool_t) allow dovecot_t mail_spool_t:lnk_file read; allow dovecot_t var_spool_t:dir { search }; +# +# Dovecot auth daemon +# daemon_sub_domain(dovecot_t, dovecot_auth, `, auth_chkpwd') allow dovecot_auth_t self:process { fork signal_perms }; +allow dovecot_auth_t self:capability { setgid setuid }; allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl }; allow dovecot_auth_t self:unix_dgram_socket create_socket_perms; allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms; @@ -50,6 +63,6 @@ allow dovecot_auth_t { self proc_t }:file { getattr read }; read_locale(dovecot_auth_t) read_sysctl(dovecot_auth_t) -allow dovecot_auth_t sysctl_t:dir search; +allow dovecot_auth_t dovecot_passwd_t:file { getattr read }; dontaudit dovecot_auth_t selinux_config_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/firstboot.te policy-1.23.3/domains/program/unused/firstboot.te --- nsapolicy/domains/program/unused/firstboot.te 2005-02-24 14:51:07.000000000 -0500 +++ policy-1.23.3/domains/program/unused/firstboot.te 2005-03-18 15:42:54.000000000 -0500 @@ -107,8 +107,10 @@ allow firstboot_t var_run_t:dir getattr; allow firstboot_t var_t:dir getattr; +ifdef(`hostname.te', ` allow hostname_t devtty_t:chr_file { read write }; allow hostname_t firstboot_t:fd use; +') ifdef(`iptables.te', ` allow iptables_t devtty_t:chr_file { read write }; allow iptables_t firstboot_t:fd use; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/games.te policy-1.23.3/domains/program/unused/games.te --- nsapolicy/domains/program/unused/games.te 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.3/domains/program/unused/games.te 2005-03-17 10:58:45.000000000 -0500 @@ -13,5 +13,8 @@ rw_dir_create_file(games_t, games_data_t) r_dir_file(initrc_t, games_data_t) +# Run in user_t +bool disable_games_trans false; + # Everything else is in the x_client_domain macro in # macros/program/x_client_macros.te. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/mozilla.te policy-1.23.3/domains/program/unused/mozilla.te --- nsapolicy/domains/program/unused/mozilla.te 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.3/domains/program/unused/mozilla.te 2005-03-17 10:58:34.000000000 -0500 @@ -14,5 +14,8 @@ # Allow mozilla to write files in the user home directory bool mozilla_writehome false; +# Run in user_t +bool disable_mozilla_trans false; + # Everything else is in the mozilla_domain macro in # macros/program/mozilla_macros.te. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/mrtg.te policy-1.23.3/domains/program/unused/mrtg.te --- nsapolicy/domains/program/unused/mrtg.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/mrtg.te 2005-03-18 15:43:05.000000000 -0500 @@ -94,5 +94,5 @@ dontaudit mrtg_t root_t:lnk_file getattr; allow mrtg_t self:capability { setgid setuid }; -can_exec(mrtg_t, hostname_exec_t) +ifdef(`hostname.te', `can_exec(mrtg_t, hostname_exec_t)') allow mrtg_t var_spool_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/mta.te policy-1.23.3/domains/program/unused/mta.te --- nsapolicy/domains/program/unused/mta.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/mta.te 2005-03-17 15:36:31.000000000 -0500 @@ -59,15 +59,6 @@ allow { system_mail_t mta_user_agent } privmail:fifo_file { read write }; allow { system_mail_t mta_user_agent } admin_tty_type:chr_file { read write }; -ifdef(`arpwatch.te', ` -# why is mail delivered to a directory of type arpwatch_data_t? -allow mta_delivery_agent arpwatch_data_t:dir search; -allow { system_mail_t mta_user_agent } arpwatch_tmp_t:file rw_file_perms; -ifdef(`hide_broken_symptoms', ` -dontaudit { system_mail_t mta_user_agent } arpwatch_t:packet_socket { read write }; -') -')dnl end if arpwatch.te - allow mta_delivery_agent home_root_t:dir { getattr search }; # for /var/spool/mail @@ -81,4 +72,4 @@ allow mta_delivery_agent { etc_runtime_t proc_t }:file { getattr read }; allow system_mail_t etc_runtime_t:file { getattr read }; -allow system_mail_t urandom_device_t:chr_file read; +allow system_mail_t { random_device_t urandom_device_t }:chr_file read; diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/dovecot.fc policy-1.23.3/file_contexts/program/dovecot.fc --- nsapolicy/file_contexts/program/dovecot.fc 2005-02-24 14:51:09.000000000 -0500 +++ policy-1.23.3/file_contexts/program/dovecot.fc 2005-03-17 14:18:38.000000000 -0500 @@ -1,4 +1,6 @@ # for Dovecot POP and IMAP server +/etc/dovecot.conf.* system_u:object_r:dovecot_etc_t +/etc/dovecot.passwd.* system_u:object_r:dovecot_passwd_t /usr/sbin/dovecot -- system_u:object_r:dovecot_exec_t ifdef(`distro_redhat', ` /usr/libexec/dovecot/dovecot-auth -- system_u:object_r:dovecot_auth_exec_t @@ -10,3 +12,4 @@ /usr/share/ssl/private/dovecot\.pem -- system_u:object_r:dovecot_cert_t /var/run/dovecot(-login)?(/.*)? system_u:object_r:dovecot_var_run_t /usr/lib(64)?/dovecot/.+ -- system_u:object_r:bin_t +/var/spool/dovecot(/.*)? system_u:object_r:dovecot_spool_t diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/games_domain.te policy-1.23.3/macros/program/games_domain.te --- nsapolicy/macros/program/games_domain.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/games_domain.te 2005-03-17 10:52:44.000000000 -0500 @@ -10,7 +10,23 @@ # # define(`games_domain', ` -x_client_domain($1, `games', `, transitionbool') + +type $1_games_t, domain, nscd_client_domain; + +# Type transition +if (! disable_games_trans) { +domain_auto_trans($1_t, games_exec_t, $1_games_t) +} +role $1_r types $1_games_t; + +# X access, Private tmp +x_client_domain($1, games) +tmp_domain($1_games) + +# Games seem to need this +if (allow_execmem) { +allow $1_games_t self:process execmem; +} allow $1_games_t var_t:dir { search getattr }; rw_dir_create_file($1_games_t, games_data_t) @@ -29,7 +45,6 @@ dontaudit $1_games_t sysctl_t:dir search; -tmp_domain($1_games) allow $1_games_t urandom_device_t:chr_file { getattr ioctl read }; ifdef(`xdm.te', ` allow $1_games_t xdm_tmp_t:dir rw_dir_perms; diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/gift_macros.te policy-1.23.3/macros/program/gift_macros.te --- nsapolicy/macros/program/gift_macros.te 2005-03-14 14:50:45.000000000 -0500 +++ policy-1.23.3/macros/program/gift_macros.te 2005-03-17 10:52:48.000000000 -0500 @@ -12,20 +12,18 @@ define(`gift_domain', ` -# Connect to X -x_client_domain($1, gift, `') - -# Transition +# Type transition +type $1_gift_t, domain, nscd_client_domain; domain_auto_trans($1_t, gift_exec_t, $1_gift_t) -can_exec($1_gift_t, gift_exec_t) role $1_r types $1_gift_t; +# X access, Home access +x_client_domain($1, gift) +home_domain($1, gift) + # Self permissions allow $1_gift_t self:process getsched; -# Home files -home_domain($1, gift) - # Fonts, icons r_dir_file($1_gift_t, usr_t) r_dir_file($1_gift_t, fonts_t) @@ -56,7 +54,7 @@ # giftui looks in .icons, .themes, .fonts-cache. dontaudit $1_gift_t $1_home_t:dir { getattr read search }; -dontaudit $1_gift_t $1_home_t:file { getattr read }; +dontaudit $1_gift_t $1_home_t:file { getattr read unlink }; ') dnl gift_domain diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/mozilla_macros.te policy-1.23.3/macros/program/mozilla_macros.te --- nsapolicy/macros/program/mozilla_macros.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/mozilla_macros.te 2005-03-17 10:52:51.000000000 -0500 @@ -16,12 +16,16 @@ # provided separately in domains/program/mozilla.te. # define(`mozilla_domain',` -x_client_domain($1, mozilla, `, web_client_domain, privlog, transitionbool') +type $1_mozilla_t, domain, web_client_domain, privlog; -# Configuration -home_domain($1, mozilla) +# Type transition +if (! disable_mozilla_trans) { +domain_auto_trans($1_t, mozilla_exec_t, $1_mozilla_t) +} +role $1_r types $1_mozilla_t; -# Allow mozilla to browse files +home_domain($1, mozilla) +x_client_domain($1, mozilla) file_browse_domain($1_mozilla_t) allow $1_mozilla_t sound_device_t:chr_file rw_file_perms; diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/mplayer_macros.te policy-1.23.3/macros/program/mplayer_macros.te --- nsapolicy/macros/program/mplayer_macros.te 2005-03-15 08:02:24.000000000 -0500 +++ policy-1.23.3/macros/program/mplayer_macros.te 2005-03-17 11:52:46.000000000 -0500 @@ -64,13 +64,15 @@ define(`mplayer_domain',` -# Derive from X client domain -x_client_domain($1, `mplayer', `') +type $1_mplayer_t, domain; -# Mplayer configuration here -home_domain($1, mplayer) +# Type transition +domain_auto_trans($1_t, mplayer_exec_t, $1_mplayer_t) +role $1_r types $1_mplayer_t; -# Allow mplayer to browse files +# Home access, X access, Browse files +home_domain($1, mplayer) +x_client_domain($1, mplayer) file_browse_domain($1_mplayer_t) # Mplayer common stuff @@ -85,6 +87,9 @@ # Read home directory content r_dir_file($1_mplayer_t, $1_home_t); +# Read CDs +r_dir_file($1_mplayer_t, removable_t); + # Legacy domain issues if (allow_mplayer_execstack) { allow $1_mplayer_t $1_mplayer_tmpfs_t:file execute; @@ -101,12 +106,11 @@ # FIXME: privhome temporarily removed... type $1_mencoder_t, domain; -# Transition +# Type transition domain_auto_trans($1_t, mencoder_exec_t, $1_mencoder_t) -can_exec($1_mencoder_t, mencoder_exec_t) role $1_r types $1_mencoder_t; -# Read home config +# Access mplayer home domain home_domain_access($1_mencoder_t, $1, mplayer) # Mplayer common stuff diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/screen_macros.te policy-1.23.3/macros/program/screen_macros.te --- nsapolicy/macros/program/screen_macros.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/screen_macros.te 2005-03-17 10:51:55.000000000 -0500 @@ -21,7 +21,7 @@ ifdef(`screen.te', ` define(`screen_domain',` # Derived domain based on the calling user domain and the program. -type $1_screen_t, domain, privlog, privfd; +type $1_screen_t, domain, privlog, privfdm, nscd_client_domain; # Transition from the user domain to this domain. domain_auto_trans($1_t, screen_exec_t, $1_screen_t) diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/tvtime_macros.te policy-1.23.3/macros/program/tvtime_macros.te --- nsapolicy/macros/program/tvtime_macros.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/tvtime_macros.te 2005-03-17 10:52:55.000000000 -0500 @@ -19,16 +19,22 @@ ifdef(`tvtime.te', ` define(`tvtime_domain',` +# Type transition +type $1_tvtime_t, domain, nscd_client_domain; +domain_auto_trans($1_t, tvtime_exec_t, $1_tvtime_t) +role $1_r types $1_tvtime_t; + +# Home access, X access home_domain($1, tvtime) +tmp_domain($1_tvtime, `', `{ file dir fifo_file }') x_client_domain($1, tvtime) allow $1_tvtime_t urandom_device_t:chr_file read; allow $1_tvtime_t clock_device_t:chr_file { ioctl read }; allow $1_tvtime_t kernel_t:system ipc_info; -allow $1_tvtime_t sound_device_t:chr_file read; +allow $1_tvtime_t sound_device_t:chr_file { ioctl read }; allow $1_tvtime_t $1_home_t:dir { getattr read search }; allow $1_tvtime_t $1_home_t:file { getattr read }; -tmp_domain($1_tvtime) allow $1_tvtime_t self:capability { setuid sys_nice sys_resource }; allow $1_tvtime_t self:process setsched; allow $1_tvtime_t usr_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/x_client_macros.te policy-1.23.3/macros/program/x_client_macros.te --- nsapolicy/macros/program/x_client_macros.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/x_client_macros.te 2005-03-17 10:52:55.000000000 -0500 @@ -37,39 +37,11 @@ ') # -# x_client_domain(domain_prefix) +# x_client_domain(user, app) # -# Define a derived domain for an X program when executed by -# a user domain. -# -# The type declaration for the executable type for this program ($2_exec_t) -# must be provided separately! -# -# The first parameter is the base name for the domain/role (EG user or sysadm) -# The second parameter is the program name (EG $2) -# The third parameter is the attributes for the domain (if any) +# Defines common X access rules for the user_app_t domain # define(`x_client_domain',` -# Derived domain based on the calling user domain and the program. -type $1_$2_t, domain, nscd_client_domain $3; - -ifelse(index(`$3', `transitionbool'), -1, ` -domain_auto_trans($1_t, $2_exec_t, $1_$2_t) -can_exec($1_$2_t, $2_exec_t) -', ` -# Only do it once -ifelse($1, user, ` -bool disable_$2 false; -') -# Transition from the user domain to the derived domain. -if (! disable_$2) { -domain_auto_trans($1_t, $2_exec_t, $1_$2_t) -can_exec($1_$2_t, $2_exec_t) -} -') - -# The user role is authorized for this domain. -role $1_r types $1_$2_t; # This domain is granted permissions common to most domains (including can_net) can_network($1_$2_t) diff --exclude-from=exclude -N -u -r nsapolicy/tunables/distro.tun policy-1.23.3/tunables/distro.tun --- nsapolicy/tunables/distro.tun 2005-02-24 14:51:09.000000000 -0500 +++ policy-1.23.3/tunables/distro.tun 2005-03-17 10:51:55.000000000 -0500 @@ -5,7 +5,7 @@ # appropriate ifdefs. -dnl define(`distro_redhat') +define(`distro_redhat') dnl define(`distro_suse') diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.tun policy-1.23.3/tunables/tunable.tun --- nsapolicy/tunables/tunable.tun 2005-02-24 14:51:09.000000000 -0500 +++ policy-1.23.3/tunables/tunable.tun 2005-03-17 10:51:55.000000000 -0500 @@ -1,27 +1,27 @@ # Allow users to execute the mount command -dnl define(`user_can_mount') +define(`user_can_mount') # Allow rpm to run unconfined. -dnl define(`unlimitedRPM') +define(`unlimitedRPM') # Allow privileged utilities like hotplug and insmod to run unconfined. -dnl define(`unlimitedUtils') +define(`unlimitedUtils') # Allow rc scripts to run unconfined, including any daemon # started by an rc script that does not have a domain transition # explicitly defined. -dnl define(`unlimitedRC') +define(`unlimitedRC') # Allow sysadm_t to directly start daemons define(`direct_sysadm_daemon') # Do not audit things that we know to be broken but which # are not security risks -dnl define(`hide_broken_symptoms') +define(`hide_broken_symptoms') # Allow user_r to reach sysadm_r via su, sudo, or userhelper. # Otherwise, only staff_r can do so. -dnl define(`user_canbe_sysadm') +define(`user_canbe_sysadm') # Allow xinetd to run unconfined, including any services it starts # that do not have a domain transition explicitly defined. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/.cvsignore,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- .cvsignore 15 Mar 2005 13:10:01 -0000 1.100 +++ .cvsignore 18 Mar 2005 20:47:49 -0000 1.101 @@ -66,3 +66,4 @@ policy-1.22.1.tgz policy-1.23.1.tgz policy-1.23.2.tgz +policy-1.23.3.tgz policy-20050311.patch: domains/program/unused/mta.te | 2 +- macros/program/screen_macros.te | 2 +- tunables/distro.tun | 2 +- tunables/tunable.tun | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) Index: policy-20050311.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/policy-20050311.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- policy-20050311.patch 15 Mar 2005 13:10:01 -0000 1.3 +++ policy-20050311.patch 18 Mar 2005 20:47:49 -0000 1.4 @@ -1,6 +1,27 @@ -diff --exclude-from=exclude -N -u -r nsapolicy/tunables/distro.tun policy-1.23.1/tunables/distro.tun +diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/mta.te policy-1.23.2/domains/program/unused/mta.te +--- nsapolicy/domains/program/unused/mta.te 2005-03-11 15:31:06.000000000 -0500 ++++ policy-1.23.2/domains/program/unused/mta.te 2005-03-15 08:27:55.071104648 -0500 +@@ -81,4 +81,4 @@ + allow mta_delivery_agent { etc_runtime_t proc_t }:file { getattr read }; + + allow system_mail_t etc_runtime_t:file { getattr read }; +-allow system_mail_t urandom_device_t:chr_file read; ++allow system_mail_t { random_device_t urandom_device_t }:chr_file read; +diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/screen_macros.te policy-1.23.2/macros/program/screen_macros.te +--- nsapolicy/macros/program/screen_macros.te 2005-03-11 15:31:07.000000000 -0500 ++++ policy-1.23.2/macros/program/screen_macros.te 2005-03-15 08:11:48.144099896 -0500 +@@ -21,7 +21,7 @@ + ifdef(`screen.te', ` + define(`screen_domain',` + # Derived domain based on the calling user domain and the program. +-type $1_screen_t, domain, privlog, privfd; ++type $1_screen_t, domain, privlog, privfdm nscd_client_domain; + + # Transition from the user domain to this domain. + domain_auto_trans($1_t, screen_exec_t, $1_screen_t) +diff --exclude-from=exclude -N -u -r nsapolicy/tunables/distro.tun policy-1.23.2/tunables/distro.tun --- nsapolicy/tunables/distro.tun 2005-02-24 14:51:09.000000000 -0500 -+++ policy-1.23.1/tunables/distro.tun 2005-03-11 21:18:59.000000000 -0500 ++++ policy-1.23.2/tunables/distro.tun 2005-03-15 08:10:59.391511416 -0500 @@ -5,7 +5,7 @@ # appropriate ifdefs. @@ -10,9 +31,9 @@ dnl define(`distro_suse') -diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.tun policy-1.23.1/tunables/tunable.tun +diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.tun policy-1.23.2/tunables/tunable.tun --- nsapolicy/tunables/tunable.tun 2005-02-24 14:51:09.000000000 -0500 -+++ policy-1.23.1/tunables/tunable.tun 2005-03-11 21:18:59.000000000 -0500 ++++ policy-1.23.2/tunables/tunable.tun 2005-03-15 08:10:59.392511264 -0500 @@ -1,27 +1,27 @@ # Allow users to execute the mount command -dnl define(`user_can_mount') Index: selinux-policy-strict.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/selinux-policy-strict.spec,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- selinux-policy-strict.spec 15 Mar 2005 13:10:01 -0000 1.255 +++ selinux-policy-strict.spec 18 Mar 2005 20:47:49 -0000 1.256 @@ -8,15 +8,16 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} -Version: 1.23.2 -Release: 1 +Version: 1.23.3 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz Source1: booleans Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-buildroot -Patch1: policy-20050311.patch +Patch1: policy-20050317.patch +Patch2: x_client_cleanup.diff BuildArch: noarch BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER} @@ -42,11 +43,12 @@ %prep %setup -q -n policy-%{version} %patch1 -p1 +%patch2 -p1 %build mv domains/misc/unused/* domains/misc mv domains/program/unused/* domains/program/ -(cd domains/program/; mv -f amavis.te asterisk.te audio-entropyd.te authbind.te backup.te calamaris.te ciped.te clamav.te courier.te distcc.te dante.te ddclient.te devfsd.te dnsmasq.te dpk* gatekeeper* gift.te imazesrv.te ircd.te jabberd.te lcd.te lrrd.te monopd.te nagios.te nessusd.te nrpe.te nsd.te oav-update.te openca-ca.te openvpn.te perdition.te portslave.te postgrey.te pump.te pxe.te qmail* resmgrd.te rssh.te scannerdaemon.te seuser* sound-server.te speedmgmt.te snort.te sxid.te tiny* transproxy.te uml_net* uptimed.te uwimapd.te watchdog.te xprint* unused/) +(cd domains/program/; mv -f amavis.te asterisk.te audio-entropyd.te authbind.te backup.te calamaris.te ciped.te clamav.te clockspeed.fc courier.te daemontools.te distcc.te djbdns.te dante.te ddclient.te devfsd.te dnsmasq.te dpk* gatekeeper* gift.te imazesrv.te ircd.te jabberd.te lcd.te lrrd.te monopd.te nagios.te nessusd.te nrpe.te nsd.te nx_server.te oav-update.te openca-ca.te openvpn.te perdition.te portslave.te postgrey.te publicfile.te pump.te pxe.te qmail* resmgrd.te rssh.te scannerdaemon.te seuser* sound-server.te speedmgmt.te snort.te sxid.te tiny* transproxy.te ucspi-tcp.te uml_net* uptimed.te uwimapd.te watchdog.te xprint* unused/) make policy rm -rf tmp @@ -214,6 +216,15 @@ exit 0 %changelog +* Fri Mar 18 2005 Dan Walsh 1.23.3-2 +- Allow cups/lpd to bind to a port + +* Thu Mar 17 2005 Dan Walsh 1.23.3-1 +- Update from NSA + * Added policy for nx_server from Thomas Bleher. + * Added policies for clockspeed, daemontools, djbdns, ucspi-tcp, and + publicfile from Petre Rodan. + * Tue Mar 15 2005 Dan Walsh 1.23.2-1 - Update from NSA * Merged diffs from Dan Walsh. Dan's patch includes Ivan Gyurdiev's Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/sources,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- sources 15 Mar 2005 13:10:01 -0000 1.106 +++ sources 18 Mar 2005 20:47:49 -0000 1.107 @@ -1 +1 @@ -afa1186e4f065417b678b7e6868a4157 policy-1.23.2.tgz +75e0fe2b1274dd410f5f04b4fae56332 policy-1.23.3.tgz --- policy-20050201.patch DELETED --- --- policy-20050208.patch DELETED --- --- policy-20050210.patch DELETED --- --- policy-20050217.patch DELETED --- --- policy-20050224.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 18 20:48:27 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 15:48:27 -0500 Subject: rpms/selinux-policy-targeted/devel policy-20050317.patch, NONE, 1.1 .cvsignore, 1.96, 1.97 selinux-policy-targeted.spec, 1.254, 1.255 sources, 1.101, 1.102 Message-ID: <200503182048.j2IKmRI3031504@cvs.devel.redhat.com> Update of /cvs/dist/rpms/selinux-policy-targeted/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31488 Modified Files: .cvsignore selinux-policy-targeted.spec sources Added Files: policy-20050317.patch Log Message: * Fri Mar 18 2005 Dan Walsh 1.23.3-2 - Allow cups/lpd to bind to a port policy-20050317.patch: ChangeLog | 5 ----- domains/program/crond.te | 4 ++-- domains/program/logrotate.te | 2 +- domains/program/syslogd.te | 13 +++++++++++-- domains/program/unused/apache.te | 2 ++ domains/program/unused/arpwatch.te | 6 ++++++ domains/program/unused/consoletype.te | 1 + domains/program/unused/cups.te | 2 ++ domains/program/unused/dhcpc.te | 1 + domains/program/unused/dovecot.te | 17 +++++++++++++++-- domains/program/unused/firstboot.te | 2 ++ domains/program/unused/games.te | 3 +++ domains/program/unused/mozilla.te | 3 +++ domains/program/unused/mrtg.te | 2 +- domains/program/unused/mta.te | 11 +---------- file_contexts/program/dovecot.fc | 3 +++ macros/program/games_domain.te | 19 +++++++++++++++++-- macros/program/gift_macros.te | 16 +++++++--------- macros/program/mozilla_macros.te | 12 ++++++++---- macros/program/mplayer_macros.te | 20 ++++++++++++-------- macros/program/screen_macros.te | 2 +- macros/program/tvtime_macros.te | 10 ++++++++-- macros/program/x_client_macros.te | 32 ++------------------------------ tunables/distro.tun | 2 +- tunables/tunable.tun | 12 ++++++------ 25 files changed, 116 insertions(+), 86 deletions(-) --- NEW FILE policy-20050317.patch --- diff --exclude-from=exclude -N -u -r nsapolicy/ChangeLog policy-1.23.3/ChangeLog --- nsapolicy/ChangeLog 2005-03-17 10:18:56.000000000 -0500 +++ policy-1.23.3/ChangeLog 2005-03-17 10:51:55.000000000 -0500 @@ -1,8 +1,3 @@ -1.23.3 2005-03-15 - * Added policy for nx_server from Thomas Bleher. - * Added policies for clockspeed, daemontools, djbdns, ucspi-tcp, and - publicfile from Petre Rodan. - 1.23.2 2005-03-14 * Merged diffs from Dan Walsh. Dan's patch includes Ivan Gyurdiev's gift policy. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/crond.te policy-1.23.3/domains/program/crond.te --- nsapolicy/domains/program/crond.te 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.3/domains/program/crond.te 2005-03-17 16:46:53.000000000 -0500 @@ -205,11 +205,11 @@ r_dir_file(system_crond_t, file_context_t) can_getsecurity(system_crond_t) } -allow system_crond_t removable_t:filesystem { getattr }; +allow system_crond_t removable_t:filesystem getattr; # # Required for webalizer # ifdef(`apache.te', ` allow system_crond_t httpd_log_t:file { getattr read }; ') -dontaudit crond_t self:capability { sys_tty_config }; +dontaudit crond_t self:capability sys_tty_config; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/logrotate.te policy-1.23.3/domains/program/logrotate.te --- nsapolicy/domains/program/logrotate.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/logrotate.te 2005-03-18 15:43:30.000000000 -0500 @@ -128,7 +128,7 @@ allow logrotate_t fs_t:filesystem getattr; can_exec(logrotate_t, shell_exec_t) -can_exec(logrotate_t, hostname_exec_t) +ifdef(`hostname.te', `can_exec(logrotate_t, hostname_exec_t)') can_exec(logrotate_t,logfile) allow logrotate_t net_conf_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/syslogd.te policy-1.23.3/domains/program/syslogd.te --- nsapolicy/domains/program/syslogd.te 2005-02-24 14:51:07.000000000 -0500 +++ policy-1.23.3/domains/program/syslogd.te 2005-03-17 15:10:27.000000000 -0500 @@ -36,7 +36,7 @@ allow syslogd_t etc_t:file r_file_perms; # Use capabilities. -allow syslogd_t self:capability { dac_override net_bind_service sys_resource sys_tty_config }; +allow syslogd_t self:capability { dac_override net_admin net_bind_service sys_resource sys_tty_config }; # Modify/create log files. create_append_log_file(syslogd_t, var_log_t) @@ -103,5 +103,14 @@ allow syslogd_t { tmpfs_t devpts_t }:dir search; dontaudit syslogd_t unlabeled_t:file read; dontaudit syslogd_t { userpty_type devpts_t }:chr_file getattr; -allow syslogd_t self:capability net_admin; allow syslogd_t self:netlink_route_socket r_netlink_socket_perms; +ifdef(`targeted_policy', ` +allow syslogd_t var_run_t:fifo_file { ioctl read write }; +') + +bool use_syslogng false; + +if (use_syslogng) { +allow syslogd_t proc_kmsg_t:file write; +allow syslogd_t self:capability { sys_admin chown }; +} diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apache.te policy-1.23.3/domains/program/unused/apache.te --- nsapolicy/domains/program/unused/apache.te 2005-03-15 08:02:23.000000000 -0500 +++ policy-1.23.3/domains/program/unused/apache.te 2005-03-17 15:19:16.000000000 -0500 @@ -270,9 +270,11 @@ if (use_nfs_home_dirs && httpd_enable_homedirs) { httpd_home_dirs(nfs_t) } + if (use_samba_home_dirs && httpd_enable_homedirs) { httpd_home_dirs(cifs_t) } + r_dir_file(httpd_t, fonts_t) # diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/arpwatch.te policy-1.23.3/domains/program/unused/arpwatch.te --- nsapolicy/domains/program/unused/arpwatch.te 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.3/domains/program/unused/arpwatch.te 2005-03-17 15:36:40.000000000 -0500 @@ -40,3 +40,9 @@ allow initrc_t arpwatch_data_t:file create; ')dnl end distro_gentoo +# why is mail delivered to a directory of type arpwatch_data_t? +allow mta_delivery_agent arpwatch_data_t:dir search; +allow { system_mail_t mta_user_agent } arpwatch_tmp_t:file rw_file_perms; +ifdef(`hide_broken_symptoms', ` +dontaudit { system_mail_t mta_user_agent } arpwatch_t:packet_socket { read write }; +') diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/consoletype.te policy-1.23.3/domains/program/unused/consoletype.te --- nsapolicy/domains/program/unused/consoletype.te 2005-03-15 08:02:23.000000000 -0500 +++ policy-1.23.3/domains/program/unused/consoletype.te 2005-03-17 11:37:45.000000000 -0500 @@ -22,6 +22,7 @@ domain_auto_trans(initrc_t, consoletype_exec_t, consoletype_t) allow consoletype_t tty_device_t:chr_file { getattr ioctl write }; +allow consoletype_t devtty_t:chr_file { read write }; allow consoletype_t initrc_devpts_t:chr_file { read write getattr ioctl }; ifdef(`xdm.te', ` diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cups.te policy-1.23.3/domains/program/unused/cups.te --- nsapolicy/domains/program/unused/cups.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/cups.te 2005-03-18 11:28:15.000000000 -0500 @@ -71,6 +71,8 @@ can_exec(cupsd_t, cupsd_exec_t) allow cupsd_t cupsd_exec_t:dir search; allow cupsd_t cupsd_exec_t:lnk_file read; +allow cupsd_t reserved_port_t:tcp_socket name_bind; +dontaudit cupsd_t reserved_port_type:tcp_socket name_bind; allow cupsd_t self:unix_stream_socket create_socket_perms; allow cupsd_t self:unix_dgram_socket create_socket_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/dhcpc.te policy-1.23.3/domains/program/unused/dhcpc.te --- nsapolicy/domains/program/unused/dhcpc.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/dhcpc.te 2005-03-18 15:40:57.000000000 -0500 @@ -86,6 +86,7 @@ # Use capabilities allow dhcpc_t self:capability { dac_override fsetid net_admin net_raw net_bind_service sys_resource sys_tty_config }; +dontaudit dhcpc_t self:capability sys_admin; # for access("/etc/bashrc", X_OK) on Red Hat dontaudit dhcpc_t self:capability { dac_read_search sys_module }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/dovecot.te policy-1.23.3/domains/program/unused/dovecot.te --- nsapolicy/domains/program/unused/dovecot.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/dovecot.te 2005-03-17 14:38:20.000000000 -0500 @@ -3,13 +3,19 @@ # Author: Russell Coker # X-Debian-Packages: dovecot-imapd, dovecot-pop3d +# +# Main dovecot daemon +# daemon_domain(dovecot, `, privhome') +etc_domain(dovecot); allow dovecot_t dovecot_var_run_t:sock_file create_file_perms; can_exec(dovecot_t, dovecot_exec_t) type dovecot_cert_t, file_type, sysadmfile; +type dovecot_passwd_t, file_type, sysadmfile; +type dovecot_spool_t, file_type, sysadmfile; allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot }; allow dovecot_t self:process setrlimit; @@ -25,9 +31,10 @@ can_exec(dovecot_t, bin_t) allow dovecot_t pop_port_t:tcp_socket name_bind; -allow dovecot_t urandom_device_t:chr_file read; +allow dovecot_t urandom_device_t:chr_file { getattr read }; allow dovecot_t cert_t:dir search; allow dovecot_t dovecot_cert_t:file { getattr read }; +allow dovecot_t cert_t:dir search; allow dovecot_t { self proc_t }:file { getattr read }; allow dovecot_t self:fifo_file rw_file_perms; @@ -36,11 +43,17 @@ allow dovecot_t tmp_t:dir search; rw_dir_file(dovecot_t, mail_spool_t) +create_dir_file(dovecot_t, dovecot_spool_t) +create_dir_file(mta_delivery_agent, dovecot_spool_t) allow dovecot_t mail_spool_t:lnk_file read; allow dovecot_t var_spool_t:dir { search }; +# +# Dovecot auth daemon +# daemon_sub_domain(dovecot_t, dovecot_auth, `, auth_chkpwd') allow dovecot_auth_t self:process { fork signal_perms }; +allow dovecot_auth_t self:capability { setgid setuid }; allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl }; allow dovecot_auth_t self:unix_dgram_socket create_socket_perms; allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms; @@ -50,6 +63,6 @@ allow dovecot_auth_t { self proc_t }:file { getattr read }; read_locale(dovecot_auth_t) read_sysctl(dovecot_auth_t) -allow dovecot_auth_t sysctl_t:dir search; +allow dovecot_auth_t dovecot_passwd_t:file { getattr read }; dontaudit dovecot_auth_t selinux_config_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/firstboot.te policy-1.23.3/domains/program/unused/firstboot.te --- nsapolicy/domains/program/unused/firstboot.te 2005-02-24 14:51:07.000000000 -0500 +++ policy-1.23.3/domains/program/unused/firstboot.te 2005-03-18 15:42:54.000000000 -0500 @@ -107,8 +107,10 @@ allow firstboot_t var_run_t:dir getattr; allow firstboot_t var_t:dir getattr; +ifdef(`hostname.te', ` allow hostname_t devtty_t:chr_file { read write }; allow hostname_t firstboot_t:fd use; +') ifdef(`iptables.te', ` allow iptables_t devtty_t:chr_file { read write }; allow iptables_t firstboot_t:fd use; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/games.te policy-1.23.3/domains/program/unused/games.te --- nsapolicy/domains/program/unused/games.te 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.3/domains/program/unused/games.te 2005-03-17 10:58:45.000000000 -0500 @@ -13,5 +13,8 @@ rw_dir_create_file(games_t, games_data_t) r_dir_file(initrc_t, games_data_t) +# Run in user_t +bool disable_games_trans false; + # Everything else is in the x_client_domain macro in # macros/program/x_client_macros.te. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/mozilla.te policy-1.23.3/domains/program/unused/mozilla.te --- nsapolicy/domains/program/unused/mozilla.te 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.3/domains/program/unused/mozilla.te 2005-03-17 10:58:34.000000000 -0500 @@ -14,5 +14,8 @@ # Allow mozilla to write files in the user home directory bool mozilla_writehome false; +# Run in user_t +bool disable_mozilla_trans false; + # Everything else is in the mozilla_domain macro in # macros/program/mozilla_macros.te. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/mrtg.te policy-1.23.3/domains/program/unused/mrtg.te --- nsapolicy/domains/program/unused/mrtg.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/mrtg.te 2005-03-18 15:43:05.000000000 -0500 @@ -94,5 +94,5 @@ dontaudit mrtg_t root_t:lnk_file getattr; allow mrtg_t self:capability { setgid setuid }; -can_exec(mrtg_t, hostname_exec_t) +ifdef(`hostname.te', `can_exec(mrtg_t, hostname_exec_t)') allow mrtg_t var_spool_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/mta.te policy-1.23.3/domains/program/unused/mta.te --- nsapolicy/domains/program/unused/mta.te 2005-03-11 15:31:06.000000000 -0500 +++ policy-1.23.3/domains/program/unused/mta.te 2005-03-17 15:36:31.000000000 -0500 @@ -59,15 +59,6 @@ allow { system_mail_t mta_user_agent } privmail:fifo_file { read write }; allow { system_mail_t mta_user_agent } admin_tty_type:chr_file { read write }; -ifdef(`arpwatch.te', ` -# why is mail delivered to a directory of type arpwatch_data_t? -allow mta_delivery_agent arpwatch_data_t:dir search; -allow { system_mail_t mta_user_agent } arpwatch_tmp_t:file rw_file_perms; -ifdef(`hide_broken_symptoms', ` -dontaudit { system_mail_t mta_user_agent } arpwatch_t:packet_socket { read write }; -') -')dnl end if arpwatch.te - allow mta_delivery_agent home_root_t:dir { getattr search }; # for /var/spool/mail @@ -81,4 +72,4 @@ allow mta_delivery_agent { etc_runtime_t proc_t }:file { getattr read }; allow system_mail_t etc_runtime_t:file { getattr read }; -allow system_mail_t urandom_device_t:chr_file read; +allow system_mail_t { random_device_t urandom_device_t }:chr_file read; diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/dovecot.fc policy-1.23.3/file_contexts/program/dovecot.fc --- nsapolicy/file_contexts/program/dovecot.fc 2005-02-24 14:51:09.000000000 -0500 +++ policy-1.23.3/file_contexts/program/dovecot.fc 2005-03-17 14:18:38.000000000 -0500 @@ -1,4 +1,6 @@ # for Dovecot POP and IMAP server +/etc/dovecot.conf.* system_u:object_r:dovecot_etc_t +/etc/dovecot.passwd.* system_u:object_r:dovecot_passwd_t /usr/sbin/dovecot -- system_u:object_r:dovecot_exec_t ifdef(`distro_redhat', ` /usr/libexec/dovecot/dovecot-auth -- system_u:object_r:dovecot_auth_exec_t @@ -10,3 +12,4 @@ /usr/share/ssl/private/dovecot\.pem -- system_u:object_r:dovecot_cert_t /var/run/dovecot(-login)?(/.*)? system_u:object_r:dovecot_var_run_t /usr/lib(64)?/dovecot/.+ -- system_u:object_r:bin_t +/var/spool/dovecot(/.*)? system_u:object_r:dovecot_spool_t diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/games_domain.te policy-1.23.3/macros/program/games_domain.te --- nsapolicy/macros/program/games_domain.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/games_domain.te 2005-03-17 10:52:44.000000000 -0500 @@ -10,7 +10,23 @@ # # define(`games_domain', ` -x_client_domain($1, `games', `, transitionbool') + +type $1_games_t, domain, nscd_client_domain; + +# Type transition +if (! disable_games_trans) { +domain_auto_trans($1_t, games_exec_t, $1_games_t) +} +role $1_r types $1_games_t; + +# X access, Private tmp +x_client_domain($1, games) +tmp_domain($1_games) + +# Games seem to need this +if (allow_execmem) { +allow $1_games_t self:process execmem; +} allow $1_games_t var_t:dir { search getattr }; rw_dir_create_file($1_games_t, games_data_t) @@ -29,7 +45,6 @@ dontaudit $1_games_t sysctl_t:dir search; -tmp_domain($1_games) allow $1_games_t urandom_device_t:chr_file { getattr ioctl read }; ifdef(`xdm.te', ` allow $1_games_t xdm_tmp_t:dir rw_dir_perms; diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/gift_macros.te policy-1.23.3/macros/program/gift_macros.te --- nsapolicy/macros/program/gift_macros.te 2005-03-14 14:50:45.000000000 -0500 +++ policy-1.23.3/macros/program/gift_macros.te 2005-03-17 10:52:48.000000000 -0500 @@ -12,20 +12,18 @@ define(`gift_domain', ` -# Connect to X -x_client_domain($1, gift, `') - -# Transition +# Type transition +type $1_gift_t, domain, nscd_client_domain; domain_auto_trans($1_t, gift_exec_t, $1_gift_t) -can_exec($1_gift_t, gift_exec_t) role $1_r types $1_gift_t; +# X access, Home access +x_client_domain($1, gift) +home_domain($1, gift) + # Self permissions allow $1_gift_t self:process getsched; -# Home files -home_domain($1, gift) - # Fonts, icons r_dir_file($1_gift_t, usr_t) r_dir_file($1_gift_t, fonts_t) @@ -56,7 +54,7 @@ # giftui looks in .icons, .themes, .fonts-cache. dontaudit $1_gift_t $1_home_t:dir { getattr read search }; -dontaudit $1_gift_t $1_home_t:file { getattr read }; +dontaudit $1_gift_t $1_home_t:file { getattr read unlink }; ') dnl gift_domain diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/mozilla_macros.te policy-1.23.3/macros/program/mozilla_macros.te --- nsapolicy/macros/program/mozilla_macros.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/mozilla_macros.te 2005-03-17 10:52:51.000000000 -0500 @@ -16,12 +16,16 @@ # provided separately in domains/program/mozilla.te. # define(`mozilla_domain',` -x_client_domain($1, mozilla, `, web_client_domain, privlog, transitionbool') +type $1_mozilla_t, domain, web_client_domain, privlog; -# Configuration -home_domain($1, mozilla) +# Type transition +if (! disable_mozilla_trans) { +domain_auto_trans($1_t, mozilla_exec_t, $1_mozilla_t) +} +role $1_r types $1_mozilla_t; -# Allow mozilla to browse files +home_domain($1, mozilla) +x_client_domain($1, mozilla) file_browse_domain($1_mozilla_t) allow $1_mozilla_t sound_device_t:chr_file rw_file_perms; diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/mplayer_macros.te policy-1.23.3/macros/program/mplayer_macros.te --- nsapolicy/macros/program/mplayer_macros.te 2005-03-15 08:02:24.000000000 -0500 +++ policy-1.23.3/macros/program/mplayer_macros.te 2005-03-17 11:52:46.000000000 -0500 @@ -64,13 +64,15 @@ define(`mplayer_domain',` -# Derive from X client domain -x_client_domain($1, `mplayer', `') +type $1_mplayer_t, domain; -# Mplayer configuration here -home_domain($1, mplayer) +# Type transition +domain_auto_trans($1_t, mplayer_exec_t, $1_mplayer_t) +role $1_r types $1_mplayer_t; -# Allow mplayer to browse files +# Home access, X access, Browse files +home_domain($1, mplayer) +x_client_domain($1, mplayer) file_browse_domain($1_mplayer_t) # Mplayer common stuff @@ -85,6 +87,9 @@ # Read home directory content r_dir_file($1_mplayer_t, $1_home_t); +# Read CDs +r_dir_file($1_mplayer_t, removable_t); + # Legacy domain issues if (allow_mplayer_execstack) { allow $1_mplayer_t $1_mplayer_tmpfs_t:file execute; @@ -101,12 +106,11 @@ # FIXME: privhome temporarily removed... type $1_mencoder_t, domain; -# Transition +# Type transition domain_auto_trans($1_t, mencoder_exec_t, $1_mencoder_t) -can_exec($1_mencoder_t, mencoder_exec_t) role $1_r types $1_mencoder_t; -# Read home config +# Access mplayer home domain home_domain_access($1_mencoder_t, $1, mplayer) # Mplayer common stuff diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/screen_macros.te policy-1.23.3/macros/program/screen_macros.te --- nsapolicy/macros/program/screen_macros.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/screen_macros.te 2005-03-17 10:51:55.000000000 -0500 @@ -21,7 +21,7 @@ ifdef(`screen.te', ` define(`screen_domain',` # Derived domain based on the calling user domain and the program. -type $1_screen_t, domain, privlog, privfd; +type $1_screen_t, domain, privlog, privfdm, nscd_client_domain; # Transition from the user domain to this domain. domain_auto_trans($1_t, screen_exec_t, $1_screen_t) diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/tvtime_macros.te policy-1.23.3/macros/program/tvtime_macros.te --- nsapolicy/macros/program/tvtime_macros.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/tvtime_macros.te 2005-03-17 10:52:55.000000000 -0500 @@ -19,16 +19,22 @@ ifdef(`tvtime.te', ` define(`tvtime_domain',` +# Type transition +type $1_tvtime_t, domain, nscd_client_domain; +domain_auto_trans($1_t, tvtime_exec_t, $1_tvtime_t) +role $1_r types $1_tvtime_t; + +# Home access, X access home_domain($1, tvtime) +tmp_domain($1_tvtime, `', `{ file dir fifo_file }') x_client_domain($1, tvtime) allow $1_tvtime_t urandom_device_t:chr_file read; allow $1_tvtime_t clock_device_t:chr_file { ioctl read }; allow $1_tvtime_t kernel_t:system ipc_info; -allow $1_tvtime_t sound_device_t:chr_file read; +allow $1_tvtime_t sound_device_t:chr_file { ioctl read }; allow $1_tvtime_t $1_home_t:dir { getattr read search }; allow $1_tvtime_t $1_home_t:file { getattr read }; -tmp_domain($1_tvtime) allow $1_tvtime_t self:capability { setuid sys_nice sys_resource }; allow $1_tvtime_t self:process setsched; allow $1_tvtime_t usr_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/x_client_macros.te policy-1.23.3/macros/program/x_client_macros.te --- nsapolicy/macros/program/x_client_macros.te 2005-03-11 15:31:07.000000000 -0500 +++ policy-1.23.3/macros/program/x_client_macros.te 2005-03-17 10:52:55.000000000 -0500 @@ -37,39 +37,11 @@ ') # -# x_client_domain(domain_prefix) +# x_client_domain(user, app) # -# Define a derived domain for an X program when executed by -# a user domain. -# -# The type declaration for the executable type for this program ($2_exec_t) -# must be provided separately! -# -# The first parameter is the base name for the domain/role (EG user or sysadm) -# The second parameter is the program name (EG $2) -# The third parameter is the attributes for the domain (if any) +# Defines common X access rules for the user_app_t domain # define(`x_client_domain',` -# Derived domain based on the calling user domain and the program. -type $1_$2_t, domain, nscd_client_domain $3; - -ifelse(index(`$3', `transitionbool'), -1, ` -domain_auto_trans($1_t, $2_exec_t, $1_$2_t) -can_exec($1_$2_t, $2_exec_t) -', ` -# Only do it once -ifelse($1, user, ` -bool disable_$2 false; -') -# Transition from the user domain to the derived domain. -if (! disable_$2) { -domain_auto_trans($1_t, $2_exec_t, $1_$2_t) -can_exec($1_$2_t, $2_exec_t) -} -') - -# The user role is authorized for this domain. -role $1_r types $1_$2_t; # This domain is granted permissions common to most domains (including can_net) can_network($1_$2_t) diff --exclude-from=exclude -N -u -r nsapolicy/tunables/distro.tun policy-1.23.3/tunables/distro.tun --- nsapolicy/tunables/distro.tun 2005-02-24 14:51:09.000000000 -0500 +++ policy-1.23.3/tunables/distro.tun 2005-03-17 10:51:55.000000000 -0500 @@ -5,7 +5,7 @@ # appropriate ifdefs. -dnl define(`distro_redhat') +define(`distro_redhat') dnl define(`distro_suse') diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.tun policy-1.23.3/tunables/tunable.tun --- nsapolicy/tunables/tunable.tun 2005-02-24 14:51:09.000000000 -0500 +++ policy-1.23.3/tunables/tunable.tun 2005-03-17 10:51:55.000000000 -0500 @@ -1,27 +1,27 @@ # Allow users to execute the mount command -dnl define(`user_can_mount') +define(`user_can_mount') # Allow rpm to run unconfined. -dnl define(`unlimitedRPM') +define(`unlimitedRPM') # Allow privileged utilities like hotplug and insmod to run unconfined. -dnl define(`unlimitedUtils') +define(`unlimitedUtils') # Allow rc scripts to run unconfined, including any daemon # started by an rc script that does not have a domain transition # explicitly defined. -dnl define(`unlimitedRC') +define(`unlimitedRC') # Allow sysadm_t to directly start daemons define(`direct_sysadm_daemon') # Do not audit things that we know to be broken but which # are not security risks -dnl define(`hide_broken_symptoms') +define(`hide_broken_symptoms') # Allow user_r to reach sysadm_r via su, sudo, or userhelper. # Otherwise, only staff_r can do so. -dnl define(`user_canbe_sysadm') +define(`user_canbe_sysadm') # Allow xinetd to run unconfined, including any services it starts # that do not have a domain transition explicitly defined. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/.cvsignore,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- .cvsignore 15 Mar 2005 13:10:36 -0000 1.96 +++ .cvsignore 18 Mar 2005 20:48:25 -0000 1.97 @@ -61,3 +61,4 @@ policy-1.22.1.tgz policy-1.23.1.tgz policy-1.23.2.tgz +policy-1.23.3.tgz Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/selinux-policy-targeted.spec,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- selinux-policy-targeted.spec 15 Mar 2005 13:10:36 -0000 1.254 +++ selinux-policy-targeted.spec 18 Mar 2005 20:48:25 -0000 1.255 @@ -8,15 +8,15 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} -Version: 1.23.2 -Release: 1 +Version: 1.23.3 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz Source1: booleans Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-buildroot -Patch: policy-20050311.patch +Patch: policy-20050317.patch Patch1: policy-%{type}.patch BuildArch: noarch @@ -49,7 +49,7 @@ mv domains/misc/*.te domains/misc/unused mv domains/program/*.te domains/program/unused/ rm domains/*.te -for i in amanda.te apache.te chkpwd.te consoletype.te cups.te dhcpc.te dhcpd.te dictd.te dovecot.te fingerd.te ftpd.te hostname.te howl.te i18n_input.te ifconfig.te init.te initrc.te inetd.te innd.te kerberos.te ktalkd.te ldconfig.te login.te lpd.te mailman.te modutil.te mta.te mysqld.te named.te nscd.te ntpd.te portmap.te postgresql.te privoxy.te radius.te radvd.te rlogind.te rpcd.te rshd.te rsync.te samba.te slapd.te snmpd.te squid.te stunnel.te syslogd.te telnetd.te tftpd.te winbind.te ypbind.te ypserv.te zebra.te; do +for i in amanda.te apache.te chkpwd.te cups.te dhcpc.te dhcpd.te dictd.te dovecot.te fingerd.te ftpd.te howl.te i18n_input.te ifconfig.te init.te initrc.te inetd.te innd.te kerberos.te ktalkd.te ldconfig.te login.te lpd.te mailman.te modutil.te mta.te mysqld.te named.te nscd.te ntpd.te portmap.te postgresql.te privoxy.te radius.te radvd.te rlogind.te rpcd.te rshd.te rsync.te samba.te slapd.te snmpd.te squid.te stunnel.te syslogd.te telnetd.te tftpd.te winbind.te ypbind.te ypserv.te zebra.te; do mv domains/program/unused/$i domains/program/ done rm -rf domains/program/unused @@ -226,6 +226,15 @@ exit 0 %changelog +* Fri Mar 18 2005 Dan Walsh 1.23.3-2 +- Allow cups/lpd to bind to a port + +* Thu Mar 17 2005 Dan Walsh 1.23.3-1 +- Update from NSA + * Added policy for nx_server from Thomas Bleher. + * Added policies for clockspeed, daemontools, djbdns, ucspi-tcp, and + publicfile from Petre Rodan. + * Tue Mar 15 2005 Dan Walsh 1.23.2-1 - Update from NSA * Merged diffs from Dan Walsh. Dan's patch includes Ivan Gyurdiev's Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/sources,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- sources 15 Mar 2005 13:10:36 -0000 1.101 +++ sources 18 Mar 2005 20:48:25 -0000 1.102 @@ -1 +1,2 @@ afa1186e4f065417b678b7e6868a4157 policy-1.23.2.tgz +75e0fe2b1274dd410f5f04b4fae56332 policy-1.23.3.tgz From fedora-cvs-commits at redhat.com Fri Mar 18 20:52:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 15:52:29 -0500 Subject: rpms/gaim/devel .cvsignore, 1.27, 1.28 gaim.spec, 1.75, 1.76 sources, 1.27, 1.28 gaim-1.1.4-gadugadu-crash.patch, 1.1, NONE gaim-1.1.4-nmcomm-glibc-macro.patch, 1.2, NONE gaim-1.1.4-yahoo_filexfer.patch, 1.1, NONE gaim-1.1.4-yahoo_picture.patch, 1.1, NONE Message-ID: <200503182052.j2IKqTQ4031649@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gaim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31634 Modified Files: .cvsignore gaim.spec sources Removed Files: gaim-1.1.4-gadugadu-crash.patch gaim-1.1.4-nmcomm-glibc-macro.patch gaim-1.1.4-yahoo_filexfer.patch gaim-1.1.4-yahoo_picture.patch Log Message: update to 1.2.0 (minor bug fixes) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gaim/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 25 Feb 2005 03:06:23 -0000 1.27 +++ .cvsignore 18 Mar 2005 20:52:27 -0000 1.28 @@ -9,3 +9,4 @@ gaim-1.1.3.tar.bz2 gaim-1.1.4-cvs2005022.patch.bz2 gaim-1.1.4.tar.bz2 +gaim-1.2.0.tar.bz2 Index: gaim.spec =================================================================== RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- gaim.spec 7 Mar 2005 22:09:09 -0000 1.75 +++ gaim.spec 18 Mar 2005 20:52:27 -0000 1.76 @@ -16,8 +16,8 @@ %define crypt_switch 1 Name: gaim -Version: 1.1.4 -Release: 5 +Version: 1.2.0 +Release: 1 Epoch: 1 License: GPL Group: Applications/Internet @@ -44,10 +44,7 @@ Patch6: gaim-1.0.1-naive-gnome-check.patch ## Patches 100-199: Upstream CVS Backports -Patch143: gaim-1.1.4-gadugadu-crash.patch -Patch144: gaim-1.1.4-nmcomm-glibc-macro.patch -Patch145: gaim-1.1.4-yahoo_filexfer.patch -Patch146: gaim-1.1.4-yahoo_picture.patch +#Patch146: gaim-1.1.4-yahoo_picture.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: A Gtk+ based multiprotocol instant messaging client @@ -115,10 +112,7 @@ %patch6 -p1 # CVS backports go here -%patch143 -p2 -%patch144 -p1 -%patch145 -p2 -%patch146 -p2 +#%patch146 -p2 # Relabel internal version for support purposes sed -i "s/%{version}/%{version}-%{release}/g" configure @@ -215,6 +209,9 @@ %endif %changelog +* Fri Mar 18 2005 Warren Togami 1:1.2.0-1 +- update to 1.2.0 (minor bug fixes) + * Mon Mar 07 2005 Warren Togami 1:1.1.4-5 - Copy before modifying prefs.xml Index: sources =================================================================== RCS file: /cvs/dist/rpms/gaim/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 25 Feb 2005 03:06:23 -0000 1.27 +++ sources 18 Mar 2005 20:52:27 -0000 1.28 @@ -1 +1 @@ -bef100062823ae1a10d041b022e05d9c gaim-1.1.4.tar.bz2 +220a1a61a67a621ce5b5d96b279c883b gaim-1.2.0.tar.bz2 --- gaim-1.1.4-gadugadu-crash.patch DELETED --- --- gaim-1.1.4-nmcomm-glibc-macro.patch DELETED --- --- gaim-1.1.4-yahoo_filexfer.patch DELETED --- --- gaim-1.1.4-yahoo_picture.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 18 21:08:57 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 16:08:57 -0500 Subject: rpms/libgtop2/devel libgtop2.spec,1.15,1.16 Message-ID: <200503182108.j2IL8vge010672@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libgtop2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10657 Modified Files: libgtop2.spec Log Message: * Fri Mar 18 2005 David Zeuthen - 2.10.0-2 - Rebuilt Index: libgtop2.spec =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libgtop2.spec 18 Mar 2005 19:01:06 -0000 1.15 +++ libgtop2.spec 18 Mar 2005 21:08:55 -0000 1.16 @@ -7,7 +7,7 @@ Name: libgtop2 Summary: libgtop library (version 2) Version: 2.10.0 -Release: 1 +Release: 2 License: GPL URL: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0 Group: System Environment/Libraries @@ -82,6 +82,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Fri Mar 18 2005 David Zeuthen - 2.10.0-2 +- Rebuilt + * Fri Mar 18 2005 David Zeuthen - 2.10.0-1 - Even newer upstream version From fedora-cvs-commits at redhat.com Fri Mar 18 21:20:15 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 16:20:15 -0500 Subject: rpms/xloadimage/FC-3 01_libjpeg-support.dpatch, NONE, 1.1 xloadimage-4.1-popen.patch, NONE, 1.1 xloadimage-format.patch, NONE, 1.1 xloadimage-4.1-buffer.patch, 1.1, 1.2 xloadimage.4.1-linux.patch, 1.1, 1.2 xloadimage.spec, 1.5, 1.6 Message-ID: <200503182120.j2ILKFdt014187@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xloadimage/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv10829/FC-3 Modified Files: xloadimage-4.1-buffer.patch xloadimage.4.1-linux.patch xloadimage.spec Added Files: 01_libjpeg-support.dpatch xloadimage-4.1-popen.patch xloadimage-format.patch Log Message: use system libjpeg (modify debian patch. no need to autoconf-ify it!) some more minor fixes to strcpy use escape single quotes when used with gunzip & popen (CAN-2005-0638) --- NEW FILE 01_libjpeg-support.dpatch --- diff -urNad 01.xloadimage.tmp/jpeg.c 01.xloadimage/jpeg.c --- 01.xloadimage.tmp/jpeg.c 1993-11-08 18:36:03.000000000 +0000 +++ 01.xloadimage/jpeg.c 2003-04-03 00:13:08.000000000 +0100 @@ -4,509 +4,314 @@ * free JPEG software. See jpeg.README for more information. * * This code is based on example.c from the IJG v4 distribution. + * 1998/08/19: Change for IJG v6.0a. dump Progressive JPEG support. */ #include "image.h" /* xloadimage declarations */ -#include "jpeg.conf.h" /* definitions used in jpeg directory */ -#include "jpeg/jinclude.h" /* IJG declarations */ +#ifdef HAS_JPEG +#include "options.h" +#include +#include #include /* need setjmp/longjmp */ -/* Error-catching routines */ +#undef DEBUG +/* #define DEBUG */ +#undef debug + +#ifdef DEBUG +# define debug(xx) fprintf(stderr,xx) +#else +# define debug(xx) +#endif + +static Image *image; /* xloadimage image being returned */ static char *filename; -static unsigned int verbose; -static unsigned int identify; static jmp_buf setjmp_buffer; /* for return to caller */ -static external_methods_ptr emethods; /* needed for access to message_parm */ +ZFILE * zinput_file; /* tells input routine where to read JPEG */ +static JOCTET jpeg_read_buff[1024 * 16]; -static void -trace_message (msgtext) - char *msgtext; +/* + * source manager + */ +static void init_source( j_decompress_ptr cinfo) { - fprintf(stderr, "jpegLoad: %s - ", filename); - fprintf(stderr, msgtext, - emethods->message_parm[0], emethods->message_parm[1], - emethods->message_parm[2], emethods->message_parm[3], - emethods->message_parm[4], emethods->message_parm[5], - emethods->message_parm[6], emethods->message_parm[7]); - fprintf(stderr, "\n"); /* there is no \n in the format string! */ -} -static void -error_exit (msgtext) - char *msgtext; -{ - trace_message(msgtext); /* report the error message */ - (*emethods->free_all) (); /* clean up memory allocation & temp files */ - longjmp(setjmp_buffer, 1); /* return control to outer routine */ + debug("init_source()"); } - -/* Output-acceptance routines */ - -static Image *image; /* xloadimage image being returned */ -static int rows_put; /* Number of rows copied to image */ - - -static void -output_init (cinfo) - decompress_info_ptr cinfo; -/* Initialize for output */ +static boolean fill_input_buffer( j_decompress_ptr cinfo) { - int i; + struct jpeg_source_mgr *src = cinfo->src; - if (cinfo->out_color_space == CS_GRAYSCALE) { - image = newRGBImage(cinfo->image_width,cinfo->image_height,8); - image->title = dupString(filename); - /* set a linear map */ - for(i=0;i<256;i++) { - *(image->rgb.red + i) = - *(image->rgb.green + i) = - *(image->rgb.blue + i) = i<<8; + debug("fill_input_buffer()"); +#ifdef DEBUG + fprintf( stderr,"fill_input_buffer(): %d ",src->bytes_in_buffer); +#endif + src->next_input_byte = jpeg_read_buff; + src->bytes_in_buffer = zread(zinput_file, + jpeg_read_buff, sizeof(jpeg_read_buff)); + if(src->bytes_in_buffer <= 0){ + WARNMS(cinfo, JWRN_JPEG_EOF); + jpeg_read_buff[0] = 0xFF; + jpeg_read_buff[1] = JPEG_EOI; + src->bytes_in_buffer = 2; } - image->rgb.used = 256; - } else if (cinfo->out_color_space == CS_RGB) { - image = newTrueImage(cinfo->image_width,cinfo->image_height); - image->title = dupString(filename); - } else { - image = NULL; - ERREXIT(cinfo->emethods, "Cannot cope with JPEG image colorspace"); - } - rows_put = 0; + return TRUE; } - -static void -put_color_map (cinfo, num_colors, colormap) - decompress_info_ptr cinfo; - int num_colors; - JSAMPARRAY colormap; -/* Write the color map -- should not be called */ +static void skip_input_data( j_decompress_ptr cinfo, long num_bytes) { - fprintf(stderr, "put_color_map called: there is a bug here somewhere!\n"); -} - + int rest; + struct jpeg_source_mgr *src = cinfo->src; -static void -put_pixel_rows (cinfo, num_rows, pixel_data) - decompress_info_ptr cinfo; - int num_rows; - JSAMPIMAGE pixel_data; -/* Write some rows of output data */ -{ - register unsigned char *bufp; - register JSAMPROW ptr0, ptr1, ptr2; - register long col; - long width = cinfo->image_width; - int row; - - if (cinfo->out_color_space == CS_GRAYSCALE) { - bufp = image->data + rows_put * width; - /* Assume JSAMPLE == chars */ - for (row = 0; row < num_rows; row++) { - bcopy(pixel_data[0][row],bufp,width); - bufp += width; + debug("skip_input_data()"); +#ifdef DEBUG + fprintf(stderr,": %ld,%d ", num_bytes, src->bytes_in_buffer); +#endif + if( num_bytes < 1) return; + rest = src->bytes_in_buffer; + if( num_bytes < rest) { + src->next_input_byte += num_bytes; + src->bytes_in_buffer -= num_bytes;; + return; } - } else { - bufp = image->data + rows_put * width * 3; - for (row = 0; row < num_rows; row++) { - ptr0 = pixel_data[0][row]; - ptr1 = pixel_data[1][row]; - ptr2 = pixel_data[2][row]; - for (col = width; col > 0; col--) { - *bufp++ = *ptr0++; - *bufp++ = *ptr1++; - *bufp++ = *ptr2++; - } + num_bytes -= rest; + while( num_bytes--) { + zgetc(zinput_file); } - } - rows_put += num_rows; + fill_input_buffer(cinfo); } - -static void -output_term (cinfo) - decompress_info_ptr cinfo; -/* Finish up at the end of the output */ +static boolean resync_to_restart( j_decompress_ptr cinfo, int desired) { - /* No work here */ + return jpeg_resync_to_restart( cinfo, desired); } - -/* Input-file-reading routine */ - - -static ZFILE * input_file; /* tells input routine where to read JPEG */ - - -static int -read_jpeg_data (cinfo) - decompress_info_ptr cinfo; +static void term_source( j_decompress_ptr cinfo) { - cinfo->next_input_byte = cinfo->input_buffer + MIN_UNGET; + debug("term_source()"); +} - cinfo->bytes_in_buffer = zread(input_file, - (byte *)cinfo->next_input_byte, - JPEG_BUF_SIZE); - - if (cinfo->bytes_in_buffer <= 0) { - WARNMS(cinfo->emethods, "Premature EOF in JPEG file"); - cinfo->next_input_byte[0] = (char) 0xFF; - cinfo->next_input_byte[1] = (char) 0xD9; /* EOI marker */ - cinfo->bytes_in_buffer = 2; - } +/* + * error manager + */ +static void +output_message ( j_common_ptr cominfo) +{ + char buf[JMSG_LENGTH_MAX]; - return JGETC(cinfo); + (*cominfo->err->format_message)(cominfo, buf); + fprintf(stderr, "jpegLoad: %s - %s\n", filename, buf); } -/* Required control-hook routine */ +static void error_exit (j_common_ptr cominfo) +{ + output_message( cominfo); + longjmp(setjmp_buffer, 1); /* return control to outer routine */ +} static void -d_ui_method_selection (cinfo) - decompress_info_ptr cinfo; +jpegInfo (cinfo) + j_decompress_ptr cinfo; { - /* if grayscale input, force grayscale output; */ - /* else leave the output colorspace as set by main routine. */ - if (cinfo->jpeg_color_space == CS_GRAYSCALE) - cinfo->out_color_space = CS_GRAYSCALE; - - /* Create display of image parameters */ - if (verbose) { + /* Create display of image parameters */ printf("%s is a %dx%d JPEG image, color space ", filename, cinfo->image_width, cinfo->image_height); switch (cinfo->jpeg_color_space) { - case CS_UNKNOWN: - printf("Unknown"); - break; - case CS_GRAYSCALE: - printf("Grayscale"); - break; - case CS_RGB: - printf("RGB"); - break; - case CS_YCbCr: - printf("YCbCr"); - break; - case CS_YIQ: - printf("YIQ"); - break; - case CS_CMYK: - printf("CMYK"); - break; + case JCS_GRAYSCALE: + printf("Grayscale"); + break; + case JCS_RGB: + printf("RGB"); + break; + case JCS_YCbCr: + printf("YCbCr"); + break; + case JCS_CMYK: + printf("CMYK"); + break; + case JCS_YCCK: + printf("YCCK"); + break; + case JCS_UNKNOWN: + default: + printf("Unknown"); + break; } printf(", %d comp%s,", cinfo->num_components, - cinfo->num_components ? "s." : "."); + (cinfo->num_components - 1) ? "s" : ""); + if (cinfo->progressive_mode) + printf(" Progressive,"); if (cinfo->arith_code) - printf(" Arithmetic coding\n"); + printf(" Arithmetic coding.\n"); else - printf(" Huffman coding\n"); - } - - /* Turn off caching beyond this point of the file */ - znocache(input_file); - - /* If we only wanted to identify the image, abort now */ - if (identify) { - (*emethods->free_all) (); /* clean up memory allocation & temp files */ - longjmp(setjmp_buffer, 10); /* return control with success code */ - } - - /* select output routines */ - cinfo->methods->output_init = output_init; - cinfo->methods->put_color_map = put_color_map; - cinfo->methods->put_pixel_rows = put_pixel_rows; - cinfo->methods->output_term = output_term; + printf(" Huffman coding.\n"); } /* Main control routine for loading */ - Image * -jpegLoad (fullname, name, vbose) +jpegLoad (fullname, name, verbose) char *fullname, *name; - unsigned int vbose; + unsigned int verbose; { - struct Decompress_info_struct cinfo; - struct Decompress_methods_struct dc_methods; - struct External_methods_struct e_methods; - - input_file = zopen(fullname); /* Open the input file */ - if (input_file == NULL) - return NULL; - - /* Quick check to see if file starts with JPEG SOI marker */ - if (zgetc(input_file) != 0xFF || zgetc(input_file) != 0xD8) { - zclose(input_file); - return NULL; - } - - filename = name; /* copy parms to static vars */ - verbose = vbose; - identify = 0; - - image = NULL; /* in case we fail before creating image */ - - cinfo.methods = &dc_methods; /* links to method structs */ - cinfo.emethods = &e_methods; - emethods = &e_methods; /* save struct addr for possible access */ - e_methods.error_exit = error_exit; /* supply error-exit routine */ - e_methods.trace_message = trace_message; /* supply trace-message routine */ - e_methods.trace_level = 0; /* default = no tracing */ - e_methods.num_warnings = 0; /* no warnings emitted yet */ - e_methods.first_warning_level = 0; /* display first corrupt-data warning */ - e_methods.more_warning_level = 3; /* but suppress additional ones */ - - /* prepare setjmp context for possible exit from error_exit */ - if (setjmp(setjmp_buffer)) { - /* If we get here, the JPEG code has signaled an error. */ - /* Return as much of the image as we could get. */ - zclose(input_file); - return image; - } + struct jpeg_decompress_struct cinfo; + struct jpeg_source_mgr src_mgr; + struct jpeg_error_mgr err_mgr; + int i, row_stride; + byte *bufp; - jselmemmgr(&e_methods); /* select std memory allocation routines */ + zinput_file = zopen(fullname); /* Open the input file */ + if (zinput_file == NULL) + return NULL; + filename = name; /* copy parms to static vars */ + image = NULL; /* in case we fail before creating image */ - /* Set up default decompression parameters. */ - j_d_defaults(&cinfo, TRUE); + jpeg_create_decompress(&cinfo); + src_mgr.init_source = init_source; + src_mgr.fill_input_buffer = fill_input_buffer; + src_mgr.skip_input_data = skip_input_data; + src_mgr.resync_to_restart = resync_to_restart; + src_mgr.term_source = term_source; + cinfo.src = &src_mgr; /* links to method structs */ + err_mgr.error_exit = error_exit; /* supply error-exit routine */ + err_mgr.output_message = output_message; + err_mgr.trace_level = 0; /* default = no tracing */ + err_mgr.num_warnings = 0; /* no warnings emitted yet */ + cinfo.err = jpeg_std_error(&err_mgr); - /* Override default methods */ - dc_methods.d_ui_method_selection = d_ui_method_selection; - dc_methods.read_jpeg_data = read_jpeg_data; + src_mgr.bytes_in_buffer = 0; + fill_input_buffer( &cinfo); + /* Quick check to see if file starts with JPEG SOI marker */ + if(jpeg_read_buff[0] != 0xFF || jpeg_read_buff[1] != 0xD8) { + zclose(zinput_file); + return NULL; + } - /* Insert fake SOI into the input buffer --- needed cause we read it above */ - cinfo.next_input_byte = cinfo.input_buffer + MIN_UNGET; - cinfo.next_input_byte[0] = (char) 0xFF; - cinfo.next_input_byte[1] = (char) 0xD8; /* SOI marker */ - cinfo.bytes_in_buffer = 2; + /* prepare setjmp context for possible exit from error_exit */ + if (setjmp(setjmp_buffer)) { + /* If we get here, the JPEG code has signaled an error. */ + /* Return as much of the image as we could get. */ + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); + return image; + } + + jpeg_read_header(&cinfo, TRUE); + if (verbose) jpegInfo(&cinfo); + /* Turn off caching beyond this point of the file */ + znocache(zinput_file); + jpeg_start_decompress(&cinfo); - /* Set up to read a JFIF or baseline-JPEG file. */ - /* This is the only JPEG file format currently supported. */ - jselrjfif(&cinfo); + switch (cinfo.out_color_space) { + case JCS_GRAYSCALE: + image = newRGBImage(cinfo.image_width,cinfo.image_height,8); + image->title = dupString(filename); + /* set a linear map */ + for(i=0;i<256;i++) { + *(image->rgb.red + i) = + *(image->rgb.green + i) = + *(image->rgb.blue + i) = i << 8; + } + image->rgb.used = 256; + break; + case JCS_RGB: + image = newTrueImage(cinfo.image_width,cinfo.image_height); + image->title = dupString(filename); + break; + default: + image = NULL; + ERREXITS(&cinfo, 1, "Cannot cope with JPEG image colorspace"); + } - /* Here we go! */ - jpeg_decompress(&cinfo); + row_stride = cinfo.output_width * cinfo.output_components; + bufp = image->data; + while (cinfo.output_scanline < cinfo.output_height) { + jpeg_read_scanlines(&cinfo, &bufp, 1); + bufp += row_stride; + } - zclose(input_file); /* Done, close the input file */ + jpeg_finish_decompress(&cinfo); + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); /* Done, close the input file */ - return image; + return image; } -/* Main control routine for identifying JPEG without loading */ - - +/* + Main control routine for identifying JPEG without loading + return 0: Not jpeg file. + */ int jpegIdent (fullname, name) char *fullname, *name; { - struct Decompress_info_struct cinfo; - struct Decompress_methods_struct dc_methods; - struct External_methods_struct e_methods; - - input_file = zopen(fullname); /* Open the input file */ - if (input_file == NULL) - return 0; - - /* Quick check to see if file starts with JPEG SOI marker */ - if (zgetc(input_file) != 0xFF || zgetc(input_file) != 0xD8) { - zclose(input_file); - return 0; - } - - /* We want to find and display the image dimensions, and also - * verify that the header markers are not corrupt. To do this, - * we fire up the JPEG decoder as normal, but when d_ui_method_selection - * is called, we abort the process by longjmp'ing back here. - * This works nicely since the headers are all read at that point. - */ - - filename = name; /* copy parms to static vars */ - verbose = 1; - identify = 1; - - cinfo.methods = &dc_methods; /* links to method structs */ - cinfo.emethods = &e_methods; - emethods = &e_methods; /* save struct addr for possible access */ - e_methods.error_exit = error_exit; /* supply error-exit routine */ - e_methods.trace_message = trace_message; /* supply trace-message routine */ - e_methods.trace_level = 0; /* default = no tracing */ - e_methods.num_warnings = 0; /* no warnings emitted yet */ - e_methods.first_warning_level = 0; /* display first corrupt-data warning */ - e_methods.more_warning_level = 3; /* but suppress additional ones */ - - /* prepare setjmp context for expected exit via longjmp */ - switch (setjmp(setjmp_buffer)) { - case 0: - /* First time thru, keep going */ - break; - case 10: - /* Successful exit from d_ui_method_selection; return A-OK */ - zclose(input_file); - return 1; - default: - /* If we get here, the JPEG code has signaled an error. */ - /* Return 0 since error in the headers means the image is unloadable. */ - zclose(input_file); - return 0; - } - - jselmemmgr(&e_methods); /* select std memory allocation routines */ - - /* Set up default decompression parameters. */ - j_d_defaults(&cinfo, TRUE); - - /* Override default methods */ - dc_methods.d_ui_method_selection = d_ui_method_selection; - dc_methods.read_jpeg_data = read_jpeg_data; - - /* Insert fake SOI into the input buffer --- needed cause we read it above */ - cinfo.next_input_byte = cinfo.input_buffer + MIN_UNGET; - cinfo.next_input_byte[0] = (char) 0xFF; - cinfo.next_input_byte[1] = (char) 0xD8; /* SOI marker */ - cinfo.bytes_in_buffer = 2; - - /* Set up to read a JFIF or baseline-JPEG file. */ - /* This is the only JPEG file format currently supported. */ - jselrjfif(&cinfo); - - /* Here we go! */ - jpeg_decompress(&cinfo); - - /* Don't expect to get here since d_ui_method_selection should do longjmp */ - - zclose(input_file); - return 0; -} - -/* information necessary to extract image data - */ -static struct { - Image *image; - byte *current_row; - unsigned int bytes_per_row; -} ReadInfo; - -static void input_init(cinfo) -compress_info_ptr cinfo; -{ - /* this is done in jpegDump() - */ -} + struct jpeg_decompress_struct cinfo; + struct jpeg_source_mgr src_mgr; + struct jpeg_error_mgr err_mgr; -static void input_term(cinfo) -compress_info_ptr cinfo; -{ - /* there is no shutdown necessary - */ -} + zinput_file = zopen(fullname); /* Open the input file */ + if (zinput_file == NULL) + return 0; -/* this reads a single raster line - */ -static void read_row(cinfo, pixel_rows) - compress_info_ptr cinfo; - JSAMPARRAY pixel_rows; -{ - register int x; - register int pixlen; - register byte *src_row_ptr; - register byte *dest_red_ptr; - register byte *dest_green_ptr; - register byte *dest_blue_ptr; - register Pixel pixval; - register byte mask; + filename = name; /* copy parms to static vars */ - switch (ReadInfo.image->type) { - case IBITMAP: - mask = 0x80; - src_row_ptr = ReadInfo.current_row; - dest_red_ptr = (byte *)pixel_rows[0]; - for (x = 0; x < cinfo->image_width; x++) { - pixval = ((*src_row_ptr & mask) > 0 ? 1 : 0); + jpeg_create_decompress(&cinfo); + src_mgr.init_source = init_source; + src_mgr.fill_input_buffer = fill_input_buffer; + src_mgr.skip_input_data = skip_input_data; + src_mgr.resync_to_restart = resync_to_restart; + src_mgr.term_source = term_source; + cinfo.src = &src_mgr; /* links to method structs */ + err_mgr.error_exit = error_exit; /* supply error-exit routine */ + err_mgr.output_message = output_message; + err_mgr.trace_level = 0; /* default = no tracing */ + err_mgr.num_warnings = 0; /* no warnings emitted yet */ + cinfo.err = jpeg_std_error(&err_mgr); - /* we use the "red" color value under the assumption that they - * are all equal. that can be wrong if the user used -foreground - * or -background. I don't care right now. - */ - *(dest_red_ptr++) = ReadInfo.image->rgb.red[pixval] >> 8; - mask >>= 1; - if (mask == 0) { - mask = 0x80; - src_row_ptr++; - } + src_mgr.bytes_in_buffer = 0; + fill_input_buffer( &cinfo); + /* Quick check to see if file starts with JPEG SOI marker */ + if(jpeg_read_buff[0] != 0xFF || jpeg_read_buff[1] != 0xD8) { + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); + return 0; } - break; - case IRGB: - /* this expands the pixel value into its components - */ - pixlen = ReadInfo.image->pixlen; - src_row_ptr = ReadInfo.current_row; - dest_red_ptr = (byte *)pixel_rows[0]; - dest_green_ptr = (byte *)pixel_rows[1]; - dest_blue_ptr = (byte *)pixel_rows[2]; - for (x = 0; x < cinfo->image_width; x++) { - pixval = memToVal(src_row_ptr, pixlen); - *(dest_red_ptr++) = ReadInfo.image->rgb.red[pixval] >> 8; - *(dest_green_ptr++) = ReadInfo.image->rgb.green[pixval] >> 8; - *(dest_blue_ptr++) = ReadInfo.image->rgb.blue[pixval] >> 8; - src_row_ptr += pixlen; + /* prepare setjmp context for expected exit via longjmp */ + if (setjmp(setjmp_buffer)) { + /* If we get here, the JPEG code has signaled an error. */ + /* Return 0 since error in the headers means the image is unloadable. */ + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); + return 0; } - break; - case ITRUE: - src_row_ptr = ReadInfo.current_row; - dest_red_ptr = (byte *)pixel_rows[0]; - dest_green_ptr = (byte *)pixel_rows[1]; - dest_blue_ptr = (byte *)pixel_rows[2]; - for (x = 0; x < cinfo->image_width; x++) { - *(dest_red_ptr++) = *(src_row_ptr++); - *(dest_green_ptr++) = *(src_row_ptr++); - *(dest_blue_ptr++) = *(src_row_ptr++); - } - break; - } - ReadInfo.current_row += ReadInfo.bytes_per_row; + jpeg_read_header(&cinfo, TRUE); + jpegInfo(&cinfo); + /* Turn off caching beyond this point of the file */ + znocache(zinput_file); + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); + + return 1; } /* - * This routine gets control after the input file header has been read. - * It must determine what output JPEG file format is to be written, - * and make any other compression parameter changes that are desirable. + * Dump Jpeg */ -static void -c_ui_method_selection (cinfo) - compress_info_ptr cinfo; -{ - /* If the input is gray scale, generate a monochrome JPEG file. */ - if (cinfo->in_color_space == CS_GRAYSCALE) - j_monochrome_default(cinfo); - jselwjfif(cinfo); -} - /* parse options passed to jpegDump */ -static void parseOptions(cinfo, options, verbose) - compress_info_ptr cinfo; - char *options; - int verbose; +static void parseOptions(j_compress_ptr cinfo, char *options, int verbose) { char *name, *value; - /* (Re-)initialize the system-dependent error and memory managers. */ - jselerror(cinfo->emethods); /* error/trace message routines */ - jselmemmgr(cinfo->emethods); /* memory allocation routines */ - cinfo->methods->c_ui_method_selection = c_ui_method_selection; - - /* Set up default JPEG parameters. */ - /* Note that default -quality level here need not, and does not, - * match the default scaling for an explicit -qtables argument. - */ - j_c_defaults(cinfo, 75, FALSE); /* default quality level = 75 */ - while (getNextTypeOption(&options, &name, &value) > 0) { if (!strncmp("arithmetic", name, strlen(name))) { /* Use arithmetic coding. */ @@ -524,7 +329,7 @@ /* Force a monochrome JPEG file to be generated. */ if (verbose) printf(" Creating a grayscale/monochrome file.\n"); - j_monochrome_default(cinfo); + jpeg_set_colorspace(cinfo, JCS_GRAYSCALE); } else if (!strncmp("nointerleave", name, strlen(name))) { /* Create noninterleaved file. */ @@ -536,16 +341,18 @@ fprintf(stderr, "jpegDump: sorry, multiple-scan support was not compiled\n"); #endif } + else if (!strncmp("progressive", name, strlen(name))) { + /* Enable progressive JPEG. */ + if (verbose) + printf(" Progressive JPEG.\n"); + jpeg_simple_progression (cinfo); + } else if (!strncmp("optimize", name, strlen(name)) || !strncmp("optimise", name, strlen(name))) { /* Enable entropy parm optimization. */ -#ifdef ENTROPY_OPT_SUPPORTED if (verbose) printf(" Optimizing entropy.\n"); cinfo->optimize_coding = TRUE; -#else - fprintf(stderr, "jpegDump: sorry, entropy optimization was not compiled\n"); -#endif } else if (!strncmp("quality", name, strlen(name))) { /* Quality factor (quantization table scaling factor). */ @@ -561,7 +368,7 @@ */ if (verbose) printf(" Using a quality factor of %d.\n", val); - j_set_quality(cinfo, val, FALSE); + jpeg_set_quality(cinfo, val, FALSE); #if 0 /* Change scale factor in case -qtables is present. */ q_scale_factor = j_quality_scaling(val); @@ -626,74 +433,134 @@ } } -void jpegDump(image, options, file, verbose) - Image *image; - char *options; - char *file; +/* this reads a single raster line + */ + +byte *current_row; +unsigned int bytes_per_row; + +static byte *read_row(Image *image, byte *pixel_rows) { - struct Compress_info_struct cinfo; - struct Compress_methods_struct c_methods; - struct External_methods_struct e_methods; + int x; + int pixlen; + byte *src_row_ptr = current_row; + byte *dest_row_ptr = pixel_rows; + Pixel pixval; + byte mask; - if (verbose) - printf("Dumping JFIF-style JPEG image to %s.\n", file); + switch (image->type) { + case IBITMAP: + mask = 0x80; + for (x = 0; x < image->width; x++) { + pixval = ((*src_row_ptr & mask) > 0 ? 1 : 0); - /* Set up links to method structures. */ - cinfo.methods = &c_methods; - cinfo.emethods = &e_methods; + /* we use the "red" color value under the assumption that they + * are all equal. that can be wrong if the user used -foreground + * or -background. I don't care right now. + */ + *dest_row_ptr++ = image->rgb.red[pixval] >> 8; + mask >>= 1; + if (mask == 0) { + mask = 0x80; + src_row_ptr++; + } + } + break; - /* set up "input methods" that handle "reading" from our image file - */ - cinfo.methods->input_init = input_init; - cinfo.methods->input_term = input_term; - cinfo.methods->get_input_row = read_row; + case IRGB: + /* this expands the pixel value into its components + */ + pixlen = image->pixlen; + for (x = 0; x < image->width; x++) { + pixval = memToVal(src_row_ptr, pixlen); + *dest_row_ptr++ = image->rgb.red[pixval] >> 8; + *dest_row_ptr++ = image->rgb.green[pixval] >> 8; + *dest_row_ptr++ = image->rgb.blue[pixval] >> 8; + src_row_ptr += pixlen; + } + break; - /* set up output file; there is no input file - */ - cinfo.input_file = NULL; - cinfo.output_file = fopen(file, "w"); - if (cinfo.output_file == NULL) { - perror(file); - return; - } + case ITRUE: + return current_row; + break; + } + return pixel_rows; +} - ReadInfo.image = image; - ReadInfo.current_row = image->data; +void jpegDump(Image *image, char *options, char *file, int verbose) +{ + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; + FILE * outfile; /* target file */ + JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */ - /* parse the options the user gave us - */ - parseOptions(&cinfo, options, verbose); + cinfo.err = jpeg_std_error(&jerr); + jpeg_create_compress(&cinfo); - /* set up image information - */ - cinfo.image_width = image->width; - cinfo.image_height = image->height; + if ((outfile = fopen(file, "w")) == NULL) { + perror(file); + return; + } + jpeg_stdio_dest(&cinfo, outfile); - switch (image->type) { - case IBITMAP: - ReadInfo.bytes_per_row = (image->width / 8) + (image->width % 8 ? 1 : 0); - cinfo.input_components = 1; - cinfo.in_color_space = CS_GRAYSCALE; - cinfo.data_precision = 8; - break; - case IRGB: - ReadInfo.bytes_per_row = image->width * image->pixlen; - cinfo.input_components = 3; - cinfo.in_color_space = CS_RGB; - cinfo.data_precision = 8; - break; - case ITRUE: - ReadInfo.bytes_per_row = image->width * image->pixlen; - cinfo.input_components = 3; - cinfo.in_color_space = CS_RGB; - cinfo.data_precision = 8; - break; - } + cinfo.image_width = image->width; + cinfo.image_height = image->height; - /* compress, baby - */ - jpeg_compress(&cinfo); + /* set # of color components per pixel & colospace fo input image */ + switch (image->type) { + case IBITMAP: + bytes_per_row = (image->width / 8) + (image->width % 8 ? 1 : 0); + cinfo.input_components = 1; + cinfo.in_color_space = JCS_GRAYSCALE; + row_pointer[0] = lmalloc( cinfo.image_width * cinfo.input_components); + break; + case IRGB: + bytes_per_row = image->width * image->pixlen; + cinfo.input_components = 3; + cinfo.in_color_space = JCS_RGB; /* colorspace of input image */ + row_pointer[0] = lmalloc( cinfo.image_width * cinfo.input_components); + break; + case ITRUE: + bytes_per_row = image->width * image->pixlen; + cinfo.input_components = 3; + cinfo.in_color_space = JCS_RGB; /* colorspace of input image */ + row_pointer[0] = image->data; + break; + } + /* Now use the library's routine to set default compression parameters. + * (You must set at least cinfo.in_color_space before calling this, + * since the defaults depend on the source color space.) + */ + jpeg_set_defaults(&cinfo); + /* Now you can set any non-default parameters you wish to. + * Here we just illustrate the use of quality (quantization table) scaling: + */ + jpeg_set_quality(&cinfo, 75, TRUE /* limit to baseline-JPEG values */); + if( cinfo.in_color_space == JCS_GRAYSCALE) + jpeg_set_colorspace(&cinfo, JCS_GRAYSCALE); + parseOptions(&cinfo, options, verbose); - fclose(cinfo.output_file); - return; + jpeg_start_compress(&cinfo, TRUE); + + current_row = image->data; + while (cinfo.next_scanline < cinfo.image_height) { + /* jpeg_write_scanlines expects an array of pointers to scanlines. + * Here the array is only one element long, but you could pass + * more than one scanline at a time if that's more convenient. + */ + row_pointer[0] = read_row(image, row_pointer[0]); + (void) jpeg_write_scanlines(&cinfo, row_pointer, 1); + current_row += bytes_per_row; + } + + jpeg_finish_compress(&cinfo); + fclose(outfile); + jpeg_destroy_compress(&cinfo); + if (image->type == IBITMAP || image->type == IRGB) { + lfree( row_pointer[0]); + } } + +#else /* !HAS_JPEG */ +static int unused; +#endif /* !HAS_JPEG */ xloadimage-4.1-popen.patch: zio.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) --- NEW FILE xloadimage-4.1-popen.patch --- --- xloadimage.4.1/zio.c.foo 2005-03-18 16:01:44.000000000 -0500 +++ xloadimage.4.1/zio.c 2005-03-18 16:06:04.000000000 -0500 @@ -142,7 +142,7 @@ char *name; { int a; ZFILE *zf; - char buf[BUFSIZ]; + char *buf; struct filter *filter; debug(("zopen(\"%s\") called\n", name)); @@ -210,9 +210,25 @@ if ((strlen(name) > strlen(filter->extension)) && !strcmp(filter->extension, name + (strlen(name) - strlen(filter->extension)))) { + char *s, *t; + debug(("Filtering image through '%s'\n", filter->filter)); zf->type= ZPIPE; - sprintf(buf, "%s %s", filter->filter, name); + buf = (char *) lmalloc( strlen(filter->filter) +1 + 5 * strlen(name) + 1 +1 ); + strcpy(buf, filter->filter); + s = buf + strlen(buf); + *s++ = '\''; + for (t = name; *t; ++t) { + if ('\'' == *t) { + strcpy(s,"'\"'\"'"); + s += strlen(s); + } else { + *s++ = *t; + } + } + *s++ = '\''; + *s = '\0'; + if (! (zf->stream= popen(buf, "r"))) { lfree((byte *)zf->filename); zf->filename= NULL; xloadimage-format.patch: ./sunraster.c | 3 !!! ./tiff.c | 3 +!! tiff.c | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-), 5 modifications(!) --- NEW FILE xloadimage-format.patch --- *** ./sunraster.c.old 2002-11-06 15:21:10.000000000 +0000 --- ./sunraster.c 2002-11-06 15:21:43.000000000 +0000 *************** *** 240,246 **** case RTIFF: /* sorry, don't even know what these are */ case RIFF: default: ! fprintf(stderr, "%s: Unsupported Sun Rasterfile image type (sorry)\n"); return(NULL); } --- 240,247 ---- case RTIFF: /* sorry, don't even know what these are */ case RIFF: default: ! fprintf(stderr, "%4s: Unsupported Sun Rasterfile image type (sorry)\n", ! header.type); return(NULL); } *** ./tiff.c.old 2002-11-06 15:21:58.000000000 +0000 --- ./tiff.c 2002-11-06 15:23:29.000000000 +0000 *************** *** 217,223 **** compressionName(info->compression)); } if (info->title) ! printf("Titled \"%s\""); printf("\n"); } --- 217,223 ---- compressionName(info->compression)); } if (info->title) ! printf("Titled \"%s\"", info->title); printf("\n"); } *************** *** 404,409 **** --- 404,410 ---- if (info.samplesperpixel != 3) { fprintf(stderr, "%s: Can't handle TIFF RGB images with %d samples per pixel, sorry\n", + fullname, info.samplesperpixel); image = NULL; break; diff -urNad tiff.c tiff.c --- tiff.c 1993-11-08 15:15:42.000000000 +0000 +++ tiff.c 2003-04-03 00:11:28.000000000 +0100 @@ -227,14 +227,14 @@ struct tiff_info info; tiff = is_tiff(fullname, name, &info); - babble(name, info); if (tiff == NULL) return(0); + babble(name, &info); if (tiff == (TIFF *)-1) /* is TIFF, but can't open it */ return(1); TIFFClose(tiff); - babble(fullname, name, info); +/* babble(fullname, name, info); */ return(1); } xloadimage-4.1-buffer.patch: config.c | 6 +++--- faces.c | 12 +++++++++--- imagetypes.c | 2 +- new.c | 13 ++++++++++++- options.c | 13 +++++++++---- packtar.c | 9 ++++++--- 6 files changed, 40 insertions(+), 15 deletions(-) Index: xloadimage-4.1-buffer.patch =================================================================== RCS file: /cvs/dist/rpms/xloadimage/FC-3/xloadimage-4.1-buffer.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xloadimage-4.1-buffer.patch 9 Sep 2004 14:50:24 -0000 1.1 +++ xloadimage-4.1-buffer.patch 18 Mar 2005 21:20:12 -0000 1.2 @@ -49,3 +49,109 @@ fname[strlen(fname) - 1]= '\0'; image->title= dupString(fname); +--- xloadimage.4.1/faces.c.foo 2005-03-18 15:31:12.000000000 -0500 ++++ xloadimage.4.1/faces.c 2005-03-18 15:31:35.000000000 -0500 +@@ -108,9 +108,15 @@ + if (! strcmp(buf, "\n")) + break; + if (!strncmp(buf, "FirstName:", 10)) +- strcpy(fname, buf + 11); ++ { ++ strncpy(fname, buf + 11, BUFSIZ - 1); ++ fname[BUFSIZ - 1] = '\0'; ++ } + else if (!strncmp(buf, "LastName:", 9)) +- strcpy(lname, buf + 10); ++ { ++ strncpy(lname, buf + 10, BUFSIZ - 1); ++ lname[BUFSIZ - 1] = '\0'; ++ } + else if (!strncmp(buf, "Image:", 6)) { + if (sscanf(buf + 7, "%d%d%d", &iw, &ih, &id) != 3) { + printf("%s: Bad Faces Project image\n", fullname); +--- xloadimage.4.1/options.c.foo 1993-10-28 12:23:17.000000000 -0400 ++++ xloadimage.4.1/options.c 2005-03-18 15:31:35.000000000 -0500 +@@ -13,6 +13,9 @@ + #include "image.h" + #include "options.h" + ++#undef MIN ++#define MIN(a, b) (((a) < (b)) ? (a) : (b)) ++ + extern char *ProgramName; + /* options array and definitions. If you add something to this you also + * need to add its OptionId in options.h. +@@ -878,12 +881,13 @@ + */ + p = index(*opt_string, ','); + if (p != NULL) { +- strncpy(option_name, *opt_string, p - *opt_string); +- option_name[p - *opt_string] = '\0'; ++ strncpy(option_name, *opt_string, MIN(BUFSIZ - 1, p - *opt_string)); ++ option_name[MIN(BUFSIZ - 1, p - *opt_string)] = '\0'; + *opt_string = p + 1; /* increment to next option */ + } + else { +- strcpy(option_name, *opt_string); ++ strncpy(option_name, *opt_string, BUFSIZ -1); ++ option_name[BUFSIZ - 1] = '\0'; + *opt_string += strlen(*opt_string); /* increment to end of string */ + } + *name = option_name; +@@ -892,7 +896,8 @@ + */ + p = index(option_name, '='); + if (p != NULL) { +- strcpy(option_value, p + 1); ++ strncpy(option_value, p + 1, BUFSIZ - 1); ++ option_value[BUFSIZ - 1] = '\0'; + *p = '\0'; /* stomp equals sign */ + *value = option_value; + } +--- xloadimage.4.1/packtar.c.foo 2005-03-18 15:31:12.000000000 -0500 ++++ xloadimage.4.1/packtar.c 2005-03-18 15:31:35.000000000 -0500 +@@ -46,9 +46,12 @@ + char new_file[1024]; + char *p; + +- strcpy(new_file, dir); /* target directory */ +- strcat(new_file, "/"); +- strcat(new_file, old_file); ++ strncpy(new_file, dir, 1023); /* target directory */ ++ new_file[1023] = '\0'; ++ strncat(new_file, "/", 1023 - strlen(new_file)); ++ new_file[1023] = '\0'; ++ strncat(new_file, old_file, 1023 - strlen(new_file)); ++ new_file[1023] = '\0'; + + for (p = new_file; p = strchr(p, '/'); p++) { + *p = '\0'; /* stomp directory separator */ +--- xloadimage.4.1/new.c.overflow 2005-03-18 15:55:53.000000000 -0500 ++++ xloadimage.4.1/new.c 2005-03-18 15:57:50.000000000 -0500 +@@ -112,6 +112,17 @@ + lfree((byte *)rgb->blue); + } + ++static unsigned int ovmul(unsigned int a, unsigned int b) ++{ ++ unsigned int r; ++ ++ r = a * b; ++ if (r/a != b) { ++ memoryExhausted(); ++ } ++ return r; ++} ++ + Image *newBitImage(width, height) + unsigned int width, height; + { Image *image; +@@ -128,7 +138,7 @@ + image->height= height; + image->depth= 1; + linelen= (width / 8) + (width % 8 ? 1 : 0); /* thanx johnh at amcc.com */ +- image->data= (unsigned char *)lcalloc(linelen * height); ++ image->data= (unsigned char *)lcalloc(ovmul(linelen,height)); + return(image); + } + xloadimage.4.1-linux.patch: Imakefile | 8 ++++---- misc.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) Index: xloadimage.4.1-linux.patch =================================================================== RCS file: /cvs/dist/rpms/xloadimage/FC-3/xloadimage.4.1-linux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xloadimage.4.1-linux.patch 9 Sep 2004 14:49:38 -0000 1.1 +++ xloadimage.4.1-linux.patch 18 Mar 2005 21:20:12 -0000 1.2 @@ -16,7 +16,7 @@ -JPEG_DEFS = -DHAS_JPEG -I/usr/local/include/jpeg - JPEG_LIB = -L/usr/local/lib/jpeg -ljpeg +JPEG_DEFS = -DHAS_JPEG -+ JPEG_LIB = jpeg/libjpeg.a ++ JPEG_LIB = -ljpeg JPEG_SRC = jpeg.c JPEG_OBJ = jpeg.o #endif @@ -35,13 +35,3 @@ static char *signalName(sig) int sig; ---- xloadimage.4.1/jpeg.c.orig Mon Nov 8 13:36:03 1993 -+++ xloadimage.4.1/jpeg.c Fri Oct 24 13:55:34 1997 -@@ -7,7 +7,6 @@ - */ - - #include "image.h" /* xloadimage declarations */ --#include "jpeg.conf.h" /* definitions used in jpeg directory */ - #include "jpeg/jinclude.h" /* IJG declarations */ - #include /* need setjmp/longjmp */ - Index: xloadimage.spec =================================================================== RCS file: /cvs/dist/rpms/xloadimage/FC-3/xloadimage.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xloadimage.spec 13 Oct 2004 16:56:59 -0000 1.5 +++ xloadimage.spec 18 Mar 2005 21:20:12 -0000 1.6 @@ -1,8 +1,8 @@ Summary: An X Window System based image viewer. Name: xloadimage Version: 4.1 -Release: 32 -Copyright: MIT +Release: 34.FC3 +License: MIT Group: Amusements/Graphics Source: ftp.x.org:/R5contrib/xloadimage.4.1.tar.gz Patch0: xloadimage.4.1-linux.patch @@ -12,6 +12,9 @@ Patch4: xloadimage-4.1-errno.patch Patch5: xloadimage-4.1-arg.patch Patch6: xloadimage-4.1-delay.patch +Patch7: xloadimage-format.patch +Patch8: 01_libjpeg-support.dpatch +Patch9: xloadimage-4.1-popen.patch BuildRoot: /var/tmp/xloadimage-root BuildPrereq: libtiff-devel XFree86-devel @@ -30,16 +33,12 @@ %patch4 -p1 -b .errno %patch5 -p1 -b .arg %patch6 -p1 -b .delay - -cd jpeg -mv Makefile Makefile.orig -ln -s makefile.ansi Makefile +%patch7 -p0 -b .format +%patch8 -p1 -b .jpeg +%patch9 -p1 -b .popen %build xmkmf -cd jpeg -make libjpeg.a -cd .. make %install @@ -67,6 +66,13 @@ /usr/X11R6/man/man1/xloadimage.* %changelog +* Fri Mar 18 2005 Bill Nottingham +- use system libjpeg +- fix quoting in filenames (CAN-2005-0638) + +* Fri Jan 21 2005 Bill Nottingham 4.1-33 +- fix bad use of format strings (#70867, #78481 ) + * Wed Oct 13 2004 Bill Nottingham 4.1-32 - add patch for slideshow (#114689) From fedora-cvs-commits at redhat.com Fri Mar 18 21:20:15 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 16:20:15 -0500 Subject: rpms/xloadimage/FC-2 01_libjpeg-support.dpatch, NONE, 1.1 xloadimage-4.1-delay.patch, NONE, 1.1 xloadimage-4.1-popen.patch, NONE, 1.1 xloadimage-format.patch, NONE, 1.1 xloadimage-4.1-buffer.patch, 1.1, 1.2 xloadimage.4.1-linux.patch, 1.1, 1.2 xloadimage.spec, 1.3, 1.4 Message-ID: <200503182120.j2ILKFKt014181@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xloadimage/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv10829/FC-2 Modified Files: xloadimage-4.1-buffer.patch xloadimage.4.1-linux.patch xloadimage.spec Added Files: 01_libjpeg-support.dpatch xloadimage-4.1-delay.patch xloadimage-4.1-popen.patch xloadimage-format.patch Log Message: use system libjpeg (modify debian patch. no need to autoconf-ify it!) some more minor fixes to strcpy use escape single quotes when used with gunzip & popen (CAN-2005-0638) --- NEW FILE 01_libjpeg-support.dpatch --- diff -urNad 01.xloadimage.tmp/jpeg.c 01.xloadimage/jpeg.c --- 01.xloadimage.tmp/jpeg.c 1993-11-08 18:36:03.000000000 +0000 +++ 01.xloadimage/jpeg.c 2003-04-03 00:13:08.000000000 +0100 @@ -4,509 +4,314 @@ * free JPEG software. See jpeg.README for more information. * * This code is based on example.c from the IJG v4 distribution. + * 1998/08/19: Change for IJG v6.0a. dump Progressive JPEG support. */ #include "image.h" /* xloadimage declarations */ -#include "jpeg.conf.h" /* definitions used in jpeg directory */ -#include "jpeg/jinclude.h" /* IJG declarations */ +#ifdef HAS_JPEG +#include "options.h" +#include +#include #include /* need setjmp/longjmp */ -/* Error-catching routines */ +#undef DEBUG +/* #define DEBUG */ +#undef debug + +#ifdef DEBUG +# define debug(xx) fprintf(stderr,xx) +#else +# define debug(xx) +#endif + +static Image *image; /* xloadimage image being returned */ static char *filename; -static unsigned int verbose; -static unsigned int identify; static jmp_buf setjmp_buffer; /* for return to caller */ -static external_methods_ptr emethods; /* needed for access to message_parm */ +ZFILE * zinput_file; /* tells input routine where to read JPEG */ +static JOCTET jpeg_read_buff[1024 * 16]; -static void -trace_message (msgtext) - char *msgtext; +/* + * source manager + */ +static void init_source( j_decompress_ptr cinfo) { - fprintf(stderr, "jpegLoad: %s - ", filename); - fprintf(stderr, msgtext, - emethods->message_parm[0], emethods->message_parm[1], - emethods->message_parm[2], emethods->message_parm[3], - emethods->message_parm[4], emethods->message_parm[5], - emethods->message_parm[6], emethods->message_parm[7]); - fprintf(stderr, "\n"); /* there is no \n in the format string! */ -} -static void -error_exit (msgtext) - char *msgtext; -{ - trace_message(msgtext); /* report the error message */ - (*emethods->free_all) (); /* clean up memory allocation & temp files */ - longjmp(setjmp_buffer, 1); /* return control to outer routine */ + debug("init_source()"); } - -/* Output-acceptance routines */ - -static Image *image; /* xloadimage image being returned */ -static int rows_put; /* Number of rows copied to image */ - - -static void -output_init (cinfo) - decompress_info_ptr cinfo; -/* Initialize for output */ +static boolean fill_input_buffer( j_decompress_ptr cinfo) { - int i; + struct jpeg_source_mgr *src = cinfo->src; - if (cinfo->out_color_space == CS_GRAYSCALE) { - image = newRGBImage(cinfo->image_width,cinfo->image_height,8); - image->title = dupString(filename); - /* set a linear map */ - for(i=0;i<256;i++) { - *(image->rgb.red + i) = - *(image->rgb.green + i) = - *(image->rgb.blue + i) = i<<8; + debug("fill_input_buffer()"); +#ifdef DEBUG + fprintf( stderr,"fill_input_buffer(): %d ",src->bytes_in_buffer); +#endif + src->next_input_byte = jpeg_read_buff; + src->bytes_in_buffer = zread(zinput_file, + jpeg_read_buff, sizeof(jpeg_read_buff)); + if(src->bytes_in_buffer <= 0){ + WARNMS(cinfo, JWRN_JPEG_EOF); + jpeg_read_buff[0] = 0xFF; + jpeg_read_buff[1] = JPEG_EOI; + src->bytes_in_buffer = 2; } - image->rgb.used = 256; - } else if (cinfo->out_color_space == CS_RGB) { - image = newTrueImage(cinfo->image_width,cinfo->image_height); - image->title = dupString(filename); - } else { - image = NULL; - ERREXIT(cinfo->emethods, "Cannot cope with JPEG image colorspace"); - } - rows_put = 0; + return TRUE; } - -static void -put_color_map (cinfo, num_colors, colormap) - decompress_info_ptr cinfo; - int num_colors; - JSAMPARRAY colormap; -/* Write the color map -- should not be called */ +static void skip_input_data( j_decompress_ptr cinfo, long num_bytes) { - fprintf(stderr, "put_color_map called: there is a bug here somewhere!\n"); -} - + int rest; + struct jpeg_source_mgr *src = cinfo->src; -static void -put_pixel_rows (cinfo, num_rows, pixel_data) - decompress_info_ptr cinfo; - int num_rows; - JSAMPIMAGE pixel_data; -/* Write some rows of output data */ -{ - register unsigned char *bufp; - register JSAMPROW ptr0, ptr1, ptr2; - register long col; - long width = cinfo->image_width; - int row; - - if (cinfo->out_color_space == CS_GRAYSCALE) { - bufp = image->data + rows_put * width; - /* Assume JSAMPLE == chars */ - for (row = 0; row < num_rows; row++) { - bcopy(pixel_data[0][row],bufp,width); - bufp += width; + debug("skip_input_data()"); +#ifdef DEBUG + fprintf(stderr,": %ld,%d ", num_bytes, src->bytes_in_buffer); +#endif + if( num_bytes < 1) return; + rest = src->bytes_in_buffer; + if( num_bytes < rest) { + src->next_input_byte += num_bytes; + src->bytes_in_buffer -= num_bytes;; + return; } - } else { - bufp = image->data + rows_put * width * 3; - for (row = 0; row < num_rows; row++) { - ptr0 = pixel_data[0][row]; - ptr1 = pixel_data[1][row]; - ptr2 = pixel_data[2][row]; - for (col = width; col > 0; col--) { - *bufp++ = *ptr0++; - *bufp++ = *ptr1++; - *bufp++ = *ptr2++; - } + num_bytes -= rest; + while( num_bytes--) { + zgetc(zinput_file); } - } - rows_put += num_rows; + fill_input_buffer(cinfo); } - -static void -output_term (cinfo) - decompress_info_ptr cinfo; -/* Finish up at the end of the output */ +static boolean resync_to_restart( j_decompress_ptr cinfo, int desired) { - /* No work here */ + return jpeg_resync_to_restart( cinfo, desired); } - -/* Input-file-reading routine */ - - -static ZFILE * input_file; /* tells input routine where to read JPEG */ - - -static int -read_jpeg_data (cinfo) - decompress_info_ptr cinfo; +static void term_source( j_decompress_ptr cinfo) { - cinfo->next_input_byte = cinfo->input_buffer + MIN_UNGET; + debug("term_source()"); +} - cinfo->bytes_in_buffer = zread(input_file, - (byte *)cinfo->next_input_byte, - JPEG_BUF_SIZE); - - if (cinfo->bytes_in_buffer <= 0) { - WARNMS(cinfo->emethods, "Premature EOF in JPEG file"); - cinfo->next_input_byte[0] = (char) 0xFF; - cinfo->next_input_byte[1] = (char) 0xD9; /* EOI marker */ - cinfo->bytes_in_buffer = 2; - } +/* + * error manager + */ +static void +output_message ( j_common_ptr cominfo) +{ + char buf[JMSG_LENGTH_MAX]; - return JGETC(cinfo); + (*cominfo->err->format_message)(cominfo, buf); + fprintf(stderr, "jpegLoad: %s - %s\n", filename, buf); } -/* Required control-hook routine */ +static void error_exit (j_common_ptr cominfo) +{ + output_message( cominfo); + longjmp(setjmp_buffer, 1); /* return control to outer routine */ +} static void -d_ui_method_selection (cinfo) - decompress_info_ptr cinfo; +jpegInfo (cinfo) + j_decompress_ptr cinfo; { - /* if grayscale input, force grayscale output; */ - /* else leave the output colorspace as set by main routine. */ - if (cinfo->jpeg_color_space == CS_GRAYSCALE) - cinfo->out_color_space = CS_GRAYSCALE; - - /* Create display of image parameters */ - if (verbose) { + /* Create display of image parameters */ printf("%s is a %dx%d JPEG image, color space ", filename, cinfo->image_width, cinfo->image_height); switch (cinfo->jpeg_color_space) { - case CS_UNKNOWN: - printf("Unknown"); - break; - case CS_GRAYSCALE: - printf("Grayscale"); - break; - case CS_RGB: - printf("RGB"); - break; - case CS_YCbCr: - printf("YCbCr"); - break; - case CS_YIQ: - printf("YIQ"); - break; - case CS_CMYK: - printf("CMYK"); - break; + case JCS_GRAYSCALE: + printf("Grayscale"); + break; + case JCS_RGB: + printf("RGB"); + break; + case JCS_YCbCr: + printf("YCbCr"); + break; + case JCS_CMYK: + printf("CMYK"); + break; + case JCS_YCCK: + printf("YCCK"); + break; + case JCS_UNKNOWN: + default: + printf("Unknown"); + break; } printf(", %d comp%s,", cinfo->num_components, - cinfo->num_components ? "s." : "."); + (cinfo->num_components - 1) ? "s" : ""); + if (cinfo->progressive_mode) + printf(" Progressive,"); if (cinfo->arith_code) - printf(" Arithmetic coding\n"); + printf(" Arithmetic coding.\n"); else - printf(" Huffman coding\n"); - } - - /* Turn off caching beyond this point of the file */ - znocache(input_file); - - /* If we only wanted to identify the image, abort now */ - if (identify) { - (*emethods->free_all) (); /* clean up memory allocation & temp files */ - longjmp(setjmp_buffer, 10); /* return control with success code */ - } - - /* select output routines */ - cinfo->methods->output_init = output_init; - cinfo->methods->put_color_map = put_color_map; - cinfo->methods->put_pixel_rows = put_pixel_rows; - cinfo->methods->output_term = output_term; + printf(" Huffman coding.\n"); } /* Main control routine for loading */ - Image * -jpegLoad (fullname, name, vbose) +jpegLoad (fullname, name, verbose) char *fullname, *name; - unsigned int vbose; + unsigned int verbose; { - struct Decompress_info_struct cinfo; - struct Decompress_methods_struct dc_methods; - struct External_methods_struct e_methods; - - input_file = zopen(fullname); /* Open the input file */ - if (input_file == NULL) - return NULL; - - /* Quick check to see if file starts with JPEG SOI marker */ - if (zgetc(input_file) != 0xFF || zgetc(input_file) != 0xD8) { - zclose(input_file); - return NULL; - } - - filename = name; /* copy parms to static vars */ - verbose = vbose; - identify = 0; - - image = NULL; /* in case we fail before creating image */ - - cinfo.methods = &dc_methods; /* links to method structs */ - cinfo.emethods = &e_methods; - emethods = &e_methods; /* save struct addr for possible access */ - e_methods.error_exit = error_exit; /* supply error-exit routine */ - e_methods.trace_message = trace_message; /* supply trace-message routine */ - e_methods.trace_level = 0; /* default = no tracing */ - e_methods.num_warnings = 0; /* no warnings emitted yet */ - e_methods.first_warning_level = 0; /* display first corrupt-data warning */ - e_methods.more_warning_level = 3; /* but suppress additional ones */ - - /* prepare setjmp context for possible exit from error_exit */ - if (setjmp(setjmp_buffer)) { - /* If we get here, the JPEG code has signaled an error. */ - /* Return as much of the image as we could get. */ - zclose(input_file); - return image; - } + struct jpeg_decompress_struct cinfo; + struct jpeg_source_mgr src_mgr; + struct jpeg_error_mgr err_mgr; + int i, row_stride; + byte *bufp; - jselmemmgr(&e_methods); /* select std memory allocation routines */ + zinput_file = zopen(fullname); /* Open the input file */ + if (zinput_file == NULL) + return NULL; + filename = name; /* copy parms to static vars */ + image = NULL; /* in case we fail before creating image */ - /* Set up default decompression parameters. */ - j_d_defaults(&cinfo, TRUE); + jpeg_create_decompress(&cinfo); + src_mgr.init_source = init_source; + src_mgr.fill_input_buffer = fill_input_buffer; + src_mgr.skip_input_data = skip_input_data; + src_mgr.resync_to_restart = resync_to_restart; + src_mgr.term_source = term_source; + cinfo.src = &src_mgr; /* links to method structs */ + err_mgr.error_exit = error_exit; /* supply error-exit routine */ + err_mgr.output_message = output_message; + err_mgr.trace_level = 0; /* default = no tracing */ + err_mgr.num_warnings = 0; /* no warnings emitted yet */ + cinfo.err = jpeg_std_error(&err_mgr); - /* Override default methods */ - dc_methods.d_ui_method_selection = d_ui_method_selection; - dc_methods.read_jpeg_data = read_jpeg_data; + src_mgr.bytes_in_buffer = 0; + fill_input_buffer( &cinfo); + /* Quick check to see if file starts with JPEG SOI marker */ + if(jpeg_read_buff[0] != 0xFF || jpeg_read_buff[1] != 0xD8) { + zclose(zinput_file); + return NULL; + } - /* Insert fake SOI into the input buffer --- needed cause we read it above */ - cinfo.next_input_byte = cinfo.input_buffer + MIN_UNGET; - cinfo.next_input_byte[0] = (char) 0xFF; - cinfo.next_input_byte[1] = (char) 0xD8; /* SOI marker */ - cinfo.bytes_in_buffer = 2; + /* prepare setjmp context for possible exit from error_exit */ + if (setjmp(setjmp_buffer)) { + /* If we get here, the JPEG code has signaled an error. */ + /* Return as much of the image as we could get. */ + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); + return image; + } + + jpeg_read_header(&cinfo, TRUE); + if (verbose) jpegInfo(&cinfo); + /* Turn off caching beyond this point of the file */ + znocache(zinput_file); + jpeg_start_decompress(&cinfo); - /* Set up to read a JFIF or baseline-JPEG file. */ - /* This is the only JPEG file format currently supported. */ - jselrjfif(&cinfo); + switch (cinfo.out_color_space) { + case JCS_GRAYSCALE: + image = newRGBImage(cinfo.image_width,cinfo.image_height,8); + image->title = dupString(filename); + /* set a linear map */ + for(i=0;i<256;i++) { + *(image->rgb.red + i) = + *(image->rgb.green + i) = + *(image->rgb.blue + i) = i << 8; + } + image->rgb.used = 256; + break; + case JCS_RGB: + image = newTrueImage(cinfo.image_width,cinfo.image_height); + image->title = dupString(filename); + break; + default: + image = NULL; + ERREXITS(&cinfo, 1, "Cannot cope with JPEG image colorspace"); + } - /* Here we go! */ - jpeg_decompress(&cinfo); + row_stride = cinfo.output_width * cinfo.output_components; + bufp = image->data; + while (cinfo.output_scanline < cinfo.output_height) { + jpeg_read_scanlines(&cinfo, &bufp, 1); + bufp += row_stride; + } - zclose(input_file); /* Done, close the input file */ + jpeg_finish_decompress(&cinfo); + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); /* Done, close the input file */ - return image; + return image; } -/* Main control routine for identifying JPEG without loading */ - - +/* + Main control routine for identifying JPEG without loading + return 0: Not jpeg file. + */ int jpegIdent (fullname, name) char *fullname, *name; { - struct Decompress_info_struct cinfo; - struct Decompress_methods_struct dc_methods; - struct External_methods_struct e_methods; - - input_file = zopen(fullname); /* Open the input file */ - if (input_file == NULL) - return 0; - - /* Quick check to see if file starts with JPEG SOI marker */ - if (zgetc(input_file) != 0xFF || zgetc(input_file) != 0xD8) { - zclose(input_file); - return 0; - } - - /* We want to find and display the image dimensions, and also - * verify that the header markers are not corrupt. To do this, - * we fire up the JPEG decoder as normal, but when d_ui_method_selection - * is called, we abort the process by longjmp'ing back here. - * This works nicely since the headers are all read at that point. - */ - - filename = name; /* copy parms to static vars */ - verbose = 1; - identify = 1; - - cinfo.methods = &dc_methods; /* links to method structs */ - cinfo.emethods = &e_methods; - emethods = &e_methods; /* save struct addr for possible access */ - e_methods.error_exit = error_exit; /* supply error-exit routine */ - e_methods.trace_message = trace_message; /* supply trace-message routine */ - e_methods.trace_level = 0; /* default = no tracing */ - e_methods.num_warnings = 0; /* no warnings emitted yet */ - e_methods.first_warning_level = 0; /* display first corrupt-data warning */ - e_methods.more_warning_level = 3; /* but suppress additional ones */ - - /* prepare setjmp context for expected exit via longjmp */ - switch (setjmp(setjmp_buffer)) { - case 0: - /* First time thru, keep going */ - break; - case 10: - /* Successful exit from d_ui_method_selection; return A-OK */ - zclose(input_file); - return 1; - default: - /* If we get here, the JPEG code has signaled an error. */ - /* Return 0 since error in the headers means the image is unloadable. */ - zclose(input_file); - return 0; - } - - jselmemmgr(&e_methods); /* select std memory allocation routines */ - - /* Set up default decompression parameters. */ - j_d_defaults(&cinfo, TRUE); - - /* Override default methods */ - dc_methods.d_ui_method_selection = d_ui_method_selection; - dc_methods.read_jpeg_data = read_jpeg_data; - - /* Insert fake SOI into the input buffer --- needed cause we read it above */ - cinfo.next_input_byte = cinfo.input_buffer + MIN_UNGET; - cinfo.next_input_byte[0] = (char) 0xFF; - cinfo.next_input_byte[1] = (char) 0xD8; /* SOI marker */ - cinfo.bytes_in_buffer = 2; - - /* Set up to read a JFIF or baseline-JPEG file. */ - /* This is the only JPEG file format currently supported. */ - jselrjfif(&cinfo); - - /* Here we go! */ - jpeg_decompress(&cinfo); - - /* Don't expect to get here since d_ui_method_selection should do longjmp */ - - zclose(input_file); - return 0; -} - -/* information necessary to extract image data - */ -static struct { - Image *image; - byte *current_row; - unsigned int bytes_per_row; -} ReadInfo; - -static void input_init(cinfo) -compress_info_ptr cinfo; -{ - /* this is done in jpegDump() - */ -} + struct jpeg_decompress_struct cinfo; + struct jpeg_source_mgr src_mgr; + struct jpeg_error_mgr err_mgr; -static void input_term(cinfo) -compress_info_ptr cinfo; -{ - /* there is no shutdown necessary - */ -} + zinput_file = zopen(fullname); /* Open the input file */ + if (zinput_file == NULL) + return 0; -/* this reads a single raster line - */ -static void read_row(cinfo, pixel_rows) - compress_info_ptr cinfo; - JSAMPARRAY pixel_rows; -{ - register int x; - register int pixlen; - register byte *src_row_ptr; - register byte *dest_red_ptr; - register byte *dest_green_ptr; - register byte *dest_blue_ptr; - register Pixel pixval; - register byte mask; + filename = name; /* copy parms to static vars */ - switch (ReadInfo.image->type) { - case IBITMAP: - mask = 0x80; - src_row_ptr = ReadInfo.current_row; - dest_red_ptr = (byte *)pixel_rows[0]; - for (x = 0; x < cinfo->image_width; x++) { - pixval = ((*src_row_ptr & mask) > 0 ? 1 : 0); + jpeg_create_decompress(&cinfo); + src_mgr.init_source = init_source; + src_mgr.fill_input_buffer = fill_input_buffer; + src_mgr.skip_input_data = skip_input_data; + src_mgr.resync_to_restart = resync_to_restart; + src_mgr.term_source = term_source; + cinfo.src = &src_mgr; /* links to method structs */ + err_mgr.error_exit = error_exit; /* supply error-exit routine */ + err_mgr.output_message = output_message; + err_mgr.trace_level = 0; /* default = no tracing */ + err_mgr.num_warnings = 0; /* no warnings emitted yet */ + cinfo.err = jpeg_std_error(&err_mgr); - /* we use the "red" color value under the assumption that they - * are all equal. that can be wrong if the user used -foreground - * or -background. I don't care right now. - */ - *(dest_red_ptr++) = ReadInfo.image->rgb.red[pixval] >> 8; - mask >>= 1; - if (mask == 0) { - mask = 0x80; - src_row_ptr++; - } + src_mgr.bytes_in_buffer = 0; + fill_input_buffer( &cinfo); + /* Quick check to see if file starts with JPEG SOI marker */ + if(jpeg_read_buff[0] != 0xFF || jpeg_read_buff[1] != 0xD8) { + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); + return 0; } - break; - case IRGB: - /* this expands the pixel value into its components - */ - pixlen = ReadInfo.image->pixlen; - src_row_ptr = ReadInfo.current_row; - dest_red_ptr = (byte *)pixel_rows[0]; - dest_green_ptr = (byte *)pixel_rows[1]; - dest_blue_ptr = (byte *)pixel_rows[2]; - for (x = 0; x < cinfo->image_width; x++) { - pixval = memToVal(src_row_ptr, pixlen); - *(dest_red_ptr++) = ReadInfo.image->rgb.red[pixval] >> 8; - *(dest_green_ptr++) = ReadInfo.image->rgb.green[pixval] >> 8; - *(dest_blue_ptr++) = ReadInfo.image->rgb.blue[pixval] >> 8; - src_row_ptr += pixlen; + /* prepare setjmp context for expected exit via longjmp */ + if (setjmp(setjmp_buffer)) { + /* If we get here, the JPEG code has signaled an error. */ + /* Return 0 since error in the headers means the image is unloadable. */ + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); + return 0; } - break; - case ITRUE: - src_row_ptr = ReadInfo.current_row; - dest_red_ptr = (byte *)pixel_rows[0]; - dest_green_ptr = (byte *)pixel_rows[1]; - dest_blue_ptr = (byte *)pixel_rows[2]; - for (x = 0; x < cinfo->image_width; x++) { - *(dest_red_ptr++) = *(src_row_ptr++); - *(dest_green_ptr++) = *(src_row_ptr++); - *(dest_blue_ptr++) = *(src_row_ptr++); - } - break; - } - ReadInfo.current_row += ReadInfo.bytes_per_row; + jpeg_read_header(&cinfo, TRUE); + jpegInfo(&cinfo); + /* Turn off caching beyond this point of the file */ + znocache(zinput_file); + jpeg_destroy_decompress(&cinfo); + zclose(zinput_file); + + return 1; } /* - * This routine gets control after the input file header has been read. - * It must determine what output JPEG file format is to be written, - * and make any other compression parameter changes that are desirable. + * Dump Jpeg */ -static void -c_ui_method_selection (cinfo) - compress_info_ptr cinfo; -{ - /* If the input is gray scale, generate a monochrome JPEG file. */ - if (cinfo->in_color_space == CS_GRAYSCALE) - j_monochrome_default(cinfo); - jselwjfif(cinfo); -} - /* parse options passed to jpegDump */ -static void parseOptions(cinfo, options, verbose) - compress_info_ptr cinfo; - char *options; - int verbose; +static void parseOptions(j_compress_ptr cinfo, char *options, int verbose) { char *name, *value; - /* (Re-)initialize the system-dependent error and memory managers. */ - jselerror(cinfo->emethods); /* error/trace message routines */ - jselmemmgr(cinfo->emethods); /* memory allocation routines */ - cinfo->methods->c_ui_method_selection = c_ui_method_selection; - - /* Set up default JPEG parameters. */ - /* Note that default -quality level here need not, and does not, - * match the default scaling for an explicit -qtables argument. - */ - j_c_defaults(cinfo, 75, FALSE); /* default quality level = 75 */ - while (getNextTypeOption(&options, &name, &value) > 0) { if (!strncmp("arithmetic", name, strlen(name))) { /* Use arithmetic coding. */ @@ -524,7 +329,7 @@ /* Force a monochrome JPEG file to be generated. */ if (verbose) printf(" Creating a grayscale/monochrome file.\n"); - j_monochrome_default(cinfo); + jpeg_set_colorspace(cinfo, JCS_GRAYSCALE); } else if (!strncmp("nointerleave", name, strlen(name))) { /* Create noninterleaved file. */ @@ -536,16 +341,18 @@ fprintf(stderr, "jpegDump: sorry, multiple-scan support was not compiled\n"); #endif } + else if (!strncmp("progressive", name, strlen(name))) { + /* Enable progressive JPEG. */ + if (verbose) + printf(" Progressive JPEG.\n"); + jpeg_simple_progression (cinfo); + } else if (!strncmp("optimize", name, strlen(name)) || !strncmp("optimise", name, strlen(name))) { /* Enable entropy parm optimization. */ -#ifdef ENTROPY_OPT_SUPPORTED if (verbose) printf(" Optimizing entropy.\n"); cinfo->optimize_coding = TRUE; -#else - fprintf(stderr, "jpegDump: sorry, entropy optimization was not compiled\n"); -#endif } else if (!strncmp("quality", name, strlen(name))) { /* Quality factor (quantization table scaling factor). */ @@ -561,7 +368,7 @@ */ if (verbose) printf(" Using a quality factor of %d.\n", val); - j_set_quality(cinfo, val, FALSE); + jpeg_set_quality(cinfo, val, FALSE); #if 0 /* Change scale factor in case -qtables is present. */ q_scale_factor = j_quality_scaling(val); @@ -626,74 +433,134 @@ } } -void jpegDump(image, options, file, verbose) - Image *image; - char *options; - char *file; +/* this reads a single raster line + */ + +byte *current_row; +unsigned int bytes_per_row; + +static byte *read_row(Image *image, byte *pixel_rows) { - struct Compress_info_struct cinfo; - struct Compress_methods_struct c_methods; - struct External_methods_struct e_methods; + int x; + int pixlen; + byte *src_row_ptr = current_row; + byte *dest_row_ptr = pixel_rows; + Pixel pixval; + byte mask; - if (verbose) - printf("Dumping JFIF-style JPEG image to %s.\n", file); + switch (image->type) { + case IBITMAP: + mask = 0x80; + for (x = 0; x < image->width; x++) { + pixval = ((*src_row_ptr & mask) > 0 ? 1 : 0); - /* Set up links to method structures. */ - cinfo.methods = &c_methods; - cinfo.emethods = &e_methods; + /* we use the "red" color value under the assumption that they + * are all equal. that can be wrong if the user used -foreground + * or -background. I don't care right now. + */ + *dest_row_ptr++ = image->rgb.red[pixval] >> 8; + mask >>= 1; + if (mask == 0) { + mask = 0x80; + src_row_ptr++; + } + } + break; - /* set up "input methods" that handle "reading" from our image file - */ - cinfo.methods->input_init = input_init; - cinfo.methods->input_term = input_term; - cinfo.methods->get_input_row = read_row; + case IRGB: + /* this expands the pixel value into its components + */ + pixlen = image->pixlen; + for (x = 0; x < image->width; x++) { + pixval = memToVal(src_row_ptr, pixlen); + *dest_row_ptr++ = image->rgb.red[pixval] >> 8; + *dest_row_ptr++ = image->rgb.green[pixval] >> 8; + *dest_row_ptr++ = image->rgb.blue[pixval] >> 8; + src_row_ptr += pixlen; + } + break; - /* set up output file; there is no input file - */ - cinfo.input_file = NULL; - cinfo.output_file = fopen(file, "w"); - if (cinfo.output_file == NULL) { - perror(file); - return; - } + case ITRUE: + return current_row; + break; + } + return pixel_rows; +} - ReadInfo.image = image; - ReadInfo.current_row = image->data; +void jpegDump(Image *image, char *options, char *file, int verbose) +{ + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; + FILE * outfile; /* target file */ + JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */ - /* parse the options the user gave us - */ - parseOptions(&cinfo, options, verbose); + cinfo.err = jpeg_std_error(&jerr); + jpeg_create_compress(&cinfo); - /* set up image information - */ - cinfo.image_width = image->width; - cinfo.image_height = image->height; + if ((outfile = fopen(file, "w")) == NULL) { + perror(file); + return; + } + jpeg_stdio_dest(&cinfo, outfile); - switch (image->type) { - case IBITMAP: - ReadInfo.bytes_per_row = (image->width / 8) + (image->width % 8 ? 1 : 0); - cinfo.input_components = 1; - cinfo.in_color_space = CS_GRAYSCALE; - cinfo.data_precision = 8; - break; - case IRGB: - ReadInfo.bytes_per_row = image->width * image->pixlen; - cinfo.input_components = 3; - cinfo.in_color_space = CS_RGB; - cinfo.data_precision = 8; - break; - case ITRUE: - ReadInfo.bytes_per_row = image->width * image->pixlen; - cinfo.input_components = 3; - cinfo.in_color_space = CS_RGB; - cinfo.data_precision = 8; - break; - } + cinfo.image_width = image->width; + cinfo.image_height = image->height; - /* compress, baby - */ - jpeg_compress(&cinfo); + /* set # of color components per pixel & colospace fo input image */ + switch (image->type) { + case IBITMAP: + bytes_per_row = (image->width / 8) + (image->width % 8 ? 1 : 0); + cinfo.input_components = 1; + cinfo.in_color_space = JCS_GRAYSCALE; + row_pointer[0] = lmalloc( cinfo.image_width * cinfo.input_components); + break; + case IRGB: + bytes_per_row = image->width * image->pixlen; + cinfo.input_components = 3; + cinfo.in_color_space = JCS_RGB; /* colorspace of input image */ + row_pointer[0] = lmalloc( cinfo.image_width * cinfo.input_components); + break; + case ITRUE: + bytes_per_row = image->width * image->pixlen; + cinfo.input_components = 3; + cinfo.in_color_space = JCS_RGB; /* colorspace of input image */ + row_pointer[0] = image->data; + break; + } + /* Now use the library's routine to set default compression parameters. + * (You must set at least cinfo.in_color_space before calling this, + * since the defaults depend on the source color space.) + */ + jpeg_set_defaults(&cinfo); + /* Now you can set any non-default parameters you wish to. + * Here we just illustrate the use of quality (quantization table) scaling: + */ + jpeg_set_quality(&cinfo, 75, TRUE /* limit to baseline-JPEG values */); + if( cinfo.in_color_space == JCS_GRAYSCALE) + jpeg_set_colorspace(&cinfo, JCS_GRAYSCALE); + parseOptions(&cinfo, options, verbose); - fclose(cinfo.output_file); - return; + jpeg_start_compress(&cinfo, TRUE); + + current_row = image->data; + while (cinfo.next_scanline < cinfo.image_height) { + /* jpeg_write_scanlines expects an array of pointers to scanlines. + * Here the array is only one element long, but you could pass + * more than one scanline at a time if that's more convenient. + */ + row_pointer[0] = read_row(image, row_pointer[0]); + (void) jpeg_write_scanlines(&cinfo, row_pointer, 1); + current_row += bytes_per_row; + } + + jpeg_finish_compress(&cinfo); + fclose(outfile); + jpeg_destroy_compress(&cinfo); + if (image->type == IBITMAP || image->type == IRGB) { + lfree( row_pointer[0]); + } } + +#else /* !HAS_JPEG */ +static int unused; +#endif /* !HAS_JPEG */ xloadimage-4.1-delay.patch: Imakefile | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletion(-) --- NEW FILE xloadimage-4.1-delay.patch --- --- xloadimage.4.1/Imakefile.delay 2004-01-31 16:16:26.000000000 +0100 +++ xloadimage.4.1/Imakefile 2004-01-31 16:17:48.000000000 +0100 @@ -21,6 +21,17 @@ #define HAS_TIFF #define HAS_JPEG +#define HAS_POLL +#define HAS_SELECT_INCLUDE + +#ifdef HAS_POLL +POLL_DEFS = -DHAS_POLL +#endif + +#ifdef HAS_SELECT_INCLUDE +SELECT_DEFS = -DHAS_SELECT_INCLUDE +#endif + #ifdef HAS_TIFF TIFF_DEFS = -DHAS_TIFF TIFF_LIB = -ltiff @@ -35,7 +46,7 @@ JPEG_OBJ = jpeg.o #endif - EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) + EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(POLL_DEFS) $(SELECT_DEFS) LOCAL_LIBRARIES = $(TIFF_LIB) $(JPEG_LIB) $(XLIB) SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c xloadimage.c $(TIFF_SRC) $(JPEG_SRC) xloadimage-4.1-popen.patch: zio.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) --- NEW FILE xloadimage-4.1-popen.patch --- --- xloadimage.4.1/zio.c.foo 2005-03-18 16:01:44.000000000 -0500 +++ xloadimage.4.1/zio.c 2005-03-18 16:06:04.000000000 -0500 @@ -142,7 +142,7 @@ char *name; { int a; ZFILE *zf; - char buf[BUFSIZ]; + char *buf; struct filter *filter; debug(("zopen(\"%s\") called\n", name)); @@ -210,9 +210,25 @@ if ((strlen(name) > strlen(filter->extension)) && !strcmp(filter->extension, name + (strlen(name) - strlen(filter->extension)))) { + char *s, *t; + debug(("Filtering image through '%s'\n", filter->filter)); zf->type= ZPIPE; - sprintf(buf, "%s %s", filter->filter, name); + buf = (char *) lmalloc( strlen(filter->filter) +1 + 5 * strlen(name) + 1 +1 ); + strcpy(buf, filter->filter); + s = buf + strlen(buf); + *s++ = '\''; + for (t = name; *t; ++t) { + if ('\'' == *t) { + strcpy(s,"'\"'\"'"); + s += strlen(s); + } else { + *s++ = *t; + } + } + *s++ = '\''; + *s = '\0'; + if (! (zf->stream= popen(buf, "r"))) { lfree((byte *)zf->filename); zf->filename= NULL; xloadimage-format.patch: ./sunraster.c | 3 !!! ./tiff.c | 3 +!! tiff.c | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-), 5 modifications(!) --- NEW FILE xloadimage-format.patch --- *** ./sunraster.c.old 2002-11-06 15:21:10.000000000 +0000 --- ./sunraster.c 2002-11-06 15:21:43.000000000 +0000 *************** *** 240,246 **** case RTIFF: /* sorry, don't even know what these are */ case RIFF: default: ! fprintf(stderr, "%s: Unsupported Sun Rasterfile image type (sorry)\n"); return(NULL); } --- 240,247 ---- case RTIFF: /* sorry, don't even know what these are */ case RIFF: default: ! fprintf(stderr, "%4s: Unsupported Sun Rasterfile image type (sorry)\n", ! header.type); return(NULL); } *** ./tiff.c.old 2002-11-06 15:21:58.000000000 +0000 --- ./tiff.c 2002-11-06 15:23:29.000000000 +0000 *************** *** 217,223 **** compressionName(info->compression)); } if (info->title) ! printf("Titled \"%s\""); printf("\n"); } --- 217,223 ---- compressionName(info->compression)); } if (info->title) ! printf("Titled \"%s\"", info->title); printf("\n"); } *************** *** 404,409 **** --- 404,410 ---- if (info.samplesperpixel != 3) { fprintf(stderr, "%s: Can't handle TIFF RGB images with %d samples per pixel, sorry\n", + fullname, info.samplesperpixel); image = NULL; break; diff -urNad tiff.c tiff.c --- tiff.c 1993-11-08 15:15:42.000000000 +0000 +++ tiff.c 2003-04-03 00:11:28.000000000 +0100 @@ -227,14 +227,14 @@ struct tiff_info info; tiff = is_tiff(fullname, name, &info); - babble(name, info); if (tiff == NULL) return(0); + babble(name, &info); if (tiff == (TIFF *)-1) /* is TIFF, but can't open it */ return(1); TIFFClose(tiff); - babble(fullname, name, info); +/* babble(fullname, name, info); */ return(1); } xloadimage-4.1-buffer.patch: config.c | 6 +++--- faces.c | 12 +++++++++--- imagetypes.c | 2 +- new.c | 13 ++++++++++++- options.c | 13 +++++++++---- packtar.c | 9 ++++++--- 6 files changed, 40 insertions(+), 15 deletions(-) Index: xloadimage-4.1-buffer.patch =================================================================== RCS file: /cvs/dist/rpms/xloadimage/FC-2/xloadimage-4.1-buffer.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xloadimage-4.1-buffer.patch 9 Sep 2004 14:50:24 -0000 1.1 +++ xloadimage-4.1-buffer.patch 18 Mar 2005 21:20:12 -0000 1.2 @@ -49,3 +49,109 @@ fname[strlen(fname) - 1]= '\0'; image->title= dupString(fname); +--- xloadimage.4.1/faces.c.foo 2005-03-18 15:31:12.000000000 -0500 ++++ xloadimage.4.1/faces.c 2005-03-18 15:31:35.000000000 -0500 +@@ -108,9 +108,15 @@ + if (! strcmp(buf, "\n")) + break; + if (!strncmp(buf, "FirstName:", 10)) +- strcpy(fname, buf + 11); ++ { ++ strncpy(fname, buf + 11, BUFSIZ - 1); ++ fname[BUFSIZ - 1] = '\0'; ++ } + else if (!strncmp(buf, "LastName:", 9)) +- strcpy(lname, buf + 10); ++ { ++ strncpy(lname, buf + 10, BUFSIZ - 1); ++ lname[BUFSIZ - 1] = '\0'; ++ } + else if (!strncmp(buf, "Image:", 6)) { + if (sscanf(buf + 7, "%d%d%d", &iw, &ih, &id) != 3) { + printf("%s: Bad Faces Project image\n", fullname); +--- xloadimage.4.1/options.c.foo 1993-10-28 12:23:17.000000000 -0400 ++++ xloadimage.4.1/options.c 2005-03-18 15:31:35.000000000 -0500 +@@ -13,6 +13,9 @@ + #include "image.h" + #include "options.h" + ++#undef MIN ++#define MIN(a, b) (((a) < (b)) ? (a) : (b)) ++ + extern char *ProgramName; + /* options array and definitions. If you add something to this you also + * need to add its OptionId in options.h. +@@ -878,12 +881,13 @@ + */ + p = index(*opt_string, ','); + if (p != NULL) { +- strncpy(option_name, *opt_string, p - *opt_string); +- option_name[p - *opt_string] = '\0'; ++ strncpy(option_name, *opt_string, MIN(BUFSIZ - 1, p - *opt_string)); ++ option_name[MIN(BUFSIZ - 1, p - *opt_string)] = '\0'; + *opt_string = p + 1; /* increment to next option */ + } + else { +- strcpy(option_name, *opt_string); ++ strncpy(option_name, *opt_string, BUFSIZ -1); ++ option_name[BUFSIZ - 1] = '\0'; + *opt_string += strlen(*opt_string); /* increment to end of string */ + } + *name = option_name; +@@ -892,7 +896,8 @@ + */ + p = index(option_name, '='); + if (p != NULL) { +- strcpy(option_value, p + 1); ++ strncpy(option_value, p + 1, BUFSIZ - 1); ++ option_value[BUFSIZ - 1] = '\0'; + *p = '\0'; /* stomp equals sign */ + *value = option_value; + } +--- xloadimage.4.1/packtar.c.foo 2005-03-18 15:31:12.000000000 -0500 ++++ xloadimage.4.1/packtar.c 2005-03-18 15:31:35.000000000 -0500 +@@ -46,9 +46,12 @@ + char new_file[1024]; + char *p; + +- strcpy(new_file, dir); /* target directory */ +- strcat(new_file, "/"); +- strcat(new_file, old_file); ++ strncpy(new_file, dir, 1023); /* target directory */ ++ new_file[1023] = '\0'; ++ strncat(new_file, "/", 1023 - strlen(new_file)); ++ new_file[1023] = '\0'; ++ strncat(new_file, old_file, 1023 - strlen(new_file)); ++ new_file[1023] = '\0'; + + for (p = new_file; p = strchr(p, '/'); p++) { + *p = '\0'; /* stomp directory separator */ +--- xloadimage.4.1/new.c.overflow 2005-03-18 15:55:53.000000000 -0500 ++++ xloadimage.4.1/new.c 2005-03-18 15:57:50.000000000 -0500 +@@ -112,6 +112,17 @@ + lfree((byte *)rgb->blue); + } + ++static unsigned int ovmul(unsigned int a, unsigned int b) ++{ ++ unsigned int r; ++ ++ r = a * b; ++ if (r/a != b) { ++ memoryExhausted(); ++ } ++ return r; ++} ++ + Image *newBitImage(width, height) + unsigned int width, height; + { Image *image; +@@ -128,7 +138,7 @@ + image->height= height; + image->depth= 1; + linelen= (width / 8) + (width % 8 ? 1 : 0); /* thanx johnh at amcc.com */ +- image->data= (unsigned char *)lcalloc(linelen * height); ++ image->data= (unsigned char *)lcalloc(ovmul(linelen,height)); + return(image); + } + xloadimage.4.1-linux.patch: Imakefile | 8 ++++---- misc.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) Index: xloadimage.4.1-linux.patch =================================================================== RCS file: /cvs/dist/rpms/xloadimage/FC-2/xloadimage.4.1-linux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xloadimage.4.1-linux.patch 9 Sep 2004 14:49:38 -0000 1.1 +++ xloadimage.4.1-linux.patch 18 Mar 2005 21:20:12 -0000 1.2 @@ -16,7 +16,7 @@ -JPEG_DEFS = -DHAS_JPEG -I/usr/local/include/jpeg - JPEG_LIB = -L/usr/local/lib/jpeg -ljpeg +JPEG_DEFS = -DHAS_JPEG -+ JPEG_LIB = jpeg/libjpeg.a ++ JPEG_LIB = -ljpeg JPEG_SRC = jpeg.c JPEG_OBJ = jpeg.o #endif @@ -35,13 +35,3 @@ static char *signalName(sig) int sig; ---- xloadimage.4.1/jpeg.c.orig Mon Nov 8 13:36:03 1993 -+++ xloadimage.4.1/jpeg.c Fri Oct 24 13:55:34 1997 -@@ -7,7 +7,6 @@ - */ - - #include "image.h" /* xloadimage declarations */ --#include "jpeg.conf.h" /* definitions used in jpeg directory */ - #include "jpeg/jinclude.h" /* IJG declarations */ - #include /* need setjmp/longjmp */ - Index: xloadimage.spec =================================================================== RCS file: /cvs/dist/rpms/xloadimage/FC-2/xloadimage.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xloadimage.spec 9 Sep 2004 14:53:21 -0000 1.3 +++ xloadimage.spec 18 Mar 2005 21:20:12 -0000 1.4 @@ -1,8 +1,8 @@ Summary: An X Window System based image viewer. Name: xloadimage Version: 4.1 -Release: 30 -Copyright: MIT +Release: 34.FC2 +License: MIT Group: Amusements/Graphics Source: ftp.x.org:/R5contrib/xloadimage.4.1.tar.gz Patch0: xloadimage.4.1-linux.patch @@ -11,8 +11,12 @@ Patch3: xloadimage-4.1-buffer.patch Patch4: xloadimage-4.1-errno.patch Patch5: xloadimage-4.1-arg.patch +Patch6: xloadimage-4.1-delay.patch +Patch7: xloadimage-format.patch +Patch8: 01_libjpeg-support.dpatch +Patch9: xloadimage-4.1-popen.patch BuildRoot: /var/tmp/xloadimage-root -BuildPrereq: libtiff-devel +BuildPrereq: libtiff-devel XFree86-devel %description The xloadimage utility displays images in an X Window System window, @@ -28,16 +32,13 @@ %patch3 -p1 -b .buffer %patch4 -p1 -b .errno %patch5 -p1 -b .arg - -cd jpeg -mv Makefile Makefile.orig -ln -s makefile.ansi Makefile +%patch6 -p1 -b .delay +%patch7 -p0 -b .format +%patch8 -p1 -b .jpeg +%patch9 -p1 -b .popen %build xmkmf -cd jpeg -make libjpeg.a -cd .. make %install @@ -65,6 +66,19 @@ /usr/X11R6/man/man1/xloadimage.* %changelog +* Fri Mar 18 2005 Bill Nottingham +- use system libjpeg +- fix quoting in filenames (CAN-2005-0638) + +* Fri Jan 21 2005 Bill Nottingham 4.1-33 +- fix bad use of format strings (#70867, #78481 ) + +* Wed Oct 13 2004 Bill Nottingham 4.1-32 +- add patch for slideshow (#114689) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + * Fri Feb 13 2004 Elliot Lee - rebuilt From fedora-cvs-commits at redhat.com Fri Mar 18 21:36:09 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 16:36:09 -0500 Subject: rpms/selinux-policy-strict/devel selinux-policy-strict.spec, 1.256, 1.257 Message-ID: <200503182136.j2ILa9MD026011@cvs.devel.redhat.com> Update of /cvs/dist/rpms/selinux-policy-strict/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25998 Modified Files: selinux-policy-strict.spec Log Message: * Fri Mar 18 2005 Dan Walsh 1.23.3-2 - Allow cups/lpd to bind to a port Index: selinux-policy-strict.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/selinux-policy-strict.spec,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- selinux-policy-strict.spec 18 Mar 2005 20:47:49 -0000 1.256 +++ selinux-policy-strict.spec 18 Mar 2005 21:36:07 -0000 1.257 @@ -17,7 +17,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-buildroot Patch1: policy-20050317.patch -Patch2: x_client_cleanup.diff BuildArch: noarch BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER} @@ -43,7 +42,6 @@ %prep %setup -q -n policy-%{version} %patch1 -p1 -%patch2 -p1 %build mv domains/misc/unused/* domains/misc From fedora-cvs-commits at redhat.com Fri Mar 18 21:38:15 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 16:38:15 -0500 Subject: rpms/system-config-nfs/devel .cvsignore, 1.8, 1.9 sources, 1.10, 1.11 system-config-nfs.spec, 1.9, 1.10 Message-ID: <200503182138.j2ILcFrG026112@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-nfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26097 Modified Files: .cvsignore sources system-config-nfs.spec Log Message: make nohide, mp, fsid options configurable Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 17 Mar 2005 15:41:14 -0000 1.8 +++ .cvsignore 18 Mar 2005 21:38:13 -0000 1.9 @@ -1 +1 @@ -system-config-nfs-1.3.0.tar.bz2 +system-config-nfs-1.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 17 Mar 2005 15:41:14 -0000 1.10 +++ sources 18 Mar 2005 21:38:13 -0000 1.11 @@ -1 +1 @@ -fbce5d3d4573c2e83a1c04819d7c9869 system-config-nfs-1.3.0.tar.bz2 +e522b30eb7e19ac9a2809583ceb8c0b9 system-config-nfs-1.3.1.tar.bz2 Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/system-config-nfs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- system-config-nfs.spec 17 Mar 2005 15:41:14 -0000 1.9 +++ system-config-nfs.spec 18 Mar 2005 21:38:13 -0000 1.10 @@ -1,6 +1,6 @@ Summary: NFS server configuration tool Name: system-config-nfs -Version: 1.3.0 +Version: 1.3.1 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -64,6 +64,9 @@ %changelog +* Fri Mar 18 2005 Nils Philippsen 1.3.1-1 +- make nohide, mp, fsid options configurable + * Thu Mar 17 2005 Nils Philippsen 1.3.0-1 - revamp NFS backend code completely - convert UI to libglade From fedora-cvs-commits at redhat.com Fri Mar 18 21:43:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 16:43:47 -0500 Subject: rpms/libgnomeprintui22/devel .cvsignore, 1.11, 1.12 libgnomeprintui22.spec, 1.16, 1.17 sources, 1.11, 1.12 Message-ID: <200503182143.j2ILhlUp026218@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libgnomeprintui22/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26203 Modified Files: .cvsignore libgnomeprintui22.spec sources Log Message: * Fri Mar 18 2005 David Zeuthen - 2.10.1-1 - New upstream version - drop a patch that was merged upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 27 Jan 2005 20:24:04 -0000 1.11 +++ .cvsignore 18 Mar 2005 21:43:45 -0000 1.12 @@ -1,2 +1,3 @@ libgnomeprintui-2.8.0.tar.bz2 libgnomeprintui-2.8.2.tar.bz2 +libgnomeprintui-2.10.1.tar.bz2 Index: libgnomeprintui22.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libgnomeprintui22.spec 4 Mar 2005 22:14:49 -0000 1.16 +++ libgnomeprintui22.spec 18 Mar 2005 21:43:45 -0000 1.17 @@ -1,12 +1,12 @@ %define gtk2_version 2.4.0 -%define libgnomeprint_version 2.8.2 +%define libgnomeprint_version 2.10.0 %define libgnomecanvas_version 2.3.0 %define gettext_package libgnomeprintui-2.2 Summary: GUI support for libgnomeprint Name: libgnomeprintui22 -Version: 2.8.2 -Release: 2 +Version: 2.10.1 +Release: 1 Source0: libgnomeprintui-%{version}.tar.bz2 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/ License: LGPL @@ -31,7 +31,7 @@ # Re-autogen without GNOME_COMPILE_WARNINGS Patch1: libgnomeprintui-nognomecommon.patch -Patch4: libgnomeprintui22-async-ppd.patch +#Patch4: libgnomeprintui22-async-ppd.patch %description @@ -59,7 +59,7 @@ %setup -q -n libgnomeprintui-%{version} %patch1 -p1 -b .nognomecommon -%patch4 -p1 -b .async-ppd +#%patch4 -p1 -b .async-ppd %build @@ -102,6 +102,9 @@ %{_datadir}/gtk-doc %changelog +* Fri Mar 18 2005 David Zeuthen - 2.10.1-1 +- New upstream version - drop a patch that was merged upstream + * Fri Mar 4 2005 David Zeuthen - 2.8.2.-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 27 Jan 2005 20:24:04 -0000 1.11 +++ sources 18 Mar 2005 21:43:45 -0000 1.12 @@ -1 +1 @@ -b38d1f6813dd52879ba4174ddc3f1b1c libgnomeprintui-2.8.2.tar.bz2 +448b2a8e9509fee63f12e5eac2be94c9 libgnomeprintui-2.10.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 21:54:22 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 16:54:22 -0500 Subject: rpms/kernel/devel/configs config-generic,1.8,1.9 Message-ID: <200503182154.j2ILsM4M030997@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv29482/configs Modified Files: config-generic Log Message: 2.6.12rc1 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config-generic 13 Mar 2005 20:42:30 -0000 1.8 +++ config-generic 18 Mar 2005 21:54:20 -0000 1.9 @@ -213,12 +213,10 @@ # CONFIG_PARPORT=m CONFIG_PARPORT_PC=m -CONFIG_PARPORT_PC_CML1=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set # CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m -# CONFIG_PARPORT_OTHER is not set CONFIG_PARPORT_1284=y # @@ -503,6 +501,8 @@ CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_CRYPT=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m # # Fusion MPT device support @@ -804,6 +804,14 @@ CONFIG_CLS_U32_PERF=y CONFIG_NET_CLS_IND=y # CONFIG_NET_CLS_ACT is not set +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m + # # Network testing @@ -933,7 +941,6 @@ CONFIG_DGRS=m CONFIG_EEPRO100=m CONFIG_E100=m -CONFIG_E100_NAPI=y CONFIG_FEALNX=m CONFIG_FORCEDETH=m CONFIG_NATSEMI=m @@ -1190,7 +1197,6 @@ CONFIG_ISDN_DRV_PCBIT=m CONFIG_ISDN_DRV_SC=m CONFIG_ISDN_DRV_ACT2000=m -CONFIG_ISDN_DRV_TPAM=m CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y CONFIG_ISDN_DRV_AVMB1_AVM_CS=m @@ -1240,6 +1246,7 @@ CONFIG_HISAX_SEDLBAUER_CS=m CONFIG_HISAX_ELSA_CS=m CONFIG_HISAX_TELES_CS=m +CONFIG_HISAX_HFC4S8S=m CONFIG_ISDN_DRV_LOOP=m CONFIG_HYSDN=m @@ -1355,13 +1362,16 @@ CONFIG_JOYSTICK_SPACEORB=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDDLER=m CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_TWIDJOY=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_MK712=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_UINPUT=m @@ -1380,6 +1390,10 @@ CONFIG_STALDRV=y # CONFIG_FTAPE is not set # CONFIG_IBM_ASM is not set +CONFIG_TCG_TPM=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m + # # Serial drivers @@ -1398,7 +1412,6 @@ # CONFIG_COMPUTONE is not set # CONFIG_CYCLADES is not set # CONFIG_DIGIEPCA is not set -# CONFIG_DIGI is not set # CONFIG_ESPSERIAL is not set # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set @@ -1505,6 +1518,9 @@ CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_SIS5595=m CONFIG_W1=m CONFIG_W1_MATROX=m @@ -1577,7 +1593,6 @@ 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 @@ -1639,11 +1654,13 @@ CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_MEYE=m CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_OVCAMCHIP=m @@ -1728,6 +1745,7 @@ CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 +CONFIG_DVB_OR51132=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m @@ -1790,6 +1808,9 @@ CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y CONFIG_FB_SAVAGE_ACCEL=y +CONFIG_FB_NVIDIA=m +CONFIG_FB_NVIDIA_I2C=y +# CONFIG_FB_GEODE is not set # # Console display driver support @@ -1827,7 +1848,6 @@ CONFIG_SND_RTCTIMER=m # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set -CONFIG_SND_BIT32_EMUL=y # # Generic devices @@ -1915,6 +1935,7 @@ CONFIG_SND_FM801_TEA575X=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_PDAUDIOCF=m +CONFIG_SND_HDA_INTEL=m # @@ -1977,11 +1998,11 @@ CONFIG_USB_STORAGE_FREECOM=y CONFIG_USB_STORAGE_ISD200=y CONFIG_USB_STORAGE_DPCM=y -CONFIG_USB_STORAGE_HP8200e=y CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_RW_DETECT=y +CONFIG_USB_STORAGE_USBAT=y # # USB Human Interface Devices (HID) @@ -2035,6 +2056,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_ZD1201=m # # USB Host-to-Host Cables @@ -2138,6 +2160,9 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_IPW=m CONFIG_USB_PHIDGETKIT=m +# CONFIG_USB_MON is not set +CONFIG_USB_SISUSBVGA=m + # # File systems @@ -2374,7 +2399,6 @@ CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y -# CONFIG_SECURITY_SELINUX_MLS is not set CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # CONFIG_SECURITY_SECLVL is not set @@ -2411,6 +2435,7 @@ CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_TGR192=m # # Library routines @@ -2451,3 +2476,6 @@ CONFIG_TUX_EXTENDED_LOG=y # CONFIG_TUX_DEBUG is not set +CONFIG_CPUSETS=y +CONFIG_SECCOMP=y +# CONFIG_PRINTK_TIME is not set From fedora-cvs-commits at redhat.com Fri Mar 18 21:54:22 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 16:54:22 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1186, 1.1187 linux-2.6.0-devmem.patch, 1.12, 1.13 linux-2.6.0-sleepon.patch, 1.11, 1.12 linux-2.6.10-compile-fixes.patch, 1.6, 1.7 linux-2.6.10-crashdump-common.patch, 1.2, 1.3 linux-2.6.10-usb-use_both_schemes.patch, 1.2, 1.3 linux-2.6.11-compile-fixes.patch, 1.7, 1.8 linux-2.6.11-tux.patch, 1.1, 1.2 linux-2.6.3-crash-driver.patch, 1.3, 1.4 linux-2.6.9-ide-cd-early-EOF.patch, 1.3, 1.4 linux-2.6.9-lockd-reclaims.patch, 1.1, 1.2 linux-2.6.9-module_version.patch, 1.9, 1.10 upstream, 1.61, 1.62 Message-ID: <200503182154.j2ILsMMQ030951@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29482 Modified Files: kernel-2.6.spec linux-2.6.0-devmem.patch linux-2.6.0-sleepon.patch linux-2.6.10-compile-fixes.patch linux-2.6.10-crashdump-common.patch linux-2.6.10-usb-use_both_schemes.patch linux-2.6.11-compile-fixes.patch linux-2.6.11-tux.patch linux-2.6.3-crash-driver.patch linux-2.6.9-ide-cd-early-EOF.patch linux-2.6.9-lockd-reclaims.patch linux-2.6.9-module_version.patch upstream Log Message: 2.6.12rc1 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1186 retrieving revision 1.1187 diff -u -r1.1186 -r1.1187 --- kernel-2.6.spec 18 Mar 2005 18:25:23 -0000 1.1186 +++ kernel-2.6.spec 18 Mar 2005 21:54:20 -0000 1.1187 @@ -210,8 +210,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: linux-2.6.11-post-release-quickfixes.patch -#Patch2: patch-2.6.12-rc1.bz2 +Patch1: patch-2.6.12-rc1.bz2 #Patch3: patch-2.6.11-bk1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -251,11 +250,8 @@ Patch800: linux-2.4.0-nonintconfig.patch Patch801: linux-2.6.0-must_check.patch -Patch811: linux-2.6.0-exec-shield.patch -Patch812: linux-2.6.8-print-fatal-signals.patch -Patch813: linux-2.6.8-execshield-vaspace.patch -Patch814: linux-2.6.8-execshield-xen.patch -Patch815: linux-2.6.10-x86_64-read-implies-exec32.patch +Patch810: linux-2.6.11-execshield.patch +Patch811: linux-2.6.10-x86_64-read-implies-exec32.patch # Module signing infrastructure. Patch900: linux-2.6.7-modsign-core.patch @@ -264,7 +260,6 @@ Patch903: linux-2.6.7-modsign-mpilib.patch Patch904: linux-2.6.7-modsign-script.patch Patch905: linux-2.6.7-modsign-include.patch -Patch906: linux-2.6.9-sha1.patch # Tux http accelerator. Patch910: linux-2.6.11-tux.patch @@ -276,17 +271,14 @@ Patch1010: linux-2.6.10-periodic-slab-debug.patch Patch1020: linux-2.6.4-stackusage.patch -Patch1050: linux-2.6.7-devmem.patch -Patch1051: linux-2.6.0-devmem.patch -Patch1052: linux-2.6.8-devmem-xen.patch -Patch1053: linux-2.6.11-devmem-whodunnit.patch +Patch1050: linux-2.6.11-devmem.patch +Patch1051: linux-2.6.8-devmem-xen.patch Patch1060: linux-2.6.3-crash-driver.patch Patch1061: linux-2.6.10-crash-xen.patch Patch1070: linux-2.6.0-sleepon.patch # SCSI bits. -Patch1100: linux-2.6.10-scsi-blacklist.patch Patch1101: linux-2.6.9-scsi-advansys-enabler.patch Patch1102: linux-2.6.9-scsi-megaraid-legacy.patch @@ -312,7 +304,6 @@ # Misc bits. Patch1700: linux-2.6.10-revert-module-invalidparam.patch -Patch1710: linux-2.6.11-selinux-execute-perm-checking.patch Patch1720: linux-2.6.9-module_version.patch Patch1730: linux-2.6.9-spinlock-debug-panic.patch Patch1740: linux-2.6.11-ext3-release-race.patch @@ -519,7 +510,7 @@ # Patch for Kconfig and Makefile build issues %patch300 -p1 -%patch301 -p1 +#%patch301 -p1 %patch302 -p1 # @@ -551,9 +542,9 @@ # # Xen # -%patch700 -p1 -%patch701 -p1 -%patch702 -p1 +#%patch700 -p1 +#%patch701 -p1 +#%patch702 -p1 # # Patches 500 through 1000 are reserved for bugfixes to the core system @@ -573,23 +564,11 @@ %patch801 -p1 -# -# The execshield patch series, broken into smaller pieces -# -# 1) Exec shield core -%patch811 -p1 - -# 2) Option to printk fatal signals, useful for debugging -%patch812 -p1 - -# 3) The Execshield VA rearrangements -%patch813 -p1 - -# 4) Fixes to make Xen work with Execshield -%patch814 -p1 +# Exec shield +%patch810 -p1 -# 5) Revert x86-64 read-implies-exec on 32 bit processes. -%patch815 -p1 -R +# Revert x86-64 read-implies-exec on 32 bit processes. +%patch811 -p1 -R # # GPG signed kernel modules @@ -600,7 +579,6 @@ %patch903 -p1 %patch904 -p1 %patch905 -p1 -%patch906 -p1 # Tux %patch910 -p1 @@ -629,15 +607,13 @@ # Make /dev/mem a need-to-know function # %patch1050 -p1 -%patch1051 -p1 -%patch1052 -p1 -%patch1053 -p1 +#%patch1051 -p1 # # /dev/crash driver for the crashdump analysis tool # %patch1060 -p1 -%patch1061 -p1 +#%patch1061 -p1 # # Most^WAll users of sleep_on are broken; fix a bunch @@ -647,8 +623,6 @@ # # SCSI Bits. # -# Blacklist some devices -%patch1100 -p1 # Enable Advansys driver %patch1101 -p1 # Enable both new and old megaraid drivers. @@ -686,8 +660,6 @@ # Misc fixes # Don't barf on obsolete module parameters. %patch1700 -p1 -# Change SELinux execute-related permission checking -%patch1710 -p1 # Add missing MODULE_VERSION tags to some modules. %patch1720 -p1 # Make spinlock debugging panic instead of continue. @@ -1103,6 +1075,7 @@ %changelog * Fri Mar 18 2005 Dave Jones - kjournald release race. (#146344) +- 2.6.12rc1 * Thu Mar 17 2005 Rik van Riel - upgrade to latest upstream Xen code linux-2.6.0-devmem.patch: linux-1050/arch/s390/mm/init.c | 5 +++++ linux-1050/fs/proc/kcore.c | 2 +- linux-2.6.11/drivers/char/mem.c | 2 ++ linux-2.6.3/arch/ia64/mm/init.c | 7 +++++++ linux-2.6.3/arch/ppc/mm/init.c | 5 +++++ linux-2.6.8/drivers/char/mem.c | 1 - 6 files changed, 20 insertions(+), 2 deletions(-) Index: linux-2.6.0-devmem.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.0-devmem.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6.0-devmem.patch 10 Sep 2004 12:50:56 -0000 1.12 +++ linux-2.6.0-devmem.patch 18 Mar 2005 21:54:20 -0000 1.13 @@ -13,18 +13,17 @@ void __init mem_init(void) { unsigned long codesize, reservedpages, datasize, initsize; -diff -urNp linux-1030/drivers/char/mem.c linux-1050/drivers/char/mem.c ---- linux-1030/drivers/char/mem.c -+++ linux-1050/drivers/char/mem.c -@@ -213,6 +249,8 @@ static ssize_t read_kmem(struct file *fi - ssize_t read = 0; - ssize_t virtr = 0; +--- linux-2.6.11/drivers/char/mem.c~ 2005-03-18 14:25:26.000000000 -0500 ++++ linux-2.6.11/drivers/char/mem.c 2005-03-18 14:25:45.000000000 -0500 +@@ -287,6 +287,8 @@ static ssize_t read_kmem(struct file *fi + ssize_t read, virtr, sz; char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ -+ + + return -EPERM; - ++ + read = 0; + virtr = 0; if (p < (unsigned long) high_memory) { - read = count; diff -urNp linux-1030/fs/proc/kcore.c linux-1050/fs/proc/kcore.c --- linux-1030/fs/proc/kcore.c +++ linux-1050/fs/proc/kcore.c linux-2.6.0-sleepon.patch: linux-10000/include/linux/wait.h | 4 ++-- linux-1070/drivers/block/DAC960.c | 12 +++++++++++- linux-1070/drivers/net/tokenring/ibmtr.c | 9 ++++++++- linux-1070/fs/lockd/clntlock.c | 1 + linux-1070/kernel/sched.c | 28 +++++++++++++++------------- linux-1070/net/sunrpc/clnt.c | 9 ++++++++- linux-2.6.8/include/linux/wait.h | 2 +- 7 files changed, 46 insertions(+), 19 deletions(-) Index: linux-2.6.0-sleepon.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.0-sleepon.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6.0-sleepon.patch 25 Dec 2004 05:22:15 -0000 1.11 +++ linux-2.6.0-sleepon.patch 18 Mar 2005 21:54:20 -0000 1.12 @@ -163,19 +163,6 @@ if (atomic_read(&clnt->cl_users) < 0) { printk(KERN_ERR "RPC: rpc_shutdown_client clnt %p tasks=%d\n", ---- linux-2.6.3/drivers/char/lp.c~ 2004-03-08 12:37:55.518102800 +0100 -+++ linux-2.6.3/drivers/char/lp.c 2004-03-08 12:37:55.518102800 +0100 -@@ -225,8 +225,8 @@ - - polling = lp_table[minor].dev->port->irq == PARPORT_IRQ_NONE; - if (polling) lp_release_parport (&lp_table[minor]); -- interruptible_sleep_on_timeout (&lp_table[minor].waitq, -- LP_TIMEOUT_POLLED); -+ set_current_state(TASK_INTERRUPTIBLE); -+ schedule_timeout(LP_TIMEOUT_POLLED); - if (polling) lp_claim_parport_or_block (&lp_table[minor]); - else parport_yield_blocking (lp_table[minor].dev); - } diff -urNp linux-1130/include/linux/wait.h linux-10000/include/linux/wait.h --- linux-1130/include/linux/wait.h +++ linux-10000/include/linux/wait.h linux-2.6.10-compile-fixes.patch: linux-10000/arch/ppc/Makefile | 1 + linux-10000/scripts/kconfig/Makefile | 2 +- linux-10000/sound/core/oss/Makefile | 1 + linux-2.6.10-ppc/arch/ppc/kernel/time.c | 12 ++++++------ linux-2.6.10-ppc/arch/ppc/syslib/open_pic_defs.h | 2 -- linux-2.6.10-ppc/include/asm-ppc/prom.h | 3 --- linux-2.6.10/include/asm-ppc64/paca.h | 3 ++- linux-2.6.10/scripts/reference_discarded.pl | 1 + linux-2.6.6/drivers/md/Makefile | 2 ++ linux-2.6.8/arch/ppc/kernel/head.S | 2 +- linux-2.6.8/arch/ppc/kernel/misc.S | 2 +- linux-2.6.8/arch/ppc/mm/hashtable.S | 4 ++-- linux-2.6.8/arch/ppc/platforms/pmac_sleep.S | 2 +- linux-2.6.8/arch/ppc64/Makefile | 2 +- linux-2.6.8/arch/ppc64/boot/main.c | 1 + linux-2.6.8/crypto/Makefile | 2 ++ linux-2.6.8/include/asm-ppc/ppc_asm.h | 2 +- linux-2.6.8/include/linux/config.h | 2 +- 18 files changed, 25 insertions(+), 21 deletions(-) Index: linux-2.6.10-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-compile-fixes.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6.10-compile-fixes.patch 17 Mar 2005 14:59:57 -0000 1.6 +++ linux-2.6.10-compile-fixes.patch 18 Mar 2005 21:54:20 -0000 1.7 @@ -151,14 +151,6 @@ blt 1b sync blr ---- linux-2.6.8/arch/ppc64/boot/zImage.lds~ 2004-10-12 16:42:38.870879944 -0400 -+++ linux-2.6.8/arch/ppc64/boot/zImage.lds 2004-10-12 16:42:49.191311000 -0400 -@@ -1,4 +1,4 @@ --OUTPUT_ARCH(powerpc) -+OUTPUT_ARCH(powerpc:common) - SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib); - /* Do we need any of these for elf? - __DYNAMIC = 0; */ --- linux-2.6.10/include/asm-ppc64/paca.h~ 2005-03-01 08:48:20.000000000 +0000 +++ linux-2.6.10/include/asm-ppc64/paca.h 2005-03-01 08:54:47.662044104 +0000 @@ -22,7 +22,6 @@ linux-2.6.10-crashdump-common.patch: linux-2.6.10.crashdumpcommon/Documentation/sysrq.txt | 8 linux-2.6.10.crashdumpcommon/arch/i386/kernel/nmi.c | 1 linux-2.6.10.crashdumpcommon/arch/i386/kernel/process.c | 2 linux-2.6.10.crashdumpcommon/arch/i386/kernel/smp.c | 47 +- linux-2.6.10.crashdumpcommon/arch/i386/kernel/traps.c | 3 linux-2.6.10.crashdumpcommon/arch/i386/mm/init.c | 47 ++ linux-2.6.10.crashdumpcommon/arch/i386/mm/pgtable.c | 3 linux-2.6.10.crashdumpcommon/arch/ia64/kernel/process.c | 30 + linux-2.6.10.crashdumpcommon/arch/ia64/kernel/smp.c | 52 +- linux-2.6.10.crashdumpcommon/arch/ia64/kernel/traps.c | 6 linux-2.6.10.crashdumpcommon/arch/ia64/mm/contig.c | 3 linux-2.6.10.crashdumpcommon/arch/ia64/mm/discontig.c | 3 linux-2.6.10.crashdumpcommon/arch/ia64/mm/init.c | 90 +++- linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/process.c | 1 linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/smp.c | 53 +- linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/traps.c | 3 linux-2.6.10.crashdumpcommon/arch/ppc64/mm/init.c | 29 + linux-2.6.10.crashdumpcommon/arch/s390/kernel/traps.c | 6 linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/process.c | 2 linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/smp.c | 50 +- linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/traps.c | 6 linux-2.6.10.crashdumpcommon/arch/x86_64/mm/fault.c | 1 linux-2.6.10.crashdumpcommon/arch/x86_64/mm/init.c | 33 + linux-2.6.10.crashdumpcommon/drivers/char/sysrq.c | 13 linux-2.6.10.crashdumpcommon/include/asm-generic/crashdump.h | 47 ++ linux-2.6.10.crashdumpcommon/include/asm-i386/crashdump.h | 123 +++++ linux-2.6.10.crashdumpcommon/include/asm-i386/kmap_types.h | 4 linux-2.6.10.crashdumpcommon/include/asm-ia64/crashdump.h | 72 +++ linux-2.6.10.crashdumpcommon/include/asm-ppc64/crashdump.h | 61 ++ linux-2.6.10.crashdumpcommon/include/asm-x86_64/crashdump.h | 86 +++ linux-2.6.10.crashdumpcommon/include/linux/kernel.h | 18 linux-2.6.10.crashdumpcommon/kernel/dump.c | 246 +++++++++++ linux-2.6.10.crashdumpcommon/kernel/panic.c | 2 linux-2.6.10.crashdumpcommon/kernel/printk.c | 20 linux-2.6.10.crashdumpcommon/kernel/sched.c | 2 linux-2.6.11/kernel/Makefile | 2 36 files changed, 1095 insertions(+), 80 deletions(-) Index: linux-2.6.10-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-crashdump-common.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.10-crashdump-common.patch 19 Jan 2005 23:14:22 -0000 1.2 +++ linux-2.6.10-crashdump-common.patch 18 Mar 2005 21:54:20 -0000 1.3 @@ -1429,15 +1429,14 @@ /* * Display an IP address in readable format. */ -diff -uprN linux-2.6.10.orig/kernel/Makefile linux-2.6.10.crashdumpcommon/kernel/Makefile ---- linux-2.6.10.orig/kernel/Makefile 2005-01-18 13:12:04.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/kernel/Makefile 2005-01-18 11:57:35.000000000 -0500 +--- linux-2.6.11/kernel/Makefile~ 2005-03-18 15:42:55.000000000 -0500 ++++ linux-2.6.11/kernel/Makefile 2005-03-18 15:43:08.000000000 -0500 @@ -7,7 +7,7 @@ obj-y = sched.o fork.o exec_domain.o sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o pid.o \ rcupdate.o intermodule.o extable.o params.o posix-timers.o \ -- kthread.o wait.o kfifo.o sys_ni.o -+ kthread.o wait.o kfifo.o sys_ni.o dump.o +- kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o ++ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o dump.o obj-$(CONFIG_FUTEX) += futex.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o linux-2.6.10-usb-use_both_schemes.patch: hub.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.10-usb-use_both_schemes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-usb-use_both_schemes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.10-usb-use_both_schemes.patch 16 Mar 2005 06:23:42 -0000 1.2 +++ linux-2.6.10-usb-use_both_schemes.patch 18 Mar 2005 21:54:20 -0000 1.3 @@ -1,14 +1,3 @@ ---- linux-2.6.10/drivers/usb/core/hub.c~ 2005-02-08 02:02:23.000000000 -0500 -+++ linux-2.6.10/drivers/usb/core/hub.c 2005-02-08 02:03:02.000000000 -0500 -@@ -75,7 +75,7 @@ module_param(old_scheme_first, bool, S_I - MODULE_PARM_DESC(old_scheme_first, - "start with the old device initialization scheme"); - --static int use_both_schemes = 0; -+static int use_both_schemes = 1; - module_param(use_both_schemes, bool, S_IRUGO | S_IWUSR); - MODULE_PARM_DESC(use_both_schemes, - "try the other device initialization scheme if the " --- linux-2.6.11/drivers/usb/core/hub.c~ 2005-03-16 01:21:11.000000000 -0500 +++ linux-2.6.11/drivers/usb/core/hub.c 2005-03-16 01:21:16.000000000 -0500 @@ -69,7 +69,7 @@ MODULE_PARM_DESC (blinkenlights, "true t linux-2.6.11-compile-fixes.patch: linux-2.6.10/init/Makefile | 5 +++++ linux-2.6.11/include/linux/init.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) Index: linux-2.6.11-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-compile-fixes.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6.11-compile-fixes.patch 4 Mar 2005 00:54:49 -0000 1.7 +++ linux-2.6.11-compile-fixes.patch 18 Mar 2005 21:54:20 -0000 1.8 @@ -1,71 +1,3 @@ ---- linux-2.6.10/include/linux/i2c.h~ 2005-02-28 18:09:24.000000000 -0500 -+++ linux-2.6.10/include/linux/i2c.h 2005-02-28 18:09:43.000000000 -0500 -@@ -55,7 +55,7 @@ extern int i2c_master_recv(struct i2c_cl - - /* Transfer num messages. - */ --extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num); -+extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num); - - /* - * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor. -@@ -194,7 +194,7 @@ struct i2c_algorithm { - to NULL. If an adapter algorithm can do SMBus access, set - smbus_xfer. If set to NULL, the SMBus protocol is simulated - using common I2C messages */ -- int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], -+ int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, - int num); - int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, - unsigned short flags, char read_write, - ---- linux-2.6.10/drivers/media/dvb/bt8xx/bt878.h~ 2005-03-01 01:47:57.000000000 -0500 -+++ linux-2.6.10/drivers/media/dvb/bt8xx/bt878.h 2005-03-01 01:48:12.000000000 -0500 -@@ -89,7 +89,6 @@ - #define BT878_RISC_SYNC_MASK (1 << 15) - - extern int bt878_num; --extern struct bt878 bt878[BT878_MAX]; - - struct bt878 { - struct semaphore gpio_lock; -@@ -124,6 +123,8 @@ struct bt878 { - int shutdown; - }; - -+extern struct bt878 bt878[BT878_MAX]; -+ - void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin, - u32 irq_err_ignore); - void bt878_stop(struct bt878 *bt); ---- linux-2.6.10/drivers/media/video/bttvp.h~ 2005-03-01 02:12:59.000000000 -0500 -+++ linux-2.6.10/drivers/media/video/bttvp.h 2005-03-01 02:13:26.000000000 -0500 -@@ -230,7 +230,6 @@ extern int fini_bttv_i2c(struct bttv *bt - /* our devices */ - #define BTTV_MAX 16 - extern unsigned int bttv_num; --extern struct bttv bttvs[BTTV_MAX]; - - #define BTTV_MAX_FBUF 0x208000 - #define VBIBUF_SIZE (2048*VBI_MAXLINES*2) -@@ -378,6 +377,8 @@ struct bttv { - struct bttv_fh init; - }; - -+extern struct bttv bttvs[BTTV_MAX]; -+ - /* private ioctls */ - #define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int) - #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int) ---- linux-2.6.10/include/linux/compiler-gcc+.h~ 2004-12-24 21:35:39.000000000 +0000 -+++ linux-2.6.10/include/linux/compiler-gcc+.h 2005-03-01 15:49:47.000000000 +0000 -@@ -13,4 +13,6 @@ - #define __attribute_used__ __attribute__((__used__)) - #define __attribute_pure__ __attribute__((pure)) - #define __attribute_const__ __attribute__((__const__)) -+#define noinline __attribute__((noinline)) - #define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a,b) __builtin_offsetof(a,b) --- linux-2.6.10/init/Makefile~ 2005-03-02 09:15:30.000000000 +0000 +++ linux-2.6.10/init/Makefile 2005-03-02 09:16:17.000000000 +0000 @@ -2,6 +2,11 @@ linux-2.6.11-tux.patch: linux-2.6.11/include/linux/namei.h | 2 linux-2.6.11/kernel/exit.c | 7 linux/arch/alpha/kernel/systbls.S | 8 linux/arch/i386/kernel/entry.S | 10 linux/arch/ia64/kernel/entry.S | 8 linux/arch/ia64/kernel/ia64_ksyms.c | 3 linux/arch/ppc64/kernel/misc.S | 20 linux/arch/x86_64/ia32/ia32entry.S | 10 linux/fs/dcache.c | 36 linux/fs/exec.c | 2 linux/fs/fcntl.c | 4 linux/fs/namei.c | 18 linux/fs/namespace.c | 2 linux/fs/open.c | 4 linux/fs/pipe.c | 2 linux/fs/read_write.c | 2 linux/include/asm-alpha/fcntl.h | 1 linux/include/asm-i386/fcntl.h | 1 linux/include/asm-i386/unistd.h | 5 linux/include/asm-ia64/fcntl.h | 1 linux/include/asm-ia64/unistd.h | 2 linux/include/asm-ppc/fcntl.h | 1 linux/include/asm-ppc64/fcntl.h | 1 linux/include/asm-s390/fcntl.h | 1 linux/include/asm-sparc/fcntl.h | 1 linux/include/asm-sparc64/fcntl.h | 1 linux/include/asm-x86_64/fcntl.h | 1 linux/include/asm-x86_64/unistd.h | 10 linux/include/linux/buffer_head.h | 1 linux/include/linux/dcache.h | 8 linux/include/linux/errno.h | 3 linux/include/linux/file.h | 2 linux/include/linux/fs.h | 7 linux/include/linux/kmod.h | 1 linux/include/linux/net.h | 1 linux/include/linux/sched.h | 5 linux/include/linux/skbuff.h | 2 linux/include/linux/socket.h | 5 linux/include/linux/sysctl.h | 50 linux/include/net/sock.h | 6 linux/include/net/tcp.h | 8 linux/include/net/tux.h | 802 +++++++++++++ linux/include/net/tux_u.h | 163 ++ linux/kernel/fork.c | 1 linux/kernel/kmod.c | 25 linux/kernel/signal.c | 1 linux/mm/filemap.c | 19 linux/mm/truncate.c | 2 linux/net/Kconfig | 2 linux/net/Makefile | 1 linux/net/ipv4/tcp.c | 3 linux/net/ipv4/tcp_input.c | 1 linux/net/ipv4/tcp_ipv4.c | 5 linux/net/ipv4/tcp_minisocks.c | 3 linux/net/ipv4/tcp_output.c | 5 linux/net/socket.c | 139 +- linux/net/tux/Kconfig | 25 linux/net/tux/Makefile | 12 linux/net/tux/abuf.c | 190 +++ linux/net/tux/accept.c | 859 ++++++++++++++ linux/net/tux/cachemiss.c | 265 ++++ linux/net/tux/cgi.c | 160 ++ linux/net/tux/directory.c | 302 ++++ linux/net/tux/extcgi.c | 329 +++++ linux/net/tux/gzip.c | 40 linux/net/tux/input.c | 640 ++++++++++ linux/net/tux/logger.c | 836 +++++++++++++ linux/net/tux/main.c | 1413 +++++++++++++++++++++++ linux/net/tux/mod.c | 262 ++++ linux/net/tux/output.c | 352 +++++ linux/net/tux/parser.h | 102 + linux/net/tux/postpone.c | 77 + linux/net/tux/proc.c | 1149 ++++++++++++++++++ linux/net/tux/proto_ftp.c | 1549 +++++++++++++++++++++++++ linux/net/tux/proto_http.c | 2197 ++++++++++++++++++++++++++++++++++++ linux/net/tux/redirect.c | 162 ++ linux/net/tux/times.c | 392 ++++++ linux/net/tux/times.h | 26 linux/net/tux/userspace.c | 27 79 files changed, 12729 insertions(+), 72 deletions(-) Index: linux-2.6.11-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-tux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.11-tux.patch 8 Feb 2005 00:33:44 -0000 1.1 +++ linux-2.6.11-tux.patch 18 Mar 2005 21:54:20 -0000 1.2 @@ -12037,22 +12037,22 @@ unsigned long invalidate_inode_pages(struct address_space *mapping) { return invalidate_mapping_pages(mapping, 0, ~0UL); ---- linux/kernel/exit.c.orig -+++ linux/kernel/exit.c -@@ -811,6 +811,13 @@ fastcall NORET_TYPE void do_exit(long co - group_dead = atomic_dec_and_test(&tsk->signal->live); - if (group_dead) +--- linux-2.6.11/kernel/exit.c~ 2005-03-18 13:57:44.000000000 -0500 ++++ linux-2.6.11/kernel/exit.c 2005-03-18 13:58:51.000000000 -0500 +@@ -813,6 +813,13 @@ fastcall NORET_TYPE void do_exit(long co + if (group_dead) { + del_timer_sync(&tsk->signal->real_timer); acct_process(code); -+ if (current->tux_info) { ++ if (current->tux_info) { +#ifdef CONFIG_TUX_DEBUG -+ printk("Possibly unexpected TUX-thread exit(%ld) at %p?\n", -+ code, __builtin_return_address(0)); ++ printk("Possibly unexpected TUX-thread exit(%ld) at %p?\n", ++ code, __builtin_return_address(0)); +#endif -+ current->tux_exit(); -+ } ++ current->tux_exit(); ++ } + } exit_mm(tsk); - exit_sem(tsk); --- linux/kernel/fork.c.orig +++ linux/kernel/fork.c @@ -820,6 +820,7 @@ static task_t *copy_process(unsigned lon @@ -13249,11 +13249,11 @@ @@ -62,7 +62,7 @@ */ - /* Define this to get the sk->sk_debug debugging facility. */ + /* Define this to get the SOCK_DBG debugging facility. */ -#define SOCK_DEBUGGING +//#define SOCK_DEBUGGING #ifdef SOCK_DEBUGGING - #define SOCK_DEBUG(sk, msg...) do { if ((sk) && ((sk)->sk_debug)) \ + #define SOCK_DEBUG(sk, msg...) do { if ((sk) && sock_flag((sk), SOCK_DBG)) \ printk(KERN_DEBUG msg); } while (0) @@ -164,7 +164,7 @@ struct sock_common { * @sk_timer - sock cleanup timer @@ -13415,13 +13415,13 @@ extern void sock_release(struct socket *sock); extern int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len); ---- linux/include/linux/namei.h.orig -+++ linux/include/linux/namei.h -@@ -45,6 +45,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA - #define LOOKUP_CONTINUE 4 +--- linux-2.6.11/include/linux/namei.h~ 2005-03-18 14:00:14.000000000 -0500 ++++ linux-2.6.11/include/linux/namei.h 2005-03-18 14:01:47.000000000 -0500 +@@ -47,6 +47,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA #define LOOKUP_PARENT 16 #define LOOKUP_NOALT 32 -+#define LOOKUP_ATOMIC 64 + #define LOOKUP_REVAL 64 ++#define LOOKUP_ATOMIC 128 + /* * Intent data linux-2.6.3-crash-driver.patch: linux-2.6.11/drivers/char/Makefile | 1 linux-2.6.3/arch/ia64/kernel/ia64_ksyms.c | 3 linux-2.6.3/drivers/char/Kconfig | 2 linux-2.6.3/drivers/char/crash.c | 129 ++++++++++++++++++++++++++++++ linux-2.6.3/include/asm-i386/crash.h | 75 +++++++++++++++++ linux-2.6.3/include/asm-ia64/crash.h | 90 ++++++++++++++++++++ linux-2.6.4/arch/i386/mm/init.c | 2 linux-2.6.7/arch/x86_64/mm/init.c | 3 linux-2.6.7/include/asm-x86_64/crash.h | 75 +++++++++++++++++ 9 files changed, 380 insertions(+) Index: linux-2.6.3-crash-driver.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-crash-driver.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.3-crash-driver.patch 12 Oct 2004 17:32:32 -0000 1.3 +++ linux-2.6.3-crash-driver.patch 18 Mar 2005 21:54:20 -0000 1.4 @@ -10,18 +10,16 @@ menu "Mice" -diff -urNp linux-2.6.3/drivers/char/Makefile.orig linux-2.6.3/drivers/char/Makefile ---- linux-2.6.3/drivers/char/Makefile.orig 2004-03-03 11:12:28.000000000 -0500 -+++ linux-2.6.3/drivers/char/Makefile 2004-03-03 11:12:33.000000000 -0500 -@@ -84,6 +84,8 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/ +--- linux-2.6.11/drivers/char/Makefile~ 2005-03-18 15:02:00.000000000 -0500 ++++ linux-2.6.11/drivers/char/Makefile 2005-03-18 15:02:08.000000000 -0500 +@@ -88,6 +88,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/ + obj-$(CONFIG_IPMI_HANDLER) += ipmi/ obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o - +obj-$(CONFIG_CRASH) += crash.o -+ + obj-$(CONFIG_TCG_TPM) += tpm/ # Files generated that shall be removed upon make clean clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c - diff -urNp linux-2.6.3/drivers/char/crash.c.orig linux-2.6.3/drivers/char/crash.c --- linux-2.6.3/drivers/char/crash.c.orig 2004-03-03 11:18:31.000000000 -0500 +++ linux-2.6.3/drivers/char/crash.c 2004-03-03 11:18:47.000000000 -0500 linux-2.6.9-ide-cd-early-EOF.patch: drivers/ide/ide-cd.c | 101 +++++++++++++++++++++++++++++++++++++++++---------- drivers/ide/ide-io.c | 56 ++++++++++++++++++++++++++++ include/linux/ide.h | 2 + 3 files changed, 141 insertions(+), 18 deletions(-) Index: linux-2.6.9-ide-cd-early-EOF.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-ide-cd-early-EOF.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.9-ide-cd-early-EOF.patch 12 Jan 2005 05:56:44 -0000 1.3 +++ linux-2.6.9-ide-cd-early-EOF.patch 18 Mar 2005 21:54:20 -0000 1.4 @@ -125,10 +125,10 @@ int lun; /* logical unit */ int crc_count; /* crc counter to reduce drive speed */ -@@ -1175,6 +1192,7 @@ - extern int noautodma; +@@ -1127,6 +1127,7 @@ extern int noautodma; extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); + extern int __ide_end_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs); +extern int ide_end_dequeued_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs); /* linux-2.6.9-lockd-reclaims.patch: clntlock.c | 2 +- clntproc.c | 22 +++++++++++++++++++--- host.c | 6 ++++-- xdr4.c | 3 +++ 4 files changed, 27 insertions(+), 6 deletions(-) Index: linux-2.6.9-lockd-reclaims.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-lockd-reclaims.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.9-lockd-reclaims.patch 3 Dec 2004 08:38:21 -0000 1.1 +++ linux-2.6.9-lockd-reclaims.patch 18 Mar 2005 21:54:20 -0000 1.2 @@ -23,7 +23,7 @@ /* --- linux-2.6.9/fs/lockd/host.c.org 2004-10-18 17:54:31.000000000 -0400 +++ linux-2.6.9/fs/lockd/host.c 2004-11-18 07:58:26.263774000 -0500 -@@ -190,15 +190,17 @@ nlm_bind_host(struct nlm_host *host) +@@ -185,9 +185,10 @@ nlm_bind_host(struct nlm_host *host) } } else { xprt = xprt_create_proto(host->h_proto, &host->h_addr, NULL); @@ -35,8 +35,9 @@ + } xprt_set_timeout(&xprt->timeout, 5, nlmsvc_timeout); - clnt = rpc_create_client(xprt, host->h_name, &nlm_program, - host->h_version, host->h_authflavor); + /* Existing NLM servers accept AUTH_UNIX only */ +@@ -195,6 +196,7 @@ nlm_bind_host(struct nlm_host *host) + host->h_version, RPC_AUTH_UNIX); if (IS_ERR(clnt)) { xprt_destroy(xprt); + dprintk("lockd: rpc_create_client failed: %ld\n", PTR_ERR(clnt)); linux-2.6.9-module_version.patch: linux-2.6.10/drivers/scsi/gdth.c | 1 + linux-2.6.11/drivers/block/cciss.c | 1 + linux-2.6.11/drivers/net/ixgb/ixgb_main.c | 4 +++- linux-2.6.9/drivers/block/DAC960.c | 1 + linux-2.6.9/drivers/block/cpqarray.c | 1 + linux-2.6.9/drivers/message/fusion/mptbase.c | 1 + linux-2.6.9/drivers/net/b44.c | 1 + linux-2.6.9/drivers/net/e1000/e1000_main.c | 4 +++- linux-2.6.9/drivers/net/ns83820.c | 1 + linux-2.6.9/drivers/net/tg3.c | 1 + linux-2.6.9/drivers/scsi/3w-9xxx.c | 9 +++++---- linux-2.6.9/drivers/scsi/ahci.c | 1 + 12 files changed, 20 insertions(+), 6 deletions(-) Index: linux-2.6.9-module_version.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-module_version.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6.9-module_version.patch 10 Mar 2005 00:27:17 -0000 1.9 +++ linux-2.6.9-module_version.patch 18 Mar 2005 21:54:20 -0000 1.10 @@ -22,12 +22,12 @@ --- linux-2.6.9/drivers/net/e1000/e1000_main.c~ 2004-12-24 01:16:26.686982200 -0500 +++ linux-2.6.9/drivers/net/e1000/e1000_main.c 2004-12-24 01:17:25.863985928 -0500 -@@ -57,7 +57,8 @@ char e1000_driver_string[] = "Intel(R) P +@@ -65,7 +65,8 @@ char e1000_driver_string[] = "Intel(R) P #else #define DRIVERNAPI "-NAPI" #endif --char e1000_driver_version[] = "5.6.10.1-k2"DRIVERNAPI; -+#define DRV_VERSION "5.6.10.1-k2"DRIVERNAPI; +-char e1000_driver_version[] = "5.7.6-k2"DRIVERNAPI; ++#define DRV_VERSION "5.7.6-k2"DRIVERNAPI; +char e1000_driver_version[] = DRV_VERSION; char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation."; @@ -74,16 +74,16 @@ drivers/net/r8169.c | 1 + 1 files changed, 1 insertion(+) ---- linux-2.6.9/drivers/net/ixgb/ixgb_main.c~ 2004-12-24 01:18:09.990277712 -0500 -+++ linux-2.6.9/drivers/net/ixgb/ixgb_main.c 2004-12-24 01:18:39.562782008 -0500 -@@ -43,7 +43,8 @@ char ixgb_driver_string[] = "Intel(R) PR +--- linux-2.6.11/drivers/net/ixgb/ixgb_main.c~ 2005-03-18 15:59:25.000000000 -0500 ++++ linux-2.6.11/drivers/net/ixgb/ixgb_main.c 2005-03-18 15:59:46.000000000 -0500 +@@ -47,7 +47,8 @@ char ixgb_driver_string[] = "Intel(R) PR #else #define DRIVERNAPI "-NAPI" #endif --char ixgb_driver_version[] = "1.0.87-k2"DRIVERNAPI; -+#define DRV_VERSION "1.0.87-k2"DRIVERNAPI +-char ixgb_driver_version[] = "1.0.90-k2"DRIVERNAPI; ++#define DRV_VERSION "1.0.90-k2"DRIVERNAPI +char ixgb_driver_version[] = DRV_VERSION; - char ixgb_copyright[] = "Copyright (c) 1999-2004 Intel Corporation."; + char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation."; /* ixgb_pci_tbl - PCI Device ID Table @@ -139,6 +140,7 @@ static struct pci_driver ixgb_driver = { @@ -141,16 +141,16 @@ return pci_module_init(&twa_driver); } /* End twa_init() */ ---- linux-2.6.9/drivers/block/cciss.c~ -+++ linux-2.6.9/drivers/block/cciss.c -@@ -52,6 +52,7 @@ - /* Embedded module documentation macros - see modules.h */ - MODULE_AUTHOR("Hewlett-Packard Company"); - MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.4"); -+MODULE_VERSION("2.6.4"); +--- linux-2.6.11/drivers/block/cciss.c~ 2005-03-18 16:00:13.000000000 -0500 ++++ linux-2.6.11/drivers/block/cciss.c 2005-03-18 16:01:53.000000000 -0500 +@@ -54,6 +54,7 @@ MODULE_AUTHOR("Hewlett-Packard Company") + MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.6"); MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400" - " SA6i P600"); + " SA6i P600 P800 E400"); ++MODULE_VERSION("2.6.6"); MODULE_LICENSE("GPL"); + + #include "cciss_cmd.h" --- linux-2.6.9/drivers/block/cpqarray.c-old +++ linux-2.6.9/drivers/block/cpqarray.c @@ -53,6 +53,7 @@ Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- upstream 2 Mar 2005 18:45:30 -0000 1.61 +++ upstream 18 Mar 2005 21:54:20 -0000 1.62 @@ -1 +1,2 @@ linux-2.6.11.tar.bz2 +patch-2.6.12-rc1.bz2 From fedora-cvs-commits at redhat.com Fri Mar 18 21:55:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 16:55:25 -0500 Subject: rpms/kernel/devel linux-2.6.11-devmem.patch, NONE, 1.1 linux-2.6.11-execshield.patch, NONE, 1.1 patch-2.6.12-rc1.bz2.sign, NONE, 1.1 Message-ID: <200503182155.j2ILtPZL008146@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8130 Added Files: linux-2.6.11-devmem.patch linux-2.6.11-execshield.patch patch-2.6.12-rc1.bz2.sign Log Message: new bits linux-2.6.11-devmem.patch: linux-1050/arch/s390/mm/init.c | 5 + linux-1050/fs/proc/kcore.c | 2 linux-2.6.10/include/asm-x86_64/page.h | 4 linux-2.6.11/drivers/char/mem.c | 7 + linux-2.6.3/arch/ia64/mm/init.c | 7 + linux-2.6.3/arch/ppc/mm/init.c | 5 + linux-2.6.8/drivers/char/mem.c | 1 linux-2.6.9/arch/i386/mm/init.c | 19 ++++ linux/arch/x86_64/mm/init.c | 20 ++++ linux/drivers/char/mem.c | 140 ++++----------------------------- linux/include/asm-alpha/page.h | 1 linux/include/asm-arm/page.h | 2 linux/include/asm-arm26/page.h | 2 linux/include/asm-cris/page.h | 2 linux/include/asm-h8300/page.h | 2 linux/include/asm-i386/page.h | 4 linux/include/asm-ia64/page.h | 2 linux/include/asm-m68k/page.h | 2 linux/include/asm-m68knommu/page.h | 2 linux/include/asm-mips/page.h | 2 linux/include/asm-parisc/page.h | 2 linux/include/asm-ppc/page.h | 2 linux/include/asm-ppc64/page.h | 2 linux/include/asm-s390/page.h | 2 linux/include/asm-sh/page.h | 2 linux/include/asm-sh64/page.h | 2 linux/include/asm-sparc/page.h | 2 linux/include/asm-sparc64/page.h | 2 linux/include/asm-um/page.h | 1 linux/include/asm-v850/page.h | 2 ppc64-2.5-pseries/arch/ppc64/mm/init.c | 12 ++ 31 files changed, 136 insertions(+), 126 deletions(-) --- NEW FILE linux-2.6.11-devmem.patch --- --- linux-2.6.9/arch/i386/mm/init.c~ 2004-12-09 00:30:22.439979032 -0500 +++ linux-2.6.9/arch/i386/mm/init.c 2004-12-09 00:31:40.906050376 -0500 @@ -225,6 +225,25 @@ static inline int page_is_ram(unsigned l return 0; } +/* + * devmem_is_allowed() checks to see if /dev/mem access to a certain address is + * valid. The argument is a physical page number. + * + * + * On x86, access has to be given to the first megabyte of ram because that area + * contains bios code and data regions used by X and dosemu and similar apps. + * Access has to be given to non-kernel-ram areas as well, these contain the PCI + * mmio resources as well as potential bios/acpi data regions. + */ +int devmem_is_allowed(unsigned long pagenr) +{ + if (pagenr <= 256) + return 1; + if (!page_is_ram(pagenr)) + return 1; + return 0; +} + #ifdef CONFIG_HIGHMEM pte_t *kmap_pte; pgprot_t kmap_prot; diff -purN linux-2.6.7/arch/x86_64/mm/init.c linux/arch/x86_64/mm/init.c --- linux-2.6.7/arch/x86_64/mm/init.c 2004-07-30 11:41:27.000000000 +0200 +++ linux/arch/x86_64/mm/init.c 2004-07-30 11:54:25.299432577 +0200 @@ -396,6 +396,26 @@ static inline int page_is_ram (unsigned return 0; } +/* + * devmem_is_allowed() checks to see if /dev/mem access to a certain address is + * valid. The argument is a physical page number. + * + * + * On x86-64, access has to be given to the first megabyte of ram because that area + * contains bios code and data regions used by X and dosemu and similar apps. + * Access has to be given to non-kernel-ram areas as well, these contain the PCI + * mmio resources as well as potential bios/acpi data regions. + */ +int devmem_is_allowed(unsigned long pagenr) +{ + if (pagenr <= 256) + return 1; + if (!page_is_ram(pagenr)) + return 1; + return 0; +} + + static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, kcore_vsyscall; diff -purN linux-2.6.7/drivers/char/mem.c linux/drivers/char/mem.c --- linux-2.6.7/drivers/char/mem.c 2004-07-30 11:42:13.000000000 +0200 +++ linux/drivers/char/mem.c 2004-07-30 11:54:25.316430579 +0200 @@ -111,6 +111,19 @@ static inline int valid_phys_addr_range( } #endif +static inline int range_is_allowed(unsigned long from, unsigned long to) +{ + unsigned long cursor; + + cursor = from >> PAGE_SHIFT; + while ((cursor << PAGE_SHIFT) < to) { + if (!devmem_is_allowed(cursor)) + return 0; + cursor++; + } + return 1; +} + /* * This funcion reads the *physical* memory. The f_pos points directly to the * memory location. @@ -173,6 +173,8 @@ static ssize_t read_mem(struct file * fi */ ptr = xlate_dev_mem_ptr(p); + if (!range_is_allowed(p, p+count)) + return -EPERM; if (copy_to_user(buf, ptr, sz)) return -EFAULT; buf += sz; @@ -230,6 +232,8 @@ static ssize_t write_mem(struct file * f */ ptr = xlate_dev_mem_ptr(p); + if (!range_is_allowed(ptr, ptr+sz)) + return -EPERM; copied = copy_from_user(ptr, buf, sz); if (copied) { ssize_t ret; @@ -358,128 +362,6 @@ static ssize_t read_kmem(struct file *fi } -static inline ssize_t -do_write_kmem(void *p, unsigned long realp, const char __user * buf, - size_t count, loff_t *ppos) -{ - ssize_t written, sz; - unsigned long copied; - - written = 0; -#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED - /* we don't have page 0 mapped on sparc and m68k.. */ - if (realp < PAGE_SIZE) { - unsigned long sz = PAGE_SIZE - realp; - if (sz > count) - sz = count; - /* Hmm. Do something? */ - buf += sz; - p += sz; - realp += sz; - count -= sz; - written += sz; - } -#endif - - while (count > 0) { - char *ptr; - /* - * Handle first page in case it's not aligned - */ - if (-realp & (PAGE_SIZE - 1)) - sz = -realp & (PAGE_SIZE - 1); - else - sz = PAGE_SIZE; - - sz = min_t(unsigned long, sz, count); - - /* - * On ia64 if a page has been mapped somewhere as - * uncached, then it must also be accessed uncached - * by the kernel or data corruption may occur - */ - ptr = xlate_dev_kmem_ptr(p); - - copied = copy_from_user(ptr, buf, sz); - if (copied) { - ssize_t ret; - - ret = written + (sz - copied); - if (ret) - return ret; - return -EFAULT; - } - buf += sz; - p += sz; - realp += sz; - count -= sz; - written += sz; - } - - *ppos += written; - return written; -} - - -/* - * This function writes to the *virtual* memory as seen by the kernel. - */ -static ssize_t write_kmem(struct file * file, const char __user * buf, - size_t count, loff_t *ppos) -{ - unsigned long p = *ppos; - ssize_t wrote = 0; - ssize_t virtr = 0; - ssize_t written; - char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ - - if (p < (unsigned long) high_memory) { - - wrote = count; - if (count > (unsigned long) high_memory - p) - wrote = (unsigned long) high_memory - p; - - written = do_write_kmem((void*)p, p, buf, wrote, ppos); - if (written != wrote) - return written; - wrote = written; - p += wrote; - buf += wrote; - count -= wrote; - } - - if (count > 0) { - kbuf = (char *)__get_free_page(GFP_KERNEL); - if (!kbuf) - return wrote ? wrote : -ENOMEM; - while (count > 0) { - int len = count; - - if (len > PAGE_SIZE) - len = PAGE_SIZE; - if (len) { - written = copy_from_user(kbuf, buf, len); - if (written) { - ssize_t ret; - - free_page((unsigned long)kbuf); - ret = wrote + virtr + (len - written); - return ret ? ret : -EFAULT; - } - } - len = vwrite(kbuf, (char *)p, len); - count -= len; - buf += len; - virtr += len; - p += len; - } - free_page((unsigned long)kbuf); - } - - *ppos = p; - return virtr + wrote; -} - #if defined(CONFIG_ISA) || !defined(__mc68000__) static ssize_t read_port(struct file * file, char __user * buf, size_t count, loff_t *ppos) @@ -594,7 +559,6 @@ static struct file_operations mem_fops = static struct file_operations kmem_fops = { .llseek = memory_lseek, .read = read_kmem, - .write = write_kmem, .mmap = mmap_kmem, .open = open_kmem, }; diff -purN linux-2.6.7/include/asm-alpha/page.h linux/include/asm-alpha/page.h --- linux-2.6.7/include/asm-alpha/page.h 2004-06-16 07:19:44.000000000 +0200 +++ linux/include/asm-alpha/page.h 2004-07-30 11:54:25.334428463 +0200 @@ -106,6 +106,7 @@ extern __inline__ int get_order(unsigned #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 #endif /* __KERNEL__ */ #endif /* _ALPHA_PAGE_H */ diff -purN linux-2.6.7/include/asm-arm/page.h linux/include/asm-arm/page.h --- linux-2.6.7/include/asm-arm/page.h 2004-06-16 07:19:01.000000000 +0200 +++ linux/include/asm-arm/page.h 2004-07-30 11:54:25.351426465 +0200 @@ -196,6 +196,8 @@ static inline int get_order(unsigned lon #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif diff -purN linux-2.6.7/include/asm-arm26/page.h linux/include/asm-arm26/page.h --- linux-2.6.7/include/asm-arm26/page.h 2004-06-16 07:19:42.000000000 +0200 +++ linux/include/asm-arm26/page.h 2004-07-30 11:54:25.372423996 +0200 @@ -110,6 +110,8 @@ static inline int get_order(unsigned lon #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif diff -purN linux-2.6.7/include/asm-cris/page.h linux/include/asm-cris/page.h --- linux-2.6.7/include/asm-cris/page.h 2004-06-16 07:19:09.000000000 +0200 +++ linux/include/asm-cris/page.h 2004-07-30 11:54:25.385422468 +0200 @@ -96,6 +96,8 @@ static inline int get_order(unsigned lon #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _CRIS_PAGE_H */ diff -purN linux-2.6.7/include/asm-h8300/page.h linux/include/asm-h8300/page.h --- linux-2.6.7/include/asm-h8300/page.h 2004-06-16 07:19:52.000000000 +0200 +++ linux/include/asm-h8300/page.h 2004-07-30 11:54:25.398420940 +0200 @@ -96,6 +96,8 @@ extern unsigned long memory_end; #endif /* __ASSEMBLY__ */ +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _H8300_PAGE_H */ diff -purN linux-2.6.7/include/asm-i386/page.h linux/include/asm-i386/page.h --- linux-2.6.7/include/asm-i386/page.h 2004-07-30 11:42:33.000000000 +0200 +++ linux/include/asm-i386/page.h 2004-07-30 11:54:25.649391435 +0200 @@ -128,6 +128,8 @@ static __inline__ int get_order(unsigned return order; } +extern int devmem_is_allowed(unsigned long pagenr); + #endif /* __ASSEMBLY__ */ #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) @@ -151,6 +153,8 @@ static __inline__ int get_order(unsigned ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + + #endif /* __KERNEL__ */ #endif /* _I386_PAGE_H */ diff -purN linux-2.6.7/include/asm-ia64/page.h linux/include/asm-ia64/page.h --- linux-2.6.7/include/asm-ia64/page.h 2004-07-30 11:42:32.000000000 +0200 +++ linux/include/asm-ia64/page.h 2004-07-30 11:54:25.427417531 +0200 @@ -187,4 +187,6 @@ get_order (unsigned long size) (((current->personality & READ_IMPLIES_EXEC) != 0) \ ? VM_EXEC : 0)) +#define devmem_is_allowed(x) 1 + #endif /* _ASM_IA64_PAGE_H */ diff -purN linux-2.6.7/include/asm-m68k/page.h linux/include/asm-m68k/page.h --- linux-2.6.7/include/asm-m68k/page.h 2004-07-30 11:42:15.000000000 +0200 +++ linux/include/asm-m68k/page.h 2004-07-30 11:54:25.450414827 +0200 @@ -190,6 +190,8 @@ static inline void *__va(unsigned long x #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _M68K_PAGE_H */ diff -purN linux-2.6.7/include/asm-m68knommu/page.h linux/include/asm-m68knommu/page.h --- linux-2.6.7/include/asm-m68knommu/page.h 2004-06-16 07:19:22.000000000 +0200 +++ linux/include/asm-m68knommu/page.h 2004-07-30 11:54:25.463413299 +0200 @@ -96,6 +96,8 @@ extern unsigned long memory_end; #endif /* __ASSEMBLY__ */ +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _M68KNOMMU_PAGE_H */ diff -purN linux-2.6.7/include/asm-mips/page.h linux/include/asm-mips/page.h --- linux-2.6.7/include/asm-mips/page.h 2004-07-30 11:42:15.000000000 +0200 +++ linux/include/asm-mips/page.h 2004-07-30 11:54:25.486410595 +0200 @@ -137,4 +137,6 @@ static __inline__ int get_order(unsigned #define WANT_PAGE_VIRTUAL #endif +#define devmem_is_allowed(x) 1 + #endif /* _ASM_PAGE_H */ diff -purN linux-2.6.7/include/asm-parisc/page.h linux/include/asm-parisc/page.h --- linux-2.6.7/include/asm-parisc/page.h 2004-06-16 07:19:01.000000000 +0200 +++ linux/include/asm-parisc/page.h 2004-07-30 11:54:25.500408950 +0200 @@ -157,6 +157,8 @@ extern int npmem_ranges; #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _PARISC_PAGE_H */ diff -purN linux-2.6.7/include/asm-ppc/page.h linux/include/asm-ppc/page.h --- linux-2.6.7/include/asm-ppc/page.h 2004-06-16 07:19:02.000000000 +0200 +++ linux/include/asm-ppc/page.h 2004-07-30 11:54:25.515407187 +0200 @@ -163,5 +163,7 @@ extern __inline__ int get_order(unsigned #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _PPC_PAGE_H */ diff -purN linux-2.6.7/include/asm-ppc64/page.h linux/include/asm-ppc64/page.h --- linux-2.6.7/include/asm-ppc64/page.h 2004-06-16 07:18:47.000000000 +0200 +++ linux/include/asm-ppc64/page.h 2004-07-30 11:54:25.530405423 +0200 @@ -245,5 +245,7 @@ extern int page_is_ram(unsigned long phy #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _PPC64_PAGE_H */ diff -purN linux-2.6.7/include/asm-s390/page.h linux/include/asm-s390/page.h --- linux-2.6.7/include/asm-s390/page.h 2004-06-16 07:18:59.000000000 +0200 +++ linux/include/asm-s390/page.h 2004-07-30 11:54:25.543403895 +0200 @@ -181,6 +181,8 @@ typedef struct { unsigned long pgd; } pg #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _S390_PAGE_H */ diff -purN linux-2.6.7/include/asm-sh/page.h linux/include/asm-sh/page.h --- linux-2.6.7/include/asm-sh/page.h 2004-06-16 07:20:03.000000000 +0200 +++ linux/include/asm-sh/page.h 2004-07-30 11:54:25.559402014 +0200 @@ -133,6 +133,8 @@ static __inline__ int get_order(unsigned #endif +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* __ASM_SH_PAGE_H */ diff -purN linux-2.6.7/include/asm-sh64/page.h linux/include/asm-sh64/page.h --- linux-2.6.7/include/asm-sh64/page.h 2004-07-30 11:42:15.000000000 +0200 +++ linux/include/asm-sh64/page.h 2004-07-30 11:54:25.579399663 +0200 @@ -132,6 +132,8 @@ extern __inline__ int get_order(unsigned #endif +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* __ASM_SH64_PAGE_H */ diff -purN linux-2.6.7/include/asm-sparc/page.h linux/include/asm-sparc/page.h --- linux-2.6.7/include/asm-sparc/page.h 2004-06-16 07:19:02.000000000 +0200 +++ linux/include/asm-sparc/page.h 2004-07-30 11:54:25.591398253 +0200 @@ -176,6 +176,8 @@ extern unsigned long pfn_base; #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _SPARC_PAGE_H */ diff -purN linux-2.6.7/include/asm-sparc64/page.h linux/include/asm-sparc64/page.h --- linux-2.6.7/include/asm-sparc64/page.h 2004-07-30 11:42:15.000000000 +0200 +++ linux/include/asm-sparc64/page.h 2004-07-30 11:54:25.603396842 +0200 @@ -165,6 +165,8 @@ static __inline__ int get_order(unsigned #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* !(__KERNEL__) */ #endif /* !(_SPARC64_PAGE_H) */ diff -purN linux-2.6.7/include/asm-um/page.h linux/include/asm-um/page.h --- linux-2.6.7/include/asm-um/page.h 2004-06-16 07:19:36.000000000 +0200 +++ linux/include/asm-um/page.h 2004-07-30 11:54:25.620394844 +0200 @@ -44,5 +44,6 @@ extern struct page *page_mem_map(struct extern struct page *arch_validate(struct page *page, int mask, int order); #define HAVE_ARCH_VALIDATE +#define devmem_is_allowed(x) 1 #endif diff -purN linux-2.6.7/include/asm-v850/page.h linux/include/asm-v850/page.h --- linux-2.6.7/include/asm-v850/page.h 2004-06-16 07:19:36.000000000 +0200 +++ linux/include/asm-v850/page.h 2004-07-30 11:54:25.630393668 +0200 @@ -141,6 +141,8 @@ extern __inline__ int get_order (unsigne #define __va(x) ((void *)__phys_to_virt ((unsigned long)(x))) +#define devmem_is_allowed(x) 1 + #endif /* KERNEL */ #endif /* __V850_PAGE_H__ */ diff -purN linux-2.6.7/include/asm-x86_64/page.h linux/include/asm-x86_64/page.h --- linux-2.6.10/include/asm-x86_64/page.h~ 2005-01-06 22:47:53.000000000 -0500 +++ linux-2.6.10/include/asm-x86_64/page.h 2005-01-06 22:48:27.000000000 -0500 @@ -138,6 +137,10 @@ extern int devmem_is_allowed(unsigned lo #define __HAVE_ARCH_GATE_AREA 1 +#ifndef __ASSEMBLY__ +extern int devmem_is_allowed(unsigned long pagenr); +#endif + #endif /* __KERNEL__ */ #endif /* _X86_64_PAGE_H */ librtas accesses these pages through /dev/mem, so mark them reserved and it gets permitted. diff -urN linux-2.5/arch/ppc64/mm/init.c ppc64-2.5-pseries/arch/ppc64/mm/init.c --- linux-2.5/arch/ppc64/mm/init.c 2004-09-24 15:23:06.000000000 +1000 +++ ppc64-2.5-pseries/arch/ppc64/mm/init.c 2004-10-12 15:41:27.000000000 +1000 @@ -719,6 +719,18 @@ totalram_pages += free_all_bootmem(); #endif +#ifdef CONFIG_PPC_PSERIES + /* Mark the RTAS pages as PG_reserved so userspace can mmap them */ + if (rtas_rmo_buf) { + unsigned long pfn, start_pfn, end_pfn; + + start_pfn = rtas_rmo_buf >> PAGE_SHIFT; + end_pfn = (rtas_rmo_buf + RTAS_RMOBUF_MAX) >> PAGE_SHIFT; + for (pfn = start_pfn; pfn < end_pfn; pfn++) + SetPageReserved(pfn_to_page(pfn)); + } +#endif + for_each_pgdat(pgdat) { for (i = 0; i < pgdat->node_spanned_pages; i++) { page = pgdat->node_mem_map + i; diff -urNp linux-1030/arch/s390/mm/init.c linux-1050/arch/s390/mm/init.c --- linux-1030/arch/s390/mm/init.c +++ linux-1050/arch/s390/mm/init.c @@ -236,6 +236,11 @@ void __init paging_init(void) } #endif /* CONFIG_ARCH_S390X */ +int page_is_ram (unsigned long pagenr) +{ + return pagenr < max_mapnr; +} + void __init mem_init(void) { unsigned long codesize, reservedpages, datasize, initsize; --- linux-2.6.11/drivers/char/mem.c~ 2005-03-18 14:25:26.000000000 -0500 +++ linux-2.6.11/drivers/char/mem.c 2005-03-18 14:25:45.000000000 -0500 @@ -287,6 +287,8 @@ static ssize_t read_kmem(struct file *fi ssize_t read, virtr, sz; char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ + return -EPERM; + read = 0; virtr = 0; if (p < (unsigned long) high_memory) { diff -urNp linux-1030/fs/proc/kcore.c linux-1050/fs/proc/kcore.c --- linux-1030/fs/proc/kcore.c +++ linux-1050/fs/proc/kcore.c @@ -24,7 +24,7 @@ static int open_kcore(struct inode * inode, struct file * filp) { - return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; + return -EPERM; } static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *); --- linux-2.6.3/arch/ppc/mm/init.c~ 2004-03-09 13:41:17.699613784 +0100 +++ linux-2.6.3/arch/ppc/mm/init.c 2004-03-09 13:41:17.699613784 +0100 @@ -632,3 +632,8 @@ } #endif } + +int page_is_ram (unsigned long pagenr) +{ + return 1; +} --- linux-2.6.3/arch/ia64/mm/init.c.bak Mon Mar 8 11:06:25 2004 +++ linux-2.6.3/arch/ia64/mm/init.c Mon Mar 8 11:06:59 2004 @@ -218,6 +218,13 @@ free_initrd_mem (unsigned long start, un } } +int page_is_ram(unsigned long pagenr) +{ + //FIXME: implement w/efi walk + printk("page is ram is called!!!!!\n"); + return 1; +} + /* * This is like put_dirty_page() but installs a clean page in the kernel's page table. */ --- linux-2.6.8/drivers/char/mem.c~ 2004-09-07 10:13:44.106301796 +0200 +++ linux-2.6.8/drivers/char/mem.c 2004-09-07 10:13:44.106301796 +0200 @@ -658,7 +658,6 @@ struct file_operations *fops; } devlist[] = { /* list of minor devices */ {1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops}, - {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, {3, "null", S_IRUGO | S_IWUGO, &null_fops}, #if defined(CONFIG_ISA) || !defined(__mc68000__) {4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops}, --- linux-2.6.11/drivers/char/mem.c~ 2005-03-04 01:00:47.000000000 -0500 +++ linux-2.6.11/drivers/char/mem.c 2005-03-04 01:02:54.000000000 -0500 @@ -117,8 +117,11 @@ static inline int range_is_allowed(unsig cursor = from >> PAGE_SHIFT; while ((cursor << PAGE_SHIFT) < to) { - if (!devmem_is_allowed(cursor)) + if (!devmem_is_allowed(cursor)) { + printk ("Program %s tried to read /dev/mem between %lx->%lx." + "We stopped at %lx\n", current->comm, from, to, cursor); return 0; + } cursor++; } return 1; linux-2.6.11-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/entry.S | 8 +- arch/i386/kernel/process.c | 59 +++++++++++++++++ arch/i386/kernel/signal.c | 4 - arch/i386/kernel/smp.c | 3 arch/i386/kernel/sysenter.c | 55 +++++++++++++++- arch/i386/kernel/traps.c | 48 +++++++++++++- arch/i386/kernel/vsyscall-sysenter.S | 6 - arch/i386/kernel/vsyscall.lds.S | 4 - arch/i386/mm/init.c | 6 + arch/i386/mm/mmap.c | 6 + arch/ia64/ia32/binfmt_elf32.c | 2 arch/x86_64/ia32/ia32_binfmt.c | 2 arch/x86_64/mm/Makefile | 2 arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++++++++++ drivers/char/random.c | 7 +- fs/binfmt_elf.c | 120 ++++++++++++++++++++++++++++------- fs/proc/array.c | 8 +- fs/proc/base.c | 4 - fs/proc/task_mmu.c | 25 +++++-- include/asm-i386/desc.h | 14 ++++ include/asm-i386/elf.h | 42 ++++++++---- include/asm-i386/mmu.h | 6 + include/asm-i386/pgalloc.h | 1 include/asm-i386/processor.h | 8 ++ include/asm-i386/thread_info.h | 1 include/asm-ia64/pgalloc.h | 4 + include/asm-ppc/pgalloc.h | 5 + include/asm-ppc64/pgalloc.h | 5 + include/asm-s390/pgalloc.h | 4 + include/asm-sparc/pgalloc.h | 4 + include/asm-sparc64/pgalloc.h | 4 + include/asm-x86_64/pgalloc.h | 7 ++ include/asm-x86_64/processor.h | 9 ++ include/linux/mm.h | 9 ++ include/linux/resource.h | 5 + include/linux/sched.h | 9 ++ include/linux/sysctl.h | 3 kernel/signal.c | 38 +++++++++++ kernel/sysctl.c | 39 +++++++++++ mm/fremap.c | 10 +- mm/mmap.c | 107 ++++++++++++++++++++++++++++--- mm/mprotect.c | 5 + mm/mremap.c | 4 - 44 files changed, 728 insertions(+), 80 deletions(-) --- NEW FILE linux-2.6.11-execshield.patch --- --- linux/fs/binfmt_elf.c.orig +++ linux/fs/binfmt_elf.c @@ -47,7 +47,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs); static int load_elf_library(struct file*); -static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int); +static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long); extern int dump_fpu (struct pt_regs *, elf_fpregset_t *); #ifndef elf_addr_t @@ -285,20 +285,59 @@ create_elf_tables(struct linux_binprm *b #ifndef elf_map static unsigned long elf_map(struct file *filep, unsigned long addr, - struct elf_phdr *eppnt, int prot, int type) + struct elf_phdr *eppnt, int prot, int type, + unsigned long total_size) { unsigned long map_addr; + unsigned long size = eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr); + unsigned long off = eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr); + + addr = ELF_PAGESTART(addr); + size = ELF_PAGEALIGN(size); down_write(¤t->mm->mmap_sem); - map_addr = do_mmap(filep, ELF_PAGESTART(addr), - eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr), prot, type, - eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr)); + + /* + * total_size is the size of the ELF (interpreter) image. + * The _first_ mmap needs to know the full size, otherwise + * randomization might put this image into an overlapping + * position with the ELF binary image. (since size < total_size) + * So we first map the 'big' image - and unmap the remainder at + * the end. (which unmap is needed for ELF images with holes.) + */ + if (total_size) { + total_size = ELF_PAGEALIGN(total_size); + map_addr = do_mmap(filep, addr, total_size, prot, type, off); + if (!BAD_ADDR(map_addr)) + do_munmap(current->mm, map_addr+size, total_size-size); + } else + map_addr = do_mmap(filep, addr, size, prot, type, off); + up_write(¤t->mm->mmap_sem); - return(map_addr); + + return map_addr; } #endif /* !elf_map */ +static inline unsigned long total_mapping_size(struct elf_phdr *cmds, int nr) +{ + int i, first_idx = -1, last_idx = -1; + + for (i = 0; i < nr; i++) + if (cmds[i].p_type == PT_LOAD) { + last_idx = i; + if (first_idx == -1) + first_idx = i; + } + + if (first_idx == -1) + return 0; + + return cmds[last_idx].p_vaddr + cmds[last_idx].p_memsz - + ELF_PAGESTART(cmds[first_idx].p_vaddr); +} + /* This is much more generalized than the library routine read function, so we keep this separate. Technically the library read function is only provided so that we can read a.out libraries that have @@ -306,7 +345,8 @@ static unsigned long elf_map(struct file static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, struct file * interpreter, - unsigned long *interp_load_addr) + unsigned long *interp_load_addr, + unsigned long no_base) { struct elf_phdr *elf_phdata; struct elf_phdr *eppnt; @@ -314,6 +354,7 @@ static unsigned long load_elf_interp(str int load_addr_set = 0; unsigned long last_bss = 0, elf_bss = 0; unsigned long error = ~0UL; + unsigned long total_size; int retval, i, size; /* First of all, some simple consistency checks */ @@ -352,6 +393,10 @@ static unsigned long load_elf_interp(str goto out_close; } + total_size = total_mapping_size(elf_phdata, interp_elf_ex->e_phnum); + if (!total_size) + goto out_close; + eppnt = elf_phdata; for (i=0; ie_phnum; i++, eppnt++) { if (eppnt->p_type == PT_LOAD) { @@ -366,8 +411,11 @@ static unsigned long load_elf_interp(str vaddr = eppnt->p_vaddr; if (interp_elf_ex->e_type == ET_EXEC || load_addr_set) elf_type |= MAP_FIXED; + else if (no_base && interp_elf_ex->e_type == ET_DYN) + load_addr = -vaddr; - map_addr = elf_map(interpreter, load_addr + vaddr, eppnt, elf_prot, elf_type); + map_addr = elf_map(interpreter, load_addr + vaddr, eppnt, elf_prot, elf_type, total_size); + total_size = 0; error = map_addr; if (BAD_ADDR(map_addr)) goto out_close; @@ -527,7 +575,7 @@ static int load_elf_binary(struct linux_ unsigned long reloc_func_desc = 0; char passed_fileno[6]; struct files_struct *files; - int have_pt_gnu_stack, executable_stack = EXSTACK_DEFAULT; + int have_pt_gnu_stack, executable_stack; unsigned long def_flags = 0; struct { struct elfhdr elf_ex; @@ -683,6 +731,8 @@ static int load_elf_binary(struct linux_ } elf_ppnt = elf_phdata; + executable_stack = EXSTACK_DEFAULT; + for (i = 0; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) if (elf_ppnt->p_type == PT_GNU_STACK) { if (elf_ppnt->p_flags & PF_X) @@ -693,6 +743,11 @@ static int load_elf_binary(struct linux_ } have_pt_gnu_stack = (i < loc->elf_ex.e_phnum); + if (current->personality == PER_LINUX && exec_shield == 2) { + executable_stack = EXSTACK_DISABLE_X; + current->flags |= PF_RANDOMIZE; + } + /* Some simple consistency checks for the interpreter */ if (elf_interpreter) { interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT; @@ -746,6 +801,15 @@ static int load_elf_binary(struct linux_ if (retval) goto out_free_dentry; +#ifdef __i386__ + /* + * Turn off the CS limit completely if exec-shield disabled or + * NX active: + */ + if (!exec_shield || executable_stack != EXSTACK_DISABLE_X || nx_enabled) + arch_add_exec_range(current->mm, -1); +#endif + /* Discard our unneeded old files struct */ if (files) { steal_locks(files); @@ -764,7 +828,8 @@ static int load_elf_binary(struct linux_ /* Do this immediately, since STACK_TOP as used in setup_arg_pages may depend on the personality. */ SET_PERSONALITY(loc->elf_ex, ibcs2_interpreter); - if (elf_read_implies_exec(loc->elf_ex, executable_stack)) + if (exec_shield != 2 && + elf_read_implies_exec(loc->elf_ex, executable_stack)) current->personality |= READ_IMPLIES_EXEC; if ( !(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) @@ -792,10 +857,10 @@ static int load_elf_binary(struct linux_ current->mm->start_stack = bprm->p; + /* Now we do a little grungy work by mmaping the ELF image into - the correct location in memory. At this point, we assume that - the image should be loaded at fixed address, not at a variable - address. */ + the correct location in memory. + */ for(i = 0, elf_ppnt = elf_phdata; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) { int elf_prot = 0, elf_flags; @@ -839,16 +904,16 @@ static int load_elf_binary(struct linux_ elf_flags = MAP_PRIVATE|MAP_DENYWRITE|MAP_EXECUTABLE; vaddr = elf_ppnt->p_vaddr; - if (loc->elf_ex.e_type == ET_EXEC || load_addr_set) { + if (loc->elf_ex.e_type == ET_EXEC || load_addr_set) elf_flags |= MAP_FIXED; - } else if (loc->elf_ex.e_type == ET_DYN) { - /* Try and get dynamic programs out of the way of the default mmap - base, as well as whatever program they might try to exec. This - is because the brk will follow the loader, and is not movable. */ + else if (loc->elf_ex.e_type == ET_DYN) +#ifdef __i386__ + load_bias = 0; +#else load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); - } +#endif - error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags); + error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags, 0); if (BAD_ADDR(error)) { send_sig(SIGKILL, current, 0); goto out_free_dentry; @@ -925,7 +990,8 @@ static int load_elf_binary(struct linux_ else elf_entry = load_elf_interp(&loc->interp_elf_ex, interpreter, - &interp_load_addr); + &interp_load_addr, + load_bias); if (BAD_ADDR(elf_entry)) { printk(KERN_ERR "Unable to load interpreter %.128s\n", elf_interpreter); @@ -949,6 +1015,14 @@ static int load_elf_binary(struct linux_ set_binfmt(&elf_format); + /* + * Map the vsyscall trampoline. This address is then passed via + * AT_SYSINFO. + */ +#ifdef __HAVE_ARCH_VSYSCALL + map_vsyscall(); +#endif + compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; create_elf_tables(bprm, &loc->elf_ex, (interpreter_type == INTERPRETER_AOUT), @@ -962,6 +1036,10 @@ static int load_elf_binary(struct linux_ current->mm->end_data = end_data; current->mm->start_stack = bprm->p; +#ifdef __HAVE_ARCH_RANDOMIZE_BRK + if (current->flags & PF_RANDOMIZE) + randomize_brk(elf_brk); +#endif if (current->personality & MMAP_PAGE_ZERO) { /* Why this, you ask??? Well SVr4 maps page 0 as read-only, and some applications "depend" upon this behavior. --- linux/fs/proc/base.c.orig +++ linux/fs/proc/base.c @@ -142,7 +142,7 @@ static struct pid_entry tgid_base_stuff[ E(PROC_TGID_CMDLINE, "cmdline", S_IFREG|S_IRUGO), E(PROC_TGID_STAT, "stat", S_IFREG|S_IRUGO), E(PROC_TGID_STATM, "statm", S_IFREG|S_IRUGO), - E(PROC_TGID_MAPS, "maps", S_IFREG|S_IRUGO), + E(PROC_TGID_MAPS, "maps", S_IFREG|S_IRUSR), E(PROC_TGID_MEM, "mem", S_IFREG|S_IRUSR|S_IWUSR), #ifdef CONFIG_SECCOMP E(PROC_TGID_SECCOMP, "seccomp", S_IFREG|S_IRUSR|S_IWUSR), @@ -178,7 +178,7 @@ static struct pid_entry tid_base_stuff[] E(PROC_TID_CMDLINE, "cmdline", S_IFREG|S_IRUGO), E(PROC_TID_STAT, "stat", S_IFREG|S_IRUGO), E(PROC_TID_STATM, "statm", S_IFREG|S_IRUGO), - E(PROC_TID_MAPS, "maps", S_IFREG|S_IRUGO), + E(PROC_TID_MAPS, "maps", S_IFREG|S_IRUSR), E(PROC_TID_MEM, "mem", S_IFREG|S_IRUSR|S_IWUSR), #ifdef CONFIG_SECCOMP E(PROC_TID_SECCOMP, "seccomp", S_IFREG|S_IRUSR|S_IWUSR), --- linux/fs/proc/array.c.orig +++ linux/fs/proc/array.c @@ -385,8 +385,12 @@ static int do_task_stat(struct task_stru ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0; read_unlock(&tasklist_lock); - if (!whole || num_threads<2) - wchan = get_wchan(task); + if (!whole || num_threads<2) { + wchan = 0; + if (current->uid == task->uid || current->euid == task->uid || + capable(CAP_SYS_NICE)) + wchan = get_wchan(task); + } if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt; --- linux/fs/proc/task_mmu.c.orig +++ linux/fs/proc/task_mmu.c @@ -21,13 +21,23 @@ char *task_mem(struct mm_struct *mm, cha "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" "VmLib:\t%8lu kB\n" - "VmPTE:\t%8lu kB\n", + "VmPTE:\t%8lu kB\n" + "StaBrk:\t%08lx kB\n" + "Brk:\t%08lx kB\n" + "StaStk:\t%08lx kB\n" + , (mm->total_vm - mm->reserved_vm) << (PAGE_SHIFT-10), mm->locked_vm << (PAGE_SHIFT-10), mm->rss << (PAGE_SHIFT-10), data << (PAGE_SHIFT-10), mm->stack_vm << (PAGE_SHIFT-10), text, lib, - (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10); + (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10, + mm->start_brk, mm->brk, mm->start_stack); +#if __i386__ + if (!nx_enabled) + buffer += sprintf(buffer, + "ExecLim:\t%08lx\n", mm->context.exec_limit); +#endif return buffer; } @@ -107,7 +117,13 @@ static int show_map(struct seq_file *m, map->vm_end, flags & VM_READ ? 'r' : '-', flags & VM_WRITE ? 'w' : '-', - flags & VM_EXEC ? 'x' : '-', + (flags & VM_EXEC +#ifdef __i386__ + || (!nx_enabled && + (map->vm_start < task->mm->context.exec_limit)) +#endif + ) + ? 'x' : '-', flags & VM_MAYSHARE ? 's' : 'p', map->vm_pgoff << PAGE_SHIFT, MAJOR(dev), MINOR(dev), ino, &len); @@ -121,8 +137,7 @@ static int show_map(struct seq_file *m, seq_path(m, file->f_vfsmnt, file->f_dentry, ""); } else { if (mm) { - if (map->vm_start <= mm->start_brk && - map->vm_end >= mm->brk) { + if (map->vm_end == mm->brk) { pad_len_spaces(m, len); seq_puts(m, "[heap]"); } else { --- linux/mm/mprotect.c.orig +++ linux/mm/mprotect.c @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -105,7 +106,7 @@ mprotect_fixup(struct vm_area_struct *vm struct mm_struct *mm = vma->vm_mm; unsigned long oldflags = vma->vm_flags; long nrpages = (end - start) >> PAGE_SHIFT; - unsigned long charged = 0; + unsigned long charged = 0, old_end = vma->vm_end; pgprot_t newprot; pgoff_t pgoff; int error; @@ -166,6 +167,8 @@ success: */ vma->vm_flags = newflags; vma->vm_page_prot = newprot; + if (oldflags & VM_EXEC) + arch_remove_exec_range(current->mm, old_end); change_protection(vma, start, end, newprot); __vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); __vm_stat_account(mm, newflags, vma->vm_file, nrpages); --- linux/mm/mremap.c.orig +++ linux/mm/mremap.c @@ -398,8 +398,8 @@ unsigned long do_mremap(unsigned long ad if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; - new_addr = get_unmapped_area(vma->vm_file, 0, new_len, - vma->vm_pgoff, map_flags); + new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len, + vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC); ret = new_addr; if (new_addr & ~PAGE_MASK) goto out; --- linux/mm/fremap.c.orig +++ linux/mm/fremap.c @@ -85,10 +85,12 @@ int install_page(struct mm_struct *mm, s * caller about it. */ err = -EINVAL; - inode = vma->vm_file->f_mapping->host; - size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; - if (!page->mapping || page->index >= size) - goto err_unlock; + if (vma->vm_file) { + inode = vma->vm_file->f_mapping->host; + size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; + if (!page->mapping || page->index >= size) + goto err_unlock; + } zap_pte(mm, vma, addr, pte); --- linux/mm/mmap.c.orig +++ linux/mm/mmap.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -334,6 +335,8 @@ static inline void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, struct rb_node *rb_parent) { + if (vma->vm_flags & VM_EXEC) + arch_add_exec_range(mm, vma->vm_end); if (prev) { vma->vm_next = prev->vm_next; prev->vm_next = vma; @@ -438,6 +441,8 @@ __vma_unlink(struct mm_struct *mm, struc rb_erase(&vma->vm_rb, &mm->mm_rb); if (mm->mmap_cache == vma) mm->mmap_cache = prev; + if (vma->vm_flags & VM_EXEC) + arch_remove_exec_range(mm, vma->vm_end); } /* @@ -743,6 +748,8 @@ struct vm_area_struct *vma_merge(struct } else /* cases 2, 5, 7 */ vma_adjust(prev, prev->vm_start, end, prev->vm_pgoff, NULL); + if (prev->vm_flags & VM_EXEC) + arch_add_exec_range(mm, prev->vm_end); return prev; } @@ -914,7 +921,7 @@ unsigned long do_mmap_pgoff(struct file /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ - addr = get_unmapped_area(file, addr, len, pgoff, flags); + addr = get_unmapped_area_prot(file, addr, len, pgoff, flags, prot & PROT_EXEC); if (addr & ~PAGE_MASK) return addr; @@ -1293,9 +1300,10 @@ void arch_unmap_area_topdown(struct vm_a area->vm_mm->free_area_cache = area->vm_mm->mmap_base; } + unsigned long -get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, - unsigned long pgoff, unsigned long flags) +get_unmapped_area_prot(struct file *file, unsigned long addr, unsigned long len, + unsigned long pgoff, unsigned long flags, int exec) { if (flags & MAP_FIXED) { unsigned long ret; @@ -1327,10 +1335,80 @@ get_unmapped_area(struct file *file, uns return file->f_op->get_unmapped_area(file, addr, len, pgoff, flags); - return current->mm->get_unmapped_area(file, addr, len, pgoff, flags); + if (exec && current->mm->get_unmapped_exec_area) + return current->mm->get_unmapped_exec_area(file, addr, len, pgoff, flags); + else + return current->mm->get_unmapped_area(file, addr, len, pgoff, flags); +} + +EXPORT_SYMBOL(get_unmapped_area_prot); + + +#define SHLIB_BASE 0x00111000 + +unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0, + unsigned long len0, unsigned long pgoff, unsigned long flags) +{ + unsigned long addr = addr0, len = len0; + struct mm_struct *mm = current->mm; + struct vm_area_struct *vma; + unsigned long tmp; + + if (len > TASK_SIZE) + return -ENOMEM; + + if (!addr && !(flags & MAP_FIXED)) + addr = randomize_range(SHLIB_BASE, 0x01000000, len); + + if (addr) { + addr = PAGE_ALIGN(addr); + vma = find_vma(mm, addr); + if (TASK_SIZE - len >= addr && + (!vma || addr + len <= vma->vm_start)) { + return addr; + } + } + + addr = SHLIB_BASE; + + for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { + /* At this point: (!vma || addr < vma->vm_end). */ + if (TASK_SIZE - len < addr) { + return -ENOMEM; + } + if (!vma || addr + len <= vma->vm_start) { + /* + * Must not let a PROT_EXEC mapping get into the + * brk area: + */ + if (addr + len > mm->brk) + goto failed; + + /* + * Up until the brk area we randomize addresses + * as much as possible: + */ + if (addr >= 0x01000000) { + tmp = randomize_range(0x01000000, mm->brk, len); + vma = find_vma(mm, tmp); + if (TASK_SIZE - len >= tmp && + (!vma || tmp + len <= vma->vm_start)) + return tmp; + } + /* + * Ok, randomization didnt work out - return + * the result of the linear search: + */ + return addr; + } + addr = vma->vm_end; + } + +failed: + return current->mm->get_unmapped_area(filp, addr0, len0, pgoff, flags); } -EXPORT_SYMBOL(get_unmapped_area); + /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr) @@ -1405,6 +1483,14 @@ out: return prev ? prev->vm_next : vma; } +static int over_stack_limit(unsigned long sz) +{ + if (sz < EXEC_STACK_BIAS) + return 0; + return (sz - EXEC_STACK_BIAS) > + current->signal->rlim[RLIMIT_STACK].rlim_cur; +} + /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the @@ -1420,7 +1506,7 @@ static int acct_stack_growth(struct vm_a return -ENOMEM; /* Stack limit test */ - if (size > rlim[RLIMIT_STACK].rlim_cur) + if (over_stack_limit(size)) return -ENOMEM; /* mlock limit tests */ @@ -1760,10 +1846,14 @@ int split_vma(struct mm_struct * mm, str if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); - if (new_below) + if (new_below) { + unsigned long old_end = vma->vm_end; + vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff + ((addr - new->vm_start) >> PAGE_SHIFT), new); - else + if (vma->vm_flags & VM_EXEC) + arch_remove_exec_range(mm, old_end); + } else vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; @@ -1981,6 +2071,7 @@ void exit_mmap(struct mm_struct *mm) mm->rss = 0; mm->total_vm = 0; mm->locked_vm = 0; + arch_flush_exec_range(mm); spin_unlock(&mm->page_table_lock); --- linux/kernel/signal.c.orig +++ linux/kernel/signal.c @@ -1193,6 +1193,37 @@ kill_proc_info(int sig, struct siginfo * return error; } +int print_fatal_signals = 0; + +static void print_fatal_signal(struct pt_regs *regs, int signr) +{ + printk("%s/%d: potentially unexpected fatal signal %d.\n", + current->comm, current->pid, signr); + +#ifdef __i386__ + printk("code at %08lx: ", regs->eip); + { + int i; + for (i = 0; i < 16; i++) { + unsigned char insn; + + __get_user(insn, (unsigned char *)(regs->eip + i)); + printk("%02x ", insn); + } + } +#endif + printk("\n"); + show_regs(regs); +} + +static int __init setup_print_fatal_signals(char *str) +{ + get_option (&str, &print_fatal_signals); + + return 1; +} + +__setup("print-fatal-signals=", setup_print_fatal_signals); /* * kill_something_info() interprets pid in interesting ways just like kill(2). @@ -1844,6 +1875,11 @@ relock: if (!signr) break; /* will return 0 */ + if ((signr == SIGSEGV) && print_fatal_signals) { + spin_unlock_irq(¤t->sighand->siglock); + print_fatal_signal(regs, signr); + spin_lock_irq(¤t->sighand->siglock); + } if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) { ptrace_signal_deliver(regs, cookie); @@ -1939,6 +1975,8 @@ relock: * Anything else is fatal, maybe with a core dump. */ current->flags |= PF_SIGNALED; + if (print_fatal_signals) + print_fatal_signal(regs, signr); if (sig_kernel_coredump(signr)) { /* * If it was able to dump core, this kills all --- linux/kernel/sysctl.c.orig +++ linux/kernel/sysctl.c @@ -72,6 +72,19 @@ extern int proc_unknown_nmi_panic(ctl_ta void __user *, size_t *, loff_t *); #endif +extern unsigned int vdso_enabled; + +int exec_shield = 1; + +static int __init setup_exec_shield(char *str) +{ + get_option (&str, &exec_shield); + + return 1; +} + +__setup("exec-shield=", setup_exec_shield); + /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ static int maxolduid = 65535; static int minolduid; @@ -275,6 +288,32 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { + .ctl_name = KERN_EXEC_SHIELD, + .procname = "exec-shield", + .data = &exec_shield, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = KERN_PRINT_FATAL, + .procname = "print-fatal-signals", + .data = &print_fatal_signals, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, +#if __i386__ + { + .ctl_name = KERN_VDSO, + .procname = "vdso", + .data = &vdso_enabled, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, +#endif + { .ctl_name = KERN_CORE_USES_PID, .procname = "core_uses_pid", .data = &core_uses_pid, --- linux/arch/x86_64/mm/mmap.c.orig +++ linux/arch/x86_64/mm/mmap.c @@ -0,0 +1,95 @@ +/* + * linux/arch/x86-64/mm/mmap.c + * + * flexible mmap layout support + * + * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * + * Started by Ingo Molnar + */ + +#include +#include +#include + +/* + * Top of mmap area (just below the process stack). + * + * Leave an at least ~128 MB hole. + */ +#define MIN_GAP (128*1024*1024) +#define MAX_GAP (TASK_SIZE/6*5) + +static inline unsigned long mmap_base(void) +{ + unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; + + if (gap < MIN_GAP) + gap = MIN_GAP; + else if (gap > MAX_GAP) + gap = MAX_GAP; + + return TASK_SIZE - (gap & PAGE_MASK); +} + +static inline int mmap_is_legacy(void) +{ + /* + * Force standard allocation for 64 bit programs. + */ + if (!test_thread_flag(TIF_IA32)) + return 1; + + if (current->personality & ADDR_COMPAT_LAYOUT) + return 1; + + if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) + return 1; + + return sysctl_legacy_va_layout; +} + +/* + * This function, called very early during the creation of a new + * process VM image, sets up which VM layout function to use: + */ +void arch_pick_mmap_layout(struct mm_struct *mm) +{ + /* + * Fall back to the standard layout if the personality + * bit is set, or if the expected stack growth is unlimited: + */ + if (mmap_is_legacy()) { + mm->mmap_base = TASK_UNMAPPED_BASE; + mm->get_unmapped_area = arch_get_unmapped_area; + mm->unmap_area = arch_unmap_area; + } else { + mm->mmap_base = mmap_base(); + mm->get_unmapped_area = arch_get_unmapped_area_topdown; + mm->unmap_area = arch_unmap_area_topdown; + } +} + +unsigned long arch_align_stack(unsigned long sp) +{ + if (current->flags & PF_RANDOMIZE) + sp -= get_random_int() % 8192; + return sp & ~0xf; +} + --- linux/arch/x86_64/mm/Makefile.orig +++ linux/arch/x86_64/mm/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux x86_64-specific parts of the memory manager. # -obj-y := init.o fault.o ioremap.o extable.o pageattr.o +obj-y := init.o fault.o ioremap.o extable.o pageattr.o mmap.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_DISCONTIGMEM) += numa.o obj-$(CONFIG_K8_NUMA) += k8topology.o --- linux/arch/x86_64/ia32/ia32_binfmt.c.orig +++ linux/arch/x86_64/ia32/ia32_binfmt.c @@ -395,7 +395,7 @@ int setup_arg_pages(struct linux_binprm } static unsigned long -elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type) +elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused) { unsigned long map_addr; struct task_struct *me = current; --- linux/arch/ia64/ia32/binfmt_elf32.c.orig +++ linux/arch/ia64/ia32/binfmt_elf32.c @@ -272,7 +272,7 @@ elf32_set_personality (void) } static unsigned long -elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type) +elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused) { unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; --- linux/arch/i386/mm/mmap.c.orig +++ linux/arch/i386/mm/mmap.c @@ -62,15 +62,17 @@ void arch_pick_mmap_layout(struct mm_str * Fall back to the standard layout if the personality * bit is set, or if the expected stack growth is unlimited: */ - if (sysctl_legacy_va_layout || + if ((exec_shield != 2) && (sysctl_legacy_va_layout || (current->personality & ADDR_COMPAT_LAYOUT) || - current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) { + current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY)) { mm->mmap_base = TASK_UNMAPPED_BASE; mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(mm); mm->get_unmapped_area = arch_get_unmapped_area_topdown; + if (!(current->personality & READ_IMPLIES_EXEC)) + mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; mm->unmap_area = arch_unmap_area_topdown; } } --- linux/arch/i386/mm/init.c.orig +++ linux/arch/i386/mm/init.c @@ -400,7 +400,7 @@ u64 __supported_pte_mask = ~_PAGE_NX; * Control non executable mappings. * * on Enable - * off Disable + * off Disable (disables exec-shield too) */ void __init noexec_setup(const char *str) { @@ -410,6 +410,7 @@ void __init noexec_setup(const char *str } else if (!strncmp(str,"off",3)) { disable_nx = 1; __supported_pte_mask &= ~_PAGE_NX; + exec_shield = 0; } } @@ -474,7 +475,10 @@ void __init paging_init(void) set_nx(); if (nx_enabled) printk("NX (Execute Disable) protection: active\n"); + else #endif + if (exec_shield) + printk("Using x86 segment limits to approximate NX protection\n"); pagetable_init(); --- linux/arch/i386/kernel/vsyscall.lds.S.orig +++ linux/arch/i386/kernel/vsyscall.lds.S @@ -7,7 +7,7 @@ SECTIONS { - . = VSYSCALL_BASE + SIZEOF_HEADERS; + . = SIZEOF_HEADERS; .hash : { *(.hash) } :text .dynsym : { *(.dynsym) } @@ -20,7 +20,7 @@ SECTIONS For the layouts to match, we need to skip more than enough space for the dynamic symbol table et al. If this amount is insufficient, ld -shared will barf. Just increase it here. */ - . = VSYSCALL_BASE + 0x400; + . = 0x400; .text : { *(.text) } :text =0x90909090 --- linux/arch/i386/kernel/asm-offsets.c.orig +++ linux/arch/i386/kernel/asm-offsets.c @@ -53,6 +53,7 @@ void foo(void) OFFSET(TI_preempt_count, thread_info, preempt_count); OFFSET(TI_addr_limit, thread_info, addr_limit); OFFSET(TI_restart_block, thread_info, restart_block); + OFFSET(TI_sysenter_return, thread_info, sysenter_return); BLANK(); OFFSET(EXEC_DOMAIN_handler, exec_domain, handler); --- linux/arch/i386/kernel/signal.c.orig +++ linux/arch/i386/kernel/signal.c @@ -380,7 +380,7 @@ static void setup_frame(int sig, struct goto give_sigsegv; } - restorer = &__kernel_sigreturn; + restorer = current->mm->context.vdso + (long)&__kernel_sigreturn; if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; @@ -475,7 +475,7 @@ static void setup_rt_frame(int sig, stru goto give_sigsegv; /* Set up to return from userspace. */ - restorer = &__kernel_rt_sigreturn; + restorer = current->mm->context.vdso + (long)&__kernel_rt_sigreturn; if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; err |= __put_user(restorer, &frame->pretcode); --- linux/arch/i386/kernel/entry.S.orig +++ linux/arch/i386/kernel/entry.S @@ -201,8 +201,12 @@ sysenter_past_esp: pushl %ebp pushfl pushl $(__USER_CS) - pushl $SYSENTER_RETURN - + /* + * Push current_thread_info()->sysenter_return to the stack. + * A tiny bit of offset fixup is necessary - 4*4 means the 4 words + * pushed above, and the word being pushed now: + */ + pushl (TI_sysenter_return-THREAD_SIZE+4*4)(%esp) /* * Load the potential sixth argument from user stack. * Careful about security. --- linux/arch/i386/kernel/process.c.orig +++ linux/arch/i386/kernel/process.c @@ -582,6 +582,8 @@ struct task_struct fastcall * __switch_t /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); + if (next_p->mm) + load_user_cs_desc(cpu, next_p->mm); /* * Reload esp0, LDT and the page table pointer: @@ -835,3 +837,60 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() % 8192; return sp & ~0xf; } + +void arch_add_exec_range(struct mm_struct *mm, unsigned long limit) +{ + if (limit > mm->context.exec_limit) { + mm->context.exec_limit = limit; + set_user_cs(&mm->context.user_cs, limit); + if (mm == current->mm) { + preempt_disable(); + load_user_cs_desc(smp_processor_id(), mm); + preempt_enable(); + } + } +} + +void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end) +{ + struct vm_area_struct *vma; + unsigned long limit = PAGE_SIZE; + + if (old_end == mm->context.exec_limit) { + for (vma = mm->mmap; vma; vma = vma->vm_next) + if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) + limit = vma->vm_end; + + mm->context.exec_limit = limit; + set_user_cs(&mm->context.user_cs, limit); + if (mm == current->mm) { + preempt_disable(); + load_user_cs_desc(smp_processor_id(), mm); + preempt_enable(); + } + } +} + +void arch_flush_exec_range(struct mm_struct *mm) +{ + mm->context.exec_limit = 0; + set_user_cs(&mm->context.user_cs, 0); +} + +/* + * Generate random brk address between 128MB and 196MB. (if the layout + * allows it.) + */ +void randomize_brk(unsigned long old_brk) +{ + unsigned long new_brk, range_start, range_end; + + range_start = 0x08000000; + if (current->mm->brk >= range_start) + range_start = current->mm->brk; + range_end = range_start + 0x02000000; + new_brk = randomize_range(range_start, range_end, 0); + if (new_brk) + current->mm->brk = new_brk; +} + --- linux/arch/i386/kernel/traps.c.orig +++ linux/arch/i386/kernel/traps.c @@ -452,6 +452,10 @@ DO_ERROR(11, SIGBUS, "segment not prese DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) +/* + * the original non-exec stack patch was written by + * Solar Designer . Thanks! + */ fastcall void do_general_protection(struct pt_regs * regs, long error_code) { int cpu = get_cpu(); @@ -482,7 +486,6 @@ fastcall void do_general_protection(stru put_cpu(); return; } - put_cpu(); if (regs->eflags & VM_MASK) goto gp_in_vm86; @@ -490,17 +493,60 @@ fastcall void do_general_protection(stru if (!(regs->xcs & 3)) goto gp_in_kernel; + /* + * lazy-check for CS validity on exec-shield binaries: + */ + if (current->mm) { + struct desc_struct *desc1, *desc2; + struct vm_area_struct *vma; + unsigned long limit = PAGE_SIZE; + + spin_lock(¤t->mm->page_table_lock); + for (vma = current->mm->mmap; vma; vma = vma->vm_next) + if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) + limit = vma->vm_end; + spin_unlock(¤t->mm->page_table_lock); + + current->mm->context.exec_limit = limit; + set_user_cs(¤t->mm->context.user_cs, limit); + + desc1 = ¤t->mm->context.user_cs; + desc2 = per_cpu(cpu_gdt_table, cpu) + GDT_ENTRY_DEFAULT_USER_CS; + + /* + * The CS was not in sync - reload it and retry the + * instruction. If the instruction still faults then + * we wont hit this branch next time around. + */ + if (desc1->a != desc2->a || desc1->b != desc2->b) { + if (print_fatal_signals >= 2) { + printk("#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code, error_code/8, regs->eip, smp_processor_id()); + printk(" exec_limit: %08lx, user_cs: %08lx/%08lx, CPU_cs: %08lx/%08lx.\n", current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b); + } + load_user_cs_desc(cpu, current->mm); + put_cpu(); + return; + } + } + put_cpu(); + if (print_fatal_signals) { + printk("#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code, error_code/8, regs->eip, smp_processor_id()); + printk(" exec_limit: %08lx, user_cs: %08lx/%08lx.\n", current->mm->context.exec_limit, current->mm->context.user_cs.a, current->mm->context.user_cs.b); + } + current->thread.error_code = error_code; current->thread.trap_no = 13; force_sig(SIGSEGV, current); return; gp_in_vm86: + put_cpu(); local_irq_enable(); handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code); return; gp_in_kernel: + put_cpu(); if (!fixup_exception(regs)) { if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) --- linux/arch/i386/kernel/smp.c.orig +++ linux/arch/i386/kernel/smp.c @@ -22,6 +22,7 @@ #include #include +#include #include /* @@ -313,6 +314,8 @@ fastcall void smp_invalidate_interrupt(s unsigned long cpu; cpu = get_cpu(); + if (current->active_mm) + load_user_cs_desc(cpu, current->active_mm); if (!cpu_isset(cpu, flush_cpumask)) goto out; --- linux/arch/i386/kernel/vsyscall-sysenter.S.orig +++ linux/arch/i386/kernel/vsyscall-sysenter.S @@ -24,11 +24,11 @@ __kernel_vsyscall: /* 7: align return point with nop's to make disassembly easier */ .space 7,0x90 - /* 14: System call restart point is here! (SYSENTER_RETURN - 2) */ + /* 14: System call restart point is here! (SYSENTER_RETURN_OFFSET-2) */ jmp .Lenter_kernel /* 16: System call normal return point is here! */ - .globl SYSENTER_RETURN /* Symbol used by entry.S. */ -SYSENTER_RETURN: + .globl SYSENTER_RETURN_OFFSET /* Symbol used by sysenter.c */ +SYSENTER_RETURN_OFFSET: pop %ebp .Lpop_ebp: pop %edx --- linux/arch/i386/kernel/sysenter.c.orig +++ linux/arch/i386/kernel/sysenter.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -41,11 +42,20 @@ void enable_sep_cpu(void *info) extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; +struct page *sysenter_page; + static int __init sysenter_setup(void) { void *page = (void *)get_zeroed_page(GFP_ATOMIC); - __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC); + /* + * We keep this page mapped readonly, even though the executable + * portion is randomized into a userspace vma - so that we dont + * have to fix up the data within the VDSO page every time we + * exec(). + */ + __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_KERNEL_RO); + sysenter_page = virt_to_page(page); if (!boot_cpu_has(X86_FEATURE_SEP)) { memcpy(page, @@ -63,3 +73,46 @@ static int __init sysenter_setup(void) } __initcall(sysenter_setup); + +extern void SYSENTER_RETURN_OFFSET; + +unsigned int vdso_enabled = 0; + +void map_vsyscall(void) +{ + struct thread_info *ti = current_thread_info(); + struct vm_area_struct *vma; + unsigned long addr; + + if (unlikely(!vdso_enabled)) { + current->mm->context.vdso = NULL; + return; + } + + /* + * Map the vDSO (it will be randomized): + */ + down_write(¤t->mm->mmap_sem); + addr = do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, 0); + current->mm->context.vdso = (void *)addr; + ti->sysenter_return = (void *)addr + (long)&SYSENTER_RETURN_OFFSET; + if (addr != -1) { + vma = find_vma(current->mm, addr); + if (vma) { + pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; + get_page(sysenter_page); + install_page(current->mm, vma, addr, + sysenter_page, vma->vm_page_prot); + + } + } + up_write(¤t->mm->mmap_sem); +} + +static int __init vdso_setup(char *str) +{ + vdso_enabled = simple_strtoul(str, NULL, 0); + return 1; +} +__setup("vdso=", vdso_setup); + --- linux/drivers/char/random.c.orig +++ linux/drivers/char/random.c @@ -1600,13 +1600,18 @@ EXPORT_SYMBOL(secure_tcpv6_port_ephemera */ unsigned int get_random_int(void) { + unsigned int val = 0; + +#ifdef CONFIG_X86_HAS_TSC + rdtscl(val); +#endif /* * Use IP's RNG. It suits our purpose perfectly: it re-keys itself * every second, from the entropy pool (and thus creates a limited * drain on it), and uses halfMD4Transform within the second. We * also mix it with jiffies and the PID: */ - return secure_ip_id(current->pid + jiffies); + return secure_ip_id(current->pid + jiffies + (int)val); } /* --- linux/include/asm-ia64/pgalloc.h.orig +++ linux/include/asm-ia64/pgalloc.h @@ -23,6 +23,10 @@ #include #include +#define arch_add_exec_range(mm, limit) do { ; } while (0) +#define arch_flush_exec_range(mm) do { ; } while (0) +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + /* * Very stupidly, we used to get new pgd's and pmd's, init their contents * to point to the NULL versions of the next level page table, later on --- linux/include/asm-sparc/pgalloc.h.orig +++ linux/include/asm-sparc/pgalloc.h @@ -66,4 +66,8 @@ BTFIXUPDEF_CALL(void, pte_free, struct p #define pte_free(pte) BTFIXUP_CALL(pte_free)(pte) #define __pte_free_tlb(tlb, pte) pte_free(pte) +#define arch_add_exec_range(mm, limit) do { ; } while (0) +#define arch_flush_exec_range(mm) do { ; } while (0) +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC_PGALLOC_H */ --- linux/include/asm-s390/pgalloc.h.orig +++ linux/include/asm-s390/pgalloc.h @@ -19,6 +19,10 @@ #include #include +#define arch_add_exec_range(mm, limit) do { ; } while (0) +#define arch_flush_exec_range(mm) do { ; } while (0) +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #define check_pgt_cache() do {} while (0) extern void diag10(unsigned long addr); --- linux/include/asm-ppc/pgalloc.h.orig +++ linux/include/asm-ppc/pgalloc.h @@ -40,5 +40,10 @@ extern void pte_free(struct page *pte); #define check_pgt_cache() do { } while (0) +#define arch_add_exec_range(mm, limit) do { ; } while (0) +#define arch_flush_exec_range(mm) do { ; } while (0) +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + + #endif /* _PPC_PGALLOC_H */ #endif /* __KERNEL__ */ --- linux/include/linux/resource.h.orig +++ linux/include/linux/resource.h @@ -52,8 +52,11 @@ struct rlimit { /* * Limit the stack by to some sane default: root can always * increase this limit if needed.. 8MB seems reasonable. + * + * (2MB more to cover randomization effects.) */ -#define _STK_LIM (8*1024*1024) +#define _STK_LIM (10*1024*1024) +#define EXEC_STACK_BIAS (2*1024*1024) /* * GPG wants 32kB of mlocked memory, to make sure pass phrases --- linux/include/linux/sysctl.h.orig +++ linux/include/linux/sysctl.h @@ -84,6 +84,9 @@ enum KERN_CAP_BSET=14, /* int: capability bounding set */ KERN_PANIC=15, /* int: panic timeout */ + KERN_EXEC_SHIELD=1000, /* int: exec-shield enabled (0/1/2) */ + KERN_PRINT_FATAL=1001, /* int: print fatal signals (0/1/2) */ + KERN_VDSO=1002, /* int: VDSO enabled (0/1) */ KERN_REALROOTDEV=16, /* real root device to mount after initrd */ KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ --- linux/include/linux/sched.h.orig +++ linux/include/linux/sched.h @@ -36,6 +36,8 @@ #include struct exec_domain; +extern int exec_shield; +extern int print_fatal_signals; /* * cloning flags: @@ -197,6 +199,10 @@ extern int sysctl_max_map_count; extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); + +extern unsigned long +arch_get_unmapped_exec_area(struct file *, unsigned long, unsigned long, + unsigned long, unsigned long); extern unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, @@ -212,6 +218,9 @@ struct mm_struct { unsigned long (*get_unmapped_area) (struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); + unsigned long (*get_unmapped_exec_area) (struct file *filp, + unsigned long addr, unsigned long len, + unsigned long pgoff, unsigned long flags); void (*unmap_area) (struct vm_area_struct *area); unsigned long mmap_base; /* base of mmap area */ unsigned long free_area_cache; /* first hole */ --- linux/include/linux/mm.h.orig +++ linux/include/linux/mm.h @@ -728,7 +728,14 @@ extern struct vm_area_struct *copy_vma(s unsigned long addr, unsigned long len, pgoff_t pgoff); extern void exit_mmap(struct mm_struct *); -extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); +extern unsigned long get_unmapped_area_prot(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, int); + + +static inline unsigned long get_unmapped_area(struct file * file, unsigned long addr, + unsigned long len, unsigned long pgoff, unsigned long flags) +{ + return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +} extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, --- linux/include/asm-i386/mmu.h.orig +++ linux/include/asm-i386/mmu.h @@ -7,11 +7,17 @@ * we put the segment information here. * * cpu_vm_mask is used to optimize ldt flushing. + * + * exec_limit is used to track the range PROT_EXEC + * mappings span. */ typedef struct { int size; struct semaphore sem; void *ldt; + struct desc_struct user_cs; + unsigned long exec_limit; + void *vdso; } mm_context_t; #endif --- linux/include/asm-i386/processor.h.orig +++ linux/include/asm-i386/processor.h @@ -303,7 +303,10 @@ extern int bootloader_type; /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ -#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) +#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE/3) + +#define __HAVE_ARCH_ALIGN_STACK +extern unsigned long arch_align_stack(unsigned long sp); #define HAVE_ARCH_PICK_MMAP_LAYOUT @@ -485,6 +488,9 @@ static inline void load_esp0(struct tss_ regs->xcs = __USER_CS; \ regs->eip = new_eip; \ regs->esp = new_esp; \ + preempt_disable(); \ + load_user_cs_desc(smp_processor_id(), current->mm); \ + preempt_enable(); \ } while (0) /* Forward declaration, a strange C thing */ --- linux/include/asm-i386/desc.h.orig +++ linux/include/asm-i386/desc.h @@ -135,6 +135,20 @@ static inline unsigned long get_desc_bas return base; } +static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) +{ + limit = (limit - 1) / PAGE_SIZE; + desc->a = limit & 0xffff; + desc->b = (limit & 0xf0000) | 0x00c0fb00; +} + +#define load_user_cs_desc(cpu, mm) \ + per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs + +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); +extern void arch_flush_exec_range(struct mm_struct *mm); + #endif /* !__ASSEMBLY__ */ #endif --- linux/include/asm-i386/thread_info.h.orig +++ linux/include/asm-i386/thread_info.h @@ -38,6 +38,7 @@ struct thread_info { 0-0xBFFFFFFF for user-thead 0-0xFFFFFFFF for kernel-thread */ + void *sysenter_return; struct restart_block restart_block; unsigned long previous_esp; /* ESP of the previous stack in case --- linux/include/asm-i386/pgalloc.h.orig +++ linux/include/asm-i386/pgalloc.h @@ -4,6 +4,7 @@ #include #include #include +#include #include #include /* for struct page */ --- linux/include/asm-i386/elf.h.orig +++ linux/include/asm-i386/elf.h @@ -9,6 +9,7 @@ #include #include #include /* for savesegment */ +#include #include @@ -133,15 +134,22 @@ extern int dump_task_extended_fpu (struc #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs) #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs) -#define VSYSCALL_BASE (__fix_to_virt(FIX_VSYSCALL)) -#define VSYSCALL_EHDR ((const struct elfhdr *) VSYSCALL_BASE) -#define VSYSCALL_ENTRY ((unsigned long) &__kernel_vsyscall) extern void __kernel_vsyscall; +#define VSYSCALL_BASE ((unsigned long)current->mm->context.vdso) +#define VSYSCALL_EHDR ((const struct elfhdr *) VSYSCALL_BASE) +#define VSYSCALL_OFFSET ((unsigned long) &__kernel_vsyscall) +#define VSYSCALL_ENTRY (VSYSCALL_BASE + VSYSCALL_OFFSET) -#define ARCH_DLINFO \ -do { \ - NEW_AUX_ENT(AT_SYSINFO, VSYSCALL_ENTRY); \ - NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL_BASE); \ +/* kernel-internal fixmap address: */ +#define __VSYSCALL_BASE (__fix_to_virt(FIX_VSYSCALL)) +#define __VSYSCALL_EHDR ((const struct elfhdr *) __VSYSCALL_BASE) + +#define ARCH_DLINFO \ +do { \ + if (VSYSCALL_BASE) { \ + NEW_AUX_ENT(AT_SYSINFO, VSYSCALL_ENTRY); \ + NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL_BASE); \ + } \ } while (0) /* @@ -152,15 +160,15 @@ do { \ * Dumping its extra ELF program headers includes all the other information * a debugger needs to easily find how the vsyscall DSO was being used. */ -#define ELF_CORE_EXTRA_PHDRS (VSYSCALL_EHDR->e_phnum) +#define ELF_CORE_EXTRA_PHDRS (__VSYSCALL_EHDR->e_phnum) #define ELF_CORE_WRITE_EXTRA_PHDRS \ do { \ const struct elf_phdr *const vsyscall_phdrs = \ - (const struct elf_phdr *) (VSYSCALL_BASE \ - + VSYSCALL_EHDR->e_phoff); \ + (const struct elf_phdr *) (__VSYSCALL_BASE \ + + __VSYSCALL_EHDR->e_phoff); \ int i; \ Elf32_Off ofs = 0; \ - for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) { \ + for (i = 0; i < __VSYSCALL_EHDR->e_phnum; ++i) { \ struct elf_phdr phdr = vsyscall_phdrs[i]; \ if (phdr.p_type == PT_LOAD) { \ BUG_ON(ofs != 0); \ @@ -178,10 +186,10 @@ do { \ #define ELF_CORE_WRITE_EXTRA_DATA \ do { \ const struct elf_phdr *const vsyscall_phdrs = \ - (const struct elf_phdr *) (VSYSCALL_BASE \ - + VSYSCALL_EHDR->e_phoff); \ + (const struct elf_phdr *) (__VSYSCALL_BASE \ + + __VSYSCALL_EHDR->e_phoff); \ int i; \ - for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) { \ + for (i = 0; i < __VSYSCALL_EHDR->e_phnum; ++i) { \ if (vsyscall_phdrs[i].p_type == PT_LOAD) \ DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr, \ PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ @@ -190,4 +198,10 @@ do { \ #endif +#define __HAVE_ARCH_RANDOMIZE_BRK +extern void randomize_brk(unsigned long old_brk); + +#define __HAVE_ARCH_VSYSCALL +extern void map_vsyscall(void); + #endif --- linux/include/asm-ppc64/pgalloc.h.orig +++ linux/include/asm-ppc64/pgalloc.h @@ -11,6 +11,11 @@ extern kmem_cache_t *zero_cache; +/* Dummy functions since we don't support execshield on ppc */ +#define arch_add_exec_range(mm, limit) do { ; } while (0) +#define arch_flush_exec_range(mm) do { ; } while (0) +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + /* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License --- linux/include/asm-sparc64/pgalloc.h.orig +++ linux/include/asm-sparc64/pgalloc.h @@ -250,4 +250,8 @@ static inline void pte_free(struct page #define pgd_free(pgd) free_pgd_fast(pgd) #define pgd_alloc(mm) get_pgd_fast() +#define arch_add_exec_range(mm, limit) do { ; } while (0) +#define arch_flush_exec_range(mm) do { ; } while (0) +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC64_PGALLOC_H */ --- linux/include/asm-x86_64/processor.h.orig +++ linux/include/asm-x86_64/processor.h @@ -163,6 +163,15 @@ static inline void clear_in_cr4 (unsigne */ #define TASK_SIZE (0x800000000000UL) +#define TASK_SIZE_64 (0x800000000000) + +#define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64) + +#define __HAVE_ARCH_ALIGN_STACK +extern unsigned long arch_align_stack(unsigned long sp); + +#define HAVE_ARCH_PICK_MMAP_LAYOUT + /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ --- linux/include/asm-x86_64/pgalloc.h.orig +++ linux/include/asm-x86_64/pgalloc.h @@ -7,6 +7,13 @@ #include #include +#define arch_add_exec_range(mm, limit) \ + do { (void)(mm), (void)(limit); } while (0) +#define arch_flush_exec_range(mm) \ + do { (void)(mm); } while (0) +#define arch_remove_exec_range(mm, limit) \ + do { (void)(mm), (void)(limit); } while (0) + #define pmd_populate_kernel(mm, pmd, pte) \ set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte))) #define pud_populate(mm, pud, pmd) \ --- NEW FILE patch-2.6.12-rc1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBCOksMyGugalF9Dw4RApIAAJ9yZHzcN79RAToabN1syo0Wn5z12ACdECmK 5brFFzOQr1IATJ95r8HgnXU= =vOkd -----END PGP SIGNATURE----- From fedora-cvs-commits at redhat.com Fri Mar 18 22:02:50 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 17:02:50 -0500 Subject: rpms/kernel/devel linux-2.6.0-devmem.patch, 1.13, NONE linux-2.6.11-devmem-whodunnit.patch, 1.2, NONE linux-2.6.7-devmem.patch, 1.9, NONE Message-ID: <200503182202.j2IM2o2g008421@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8398 Removed Files: linux-2.6.0-devmem.patch linux-2.6.11-devmem-whodunnit.patch linux-2.6.7-devmem.patch Log Message: no longer needed --- linux-2.6.0-devmem.patch DELETED --- --- linux-2.6.11-devmem-whodunnit.patch DELETED --- --- linux-2.6.7-devmem.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 18 22:25:08 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 17:25:08 -0500 Subject: rpms/selinux-policy-strict/devel policy-20050317.patch,1.1,1.2 Message-ID: <200503182225.j2IMP8mS023075@cvs.devel.redhat.com> Update of /cvs/dist/rpms/selinux-policy-strict/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23061 Modified Files: policy-20050317.patch Log Message: * Fri Mar 18 2005 Dan Walsh 1.23.3-2 - Allow cups/lpd to bind to a port policy-20050317.patch: ChangeLog | 5 ----- domains/program/crond.te | 4 ++-- domains/program/logrotate.te | 2 +- domains/program/syslogd.te | 13 +++++++++++-- domains/program/unused/apache.te | 2 ++ domains/program/unused/arpwatch.te | 6 ++++++ domains/program/unused/consoletype.te | 1 + domains/program/unused/cups.te | 2 ++ domains/program/unused/dhcpc.te | 1 + domains/program/unused/dovecot.te | 17 +++++++++++++++-- domains/program/unused/firstboot.te | 2 ++ domains/program/unused/games.te | 3 +++ domains/program/unused/mozilla.te | 3 +++ domains/program/unused/mrtg.te | 2 +- domains/program/unused/mta.te | 11 +---------- file_contexts/program/dovecot.fc | 3 +++ macros/program/games_domain.te | 19 +++++++++++++++++-- macros/program/gift_macros.te | 16 +++++++--------- macros/program/mozilla_macros.te | 12 ++++++++---- macros/program/mplayer_macros.te | 20 ++++++++++++-------- macros/program/screen_macros.te | 2 +- macros/program/tvtime_macros.te | 10 ++++++++-- macros/program/x_client_macros.te | 32 ++------------------------------ tunables/distro.tun | 2 +- tunables/tunable.tun | 12 ++++++------ 25 files changed, 116 insertions(+), 86 deletions(-) Index: policy-20050317.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/policy-20050317.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- policy-20050317.patch 18 Mar 2005 20:47:49 -0000 1.1 +++ policy-20050317.patch 18 Mar 2005 22:25:05 -0000 1.2 @@ -434,7 +434,7 @@ define(`screen_domain',` # Derived domain based on the calling user domain and the program. -type $1_screen_t, domain, privlog, privfd; -+type $1_screen_t, domain, privlog, privfdm, nscd_client_domain; ++type $1_screen_t, domain, privlog, privfd, nscd_client_domain; # Transition from the user domain to this domain. domain_auto_trans($1_t, screen_exec_t, $1_screen_t) From fedora-cvs-commits at redhat.com Fri Mar 18 22:25:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 17:25:59 -0500 Subject: rpms/xloadimage/FC-2 xloadimage-4.1-buffer.patch,1.2,1.3 Message-ID: <200503182225.j2IMPx6C023166@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xloadimage/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv23131/FC-2 Modified Files: xloadimage-4.1-buffer.patch Log Message: handle bad ppms better xloadimage-4.1-buffer.patch: config.c | 6 +++--- faces.c | 12 +++++++++--- imagetypes.c | 2 +- new.c | 17 ++++++++++++++--- options.c | 13 +++++++++---- packtar.c | 9 ++++++--- 6 files changed, 42 insertions(+), 17 deletions(-) Index: xloadimage-4.1-buffer.patch =================================================================== RCS file: /cvs/dist/rpms/xloadimage/FC-2/xloadimage-4.1-buffer.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xloadimage-4.1-buffer.patch 18 Mar 2005 21:20:12 -0000 1.2 +++ xloadimage-4.1-buffer.patch 18 Mar 2005 22:25:55 -0000 1.3 @@ -126,8 +126,8 @@ for (p = new_file; p = strchr(p, '/'); p++) { *p = '\0'; /* stomp directory separator */ ---- xloadimage.4.1/new.c.overflow 2005-03-18 15:55:53.000000000 -0500 -+++ xloadimage.4.1/new.c 2005-03-18 15:57:50.000000000 -0500 +--- xloadimage.4.1/new.c.foo 2005-03-18 17:21:01.000000000 -0500 ++++ xloadimage.4.1/new.c 2005-03-18 17:22:16.000000000 -0500 @@ -112,6 +112,17 @@ lfree((byte *)rgb->blue); } @@ -137,7 +137,7 @@ + unsigned int r; + + r = a * b; -+ if (r/a != b) { ++ if (r ==0 || r/a != b) { + memoryExhausted(); + } + return r; @@ -146,7 +146,7 @@ Image *newBitImage(width, height) unsigned int width, height; { Image *image; -@@ -128,7 +138,7 @@ +@@ -128,7 +139,7 @@ image->height= height; image->depth= 1; linelen= (width / 8) + (width % 8 ? 1 : 0); /* thanx johnh at amcc.com */ @@ -155,3 +155,21 @@ return(image); } +@@ -149,7 +160,7 @@ + image->height= height; + image->depth= depth; + image->pixlen= pixlen; +- image->data= (unsigned char *)lmalloc(width * height * pixlen); ++ image->data= (unsigned char *)lmalloc(ovmul(ovmul(width,height),pixlen)); + return(image); + } + +@@ -165,7 +176,7 @@ + image->height= height; + image->depth= 24; + image->pixlen= 3; +- image->data= (unsigned char *)lmalloc(width * height * 3); ++ image->data= (unsigned char *)lmalloc(ovmul(ovmul(width,height),3)); + return(image); + } + From fedora-cvs-commits at redhat.com Fri Mar 18 22:25:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 17:25:59 -0500 Subject: rpms/xloadimage/FC-3 xloadimage-4.1-buffer.patch,1.2,1.3 Message-ID: <200503182225.j2IMPxwb023177@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xloadimage/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv23131/FC-3 Modified Files: xloadimage-4.1-buffer.patch Log Message: handle bad ppms better xloadimage-4.1-buffer.patch: config.c | 6 +++--- faces.c | 12 +++++++++--- imagetypes.c | 2 +- new.c | 17 ++++++++++++++--- options.c | 13 +++++++++---- packtar.c | 9 ++++++--- 6 files changed, 42 insertions(+), 17 deletions(-) Index: xloadimage-4.1-buffer.patch =================================================================== RCS file: /cvs/dist/rpms/xloadimage/FC-3/xloadimage-4.1-buffer.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xloadimage-4.1-buffer.patch 18 Mar 2005 21:20:12 -0000 1.2 +++ xloadimage-4.1-buffer.patch 18 Mar 2005 22:25:55 -0000 1.3 @@ -126,8 +126,8 @@ for (p = new_file; p = strchr(p, '/'); p++) { *p = '\0'; /* stomp directory separator */ ---- xloadimage.4.1/new.c.overflow 2005-03-18 15:55:53.000000000 -0500 -+++ xloadimage.4.1/new.c 2005-03-18 15:57:50.000000000 -0500 +--- xloadimage.4.1/new.c.foo 2005-03-18 17:21:01.000000000 -0500 ++++ xloadimage.4.1/new.c 2005-03-18 17:22:16.000000000 -0500 @@ -112,6 +112,17 @@ lfree((byte *)rgb->blue); } @@ -137,7 +137,7 @@ + unsigned int r; + + r = a * b; -+ if (r/a != b) { ++ if (r ==0 || r/a != b) { + memoryExhausted(); + } + return r; @@ -146,7 +146,7 @@ Image *newBitImage(width, height) unsigned int width, height; { Image *image; -@@ -128,7 +138,7 @@ +@@ -128,7 +139,7 @@ image->height= height; image->depth= 1; linelen= (width / 8) + (width % 8 ? 1 : 0); /* thanx johnh at amcc.com */ @@ -155,3 +155,21 @@ return(image); } +@@ -149,7 +160,7 @@ + image->height= height; + image->depth= depth; + image->pixlen= pixlen; +- image->data= (unsigned char *)lmalloc(width * height * pixlen); ++ image->data= (unsigned char *)lmalloc(ovmul(ovmul(width,height),pixlen)); + return(image); + } + +@@ -165,7 +176,7 @@ + image->height= height; + image->depth= 24; + image->pixlen= 3; +- image->data= (unsigned char *)lmalloc(width * height * 3); ++ image->data= (unsigned char *)lmalloc(ovmul(ovmul(width,height),3)); + return(image); + } + From fedora-cvs-commits at redhat.com Fri Mar 18 22:54:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 17:54:00 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1187,1.1188 Message-ID: <200503182254.j2IMs0ht028059@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28046 Modified Files: kernel-2.6.spec Log Message: fix build whilst xen is broken Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1187 retrieving revision 1.1188 diff -u -r1.1187 -r1.1188 --- kernel-2.6.spec 18 Mar 2005 21:54:20 -0000 1.1187 +++ kernel-2.6.spec 18 Mar 2005 22:53:57 -0000 1.1188 @@ -9,7 +9,7 @@ %define buildup 1 %define buildsmp 1 %if %{FC4} -%define buildxen 1 +%define buildxen 0 %endif %define builddoc 0 @@ -45,7 +45,7 @@ %define builddoc 1 %define buildup 0 %define buildsmp 0 -%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}*.config +%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config %endif # Second, per-architecture exclusions (ifarch) @@ -120,7 +120,6 @@ %define signmodules 1 %endif - # # Three sets of minimum package version requirements in the form of Conflicts: # to versions below the minimum @@ -723,11 +722,14 @@ # now run oldconfig over all the config files -for i in *.config +for i in *.config do mv $i .config Arch=`head -1 .config | cut -b 3-` +# UGLY hack until Xen builds again +%if %{buildxen} make ARCH=$Arch nonint_oldconfig > /dev/null +%endif echo "# $Arch" > configs/$i cat .config >> configs/$i done From fedora-cvs-commits at redhat.com Fri Mar 18 23:44:39 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 18:44:39 -0500 Subject: rpms/system-config-bind/devel system-config-bind.spec,1.15,1.16 Message-ID: <200503182344.j2INidYO021890@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21875 Modified Files: system-config-bind.spec Log Message: Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- system-config-bind.spec 17 Mar 2005 00:50:34 -0000 1.15 +++ system-config-bind.spec 18 Mar 2005 23:44:37 -0000 1.16 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 4.2 +Release: 4.3 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind From fedora-cvs-commits at redhat.com Fri Mar 18 23:44:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 18:44:56 -0500 Subject: rpms/system-config-bind/devel sources,1.16,1.17 Message-ID: <200503182344.j2INiuDF021940@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21927 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 17 Mar 2005 00:50:34 -0000 1.16 +++ sources 18 Mar 2005 23:44:54 -0000 1.17 @@ -1 +1 @@ -84db01e7bfcb337875cf02172700d15c system-config-bind-4.0.0.tar.gz +159599c20fb6c60b6283c655adb40bec system-config-bind-4.0.0.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 18 23:49:08 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 18:49:08 -0500 Subject: rpms/MAKEDEV/devel .cvsignore, 1.38, 1.39 MAKEDEV.spec, 1.38, 1.39 sources, 1.38, 1.39 Message-ID: <200503182349.j2INn8Yx025251@cvs.devel.redhat.com> Update of /cvs/dist/rpms/MAKEDEV/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25228/devel Modified Files: .cvsignore MAKEDEV.spec sources Log Message: auto-import MAKEDEV-3.15.1-1 on branch devel from MAKEDEV-3.15.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/MAKEDEV/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 17 Mar 2005 21:16:47 -0000 1.38 +++ .cvsignore 18 Mar 2005 23:49:05 -0000 1.39 @@ -1 +1 @@ -MAKEDEV-3.19-1.tar.gz +MAKEDEV-3.15.1-1.tar.gz Index: MAKEDEV.spec =================================================================== RCS file: /cvs/dist/rpms/MAKEDEV/devel/MAKEDEV.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- MAKEDEV.spec 17 Mar 2005 21:16:47 -0000 1.38 +++ MAKEDEV.spec 18 Mar 2005 23:49:05 -0000 1.39 @@ -1,5 +1,5 @@ Name: MAKEDEV -Version: 3.19 +Version: 3.15.1 Release: 1 Group: System Environment/Base License: GPL @@ -48,45 +48,8 @@ %config %{_sysconfdir}/makedev.d %changelog -* Thu Mar 17 2005 Nalin Dahyabhai 3.19-1 -- skip over subdirectories in /etc/makedev.d (#150766) instead of spitting - out an error (or warning, if -i was used) and quitting - -* Tue Mar 15 2005 Nalin Dahyabhai 3.18-1 -- update to 10 February devices-2.6+.txt: - - remove vtx - - remove vttunner - - add mga_vid - - add infiniband - - add biometrics - - add ttyVR,cuvr - - add ipath -- restruct symlink target creation to exact (-X) mode - -* Thu Jan 20 2005 Nalin Dahyabhai 3.17-1 -- update to 7 January 2005 devices.txt: - - add midishare -- move cpu/*/microcode to cpu/microcode to match udev's behavior (#144887) -- create targets of symlinks if they don't exist - -* Tue Dec 21 2004 Nalin Dahyabhai 3.16-3 -- raise number of loop devices from 16 to 256 (Kenneth Lee) -- create 'vmware' alias for vnet,vmnet,vmmon devices -- change vmnet->vnet to vmnet0->vnet0, so that it isn't left dangling - -* Wed Dec 8 2004 Nalin Dahyabhai 3.16-2 -- remove ataraid devices (#140175) - -* Mon Nov 29 2004 Nalin Dahyabhai 3.16-1 -- allow devices to be specified either as "device" or "devdir"[/]"device" -- update to 22 November 2004 devices.txt: - - add fuse - - add ttyCPM,cucpm - - add ttyIOC4,cuioc4 - - rename user-mode block devices to avoid conflict with ub block device - -* Fri Nov 12 2004 Nalin Dahyabhai 3.15-3 -- rebuild +* Fri Mar 18 2005 Nalin Dahyabhai 3.15.1-1 +- rename cpu/%d/microcode to cpu/microcode (BZ#144887, IT#64152) * Fri Nov 12 2004 Nalin Dahyabhai 3.15-2 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/MAKEDEV/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 17 Mar 2005 21:16:47 -0000 1.38 +++ sources 18 Mar 2005 23:49:05 -0000 1.39 @@ -1 +1 @@ -38639670ebd3a1d2eca6437f3bd47b97 MAKEDEV-3.19-1.tar.gz +9fa1b96d8965ba4814e6f2e441f43ef3 MAKEDEV-3.15.1-1.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 18 23:58:57 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 18:58:57 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1188,1.1189 Message-ID: <200503182358.j2INwvvt003885@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3867 Modified Files: kernel-2.6.spec Log Message: fix build Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1188 retrieving revision 1.1189 diff -u -r1.1188 -r1.1189 --- kernel-2.6.spec 18 Mar 2005 22:53:57 -0000 1.1188 +++ kernel-2.6.spec 18 Mar 2005 23:58:55 -0000 1.1189 @@ -727,9 +727,9 @@ mv $i .config Arch=`head -1 .config | cut -b 3-` # UGLY hack until Xen builds again -%if %{buildxen} +if [ "$Arch" != "xen" ]; then make ARCH=$Arch nonint_oldconfig > /dev/null -%endif +fi echo "# $Arch" > configs/$i cat .config >> configs/$i done From fedora-cvs-commits at redhat.com Fri Mar 18 23:58:57 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 18:58:57 -0500 Subject: rpms/kernel/devel/configs config-ppc64-generic,1.1,1.2 Message-ID: <200503182358.j2INwvX5003893@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv3867/configs Modified Files: config-ppc64-generic Log Message: fix build Index: config-ppc64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64-generic,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-ppc64-generic 6 Feb 2005 05:49:11 -0000 1.1 +++ config-ppc64-generic 18 Mar 2005 23:58:55 -0000 1.2 @@ -99,3 +99,4 @@ CONFIG_KPROBES=y # CONFIG_BLK_DEV_VIA82CXXX is not set +CONFIG_PMAC_SMU=y From fedora-cvs-commits at redhat.com Sat Mar 19 00:08:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 19:08:41 -0500 Subject: rpms/kernel/devel/configs config-ppc-generic,1.1,1.2 Message-ID: <200503190008.j2J08fbK004224@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv4190/configs Modified Files: config-ppc-generic Log Message: new options for ppc Index: config-ppc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc-generic,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-ppc-generic 6 Feb 2005 05:49:11 -0000 1.1 +++ config-ppc-generic 19 Mar 2005 00:08:38 -0000 1.2 @@ -178,3 +178,8 @@ # drivers/md/raid6altivec1.c:111: error: request for member `cpu_features' in something not a structure or union # drivers/md/raid6altivec2.c:110: warning: implicit declaration of function `enable_kernel_altivec' # CONFIG_MD_RAID6 is not set + +# CONFIG_PM_DEBUG is not set +# CONFIG_SOFTWARE_SUSPEND is not set +# CONFIG_SENSORS_M41T00 is not set + From fedora-cvs-commits at redhat.com Sat Mar 19 00:24:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 19:24:36 -0500 Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.16,1.17 Message-ID: <200503190024.j2J0OaJF015413@cvs.devel.redhat.com> Update of /cvs/dist/rpms/hal-cups-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7462 Modified Files: hal-cups-utils.spec Log Message: wrong BuildRequires don't need explicit glib2 require, it is implicit INSTALL is generic source building instructions, not useful Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- hal-cups-utils.spec 8 Mar 2005 03:53:33 -0000 1.16 +++ hal-cups-utils.spec 19 Mar 2005 00:24:33 -0000 1.17 @@ -1,13 +1,13 @@ Summary: Halified CUPS utilities Name: hal-cups-utils Version: 0.5.3 -Release: 2 +Release: 3 License: GPL Group: Applications/System Source: %{name}-%{version}.tar.bz2 Source1: hal_lpadmin.fdi BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: glib2 +BuildRequires: glib2-devel BuildRequires: dbus-devel BuildRequires: hal-devel >= 0.5.0 BuildRequires: dbus-devel >= 0.31 @@ -16,7 +16,6 @@ Requires: hal >= 0.5.0 Requires: dbus >= 0.31 Requires: cups -Requires: glib2 Requires: system-config-printer %description @@ -62,7 +61,7 @@ %files %defattr(-, root, root) -%doc AUTHORS COPYING INSTALL ChangeLog NEWS README +%doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/cups-config-daemon %{_sbindir}/hal_lpadmin %{_libdir}/cups/backend/hal @@ -71,6 +70,9 @@ %{_sysconfdir}/rc.d/init.d/cups-config-daemon %changelog +* Fri Mar 18 2005 Warren Togami - 0.5.3-1 - Add a build reqiures and requires for dbus >= 0.31 - Rebuild with HAL 0.5.0 and D-BUS 0.31 From fedora-cvs-commits at redhat.com Sat Mar 19 00:34:09 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 19:34:09 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1189,1.1190 Message-ID: <200503190034.j2J0Y9eZ018579@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18558 Modified Files: kernel-2.6.spec Log Message: fix compile Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1189 retrieving revision 1.1190 diff -u -r1.1189 -r1.1190 --- kernel-2.6.spec 18 Mar 2005 23:58:55 -0000 1.1189 +++ kernel-2.6.spec 19 Mar 2005 00:34:07 -0000 1.1190 @@ -45,7 +45,7 @@ %define builddoc 1 %define buildup 0 %define buildsmp 0 -%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config +%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config %endif # Second, per-architecture exclusions (ifarch) From fedora-cvs-commits at redhat.com Sat Mar 19 00:34:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 19:34:10 -0500 Subject: rpms/kernel/devel/configs config-ia64-generic,1.1,1.2 Message-ID: <200503190034.j2J0YABO018587@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv18558/configs Modified Files: config-ia64-generic Log Message: fix compile Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-ia64-generic 6 Feb 2005 05:49:11 -0000 1.1 +++ config-ia64-generic 19 Mar 2005 00:34:07 -0000 1.2 @@ -67,6 +67,7 @@ # CONFIG_AGP_I460=y CONFIG_AGP_HP_ZX1=y +CONFIG_AGP_SGI_TIOCA=y # # HP Simulator drivers From fedora-cvs-commits at redhat.com Sat Mar 19 00:49:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 19:49:31 -0500 Subject: rpms/kernel/devel/configs config-ppc64-generic,1.2,1.3 Message-ID: <200503190049.j2J0nVVi021854@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv21841/configs Modified Files: config-ppc64-generic Log Message: buildfix Index: config-ppc64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-ppc64-generic 18 Mar 2005 23:58:55 -0000 1.2 +++ config-ppc64-generic 19 Mar 2005 00:49:28 -0000 1.3 @@ -14,7 +14,8 @@ CONFIG_LPARCFG=y CONFIG_PPC_SPLPAR=y CONFIG_FB_OF=y -CONFIG_FB_MATROX=y +# FIXME: BUILD_BREAK 18/Mar/2005 +# CONFIG_FB_MATROX is not set CONFIG_XMON=y CONFIG_XMON_DEFAULT=y # CONFIG_PPCDBG is not set From fedora-cvs-commits at redhat.com Sat Mar 19 01:03:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 20:03:28 -0500 Subject: rpms/kernel/devel/configs config-ppc-generic,1.2,1.3 Message-ID: <200503190103.j2J13Svh000583@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv571/configs Modified Files: config-ppc-generic Log Message: build fix Index: config-ppc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-ppc-generic 19 Mar 2005 00:08:38 -0000 1.2 +++ config-ppc-generic 19 Mar 2005 01:03:26 -0000 1.3 @@ -179,6 +179,11 @@ # drivers/md/raid6altivec2.c:110: warning: implicit declaration of function `enable_kernel_altivec' # CONFIG_MD_RAID6 is not set +# FIXME: BUILD_BREAK 18/Mar/2005 +# drivers/video/aty/aty128fb.c:1771: undefined reference to `mac_find_mode' +# drivers/built-in.o(.init.text+0x2bb0):drivers/video/aty/aty128fb.c:1807: undefined reference to `mac_vmode_to_var' +# CONFIG_FB_MATROX is not se + # CONFIG_PM_DEBUG is not set # CONFIG_SOFTWARE_SUSPEND is not set # CONFIG_SENSORS_M41T00 is not set From fedora-cvs-commits at redhat.com Sat Mar 19 01:15:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 20:15:31 -0500 Subject: rpms/kernel/devel/configs config-ppc-generic,1.3,1.4 Message-ID: <200503190115.j2J1FVJL003854@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv3841/configs Modified Files: config-ppc-generic Log Message: build fix Index: config-ppc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc-generic,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-ppc-generic 19 Mar 2005 01:03:26 -0000 1.3 +++ config-ppc-generic 19 Mar 2005 01:15:28 -0000 1.4 @@ -148,7 +148,11 @@ CONFIG_FB_ATY=y CONFIG_FB_ATY_XL_INIT=y -CONFIG_FB_ATY128=y + +# FIXME: BUILD_BREAK 18/Mar/2005 +# drivers/video/aty/aty128fb.c:1771: undefined reference to `mac_find_mode' +# drivers/built-in.o(.init.text+0x2bb0):drivers/video/aty/aty128fb.c:1807: undefined reference to `mac_vmode_to_var' +# CONFIG_FB_ATY128 is not set CONFIG_NVRAM=y CONFIG_DEBUG_SPINLOCK is not set From fedora-cvs-commits at redhat.com Sat Mar 19 01:27:53 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 20:27:53 -0500 Subject: rpms/kernel/devel/configs config-ppc-generic,1.4,1.5 Message-ID: <200503190127.j2J1RrN6014965@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv14952/configs Modified Files: config-ppc-generic Log Message: build fix Index: config-ppc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc-generic,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config-ppc-generic 19 Mar 2005 01:15:28 -0000 1.4 +++ config-ppc-generic 19 Mar 2005 01:27:49 -0000 1.5 @@ -146,7 +146,10 @@ CONFIG_SND_POWERMAC=m CONFIG_BOOTX_TEXT=y -CONFIG_FB_ATY=y +# FIXME: BUILD_BREAK 18/Mar/2005 +# drivers/built-in.o(.text+0x2017c):drivers/video/aty/atyfb_base.c:2509: undefined reference to `mac_vmode_to_var' +# drivers/built-in.o(.text+0x2066c):drivers/video/aty/atyfb_base.c:2502: undefined reference to `mac_map_monitor_sense' +# CONFIG_FB_ATY is not set CONFIG_FB_ATY_XL_INIT=y # FIXME: BUILD_BREAK 18/Mar/2005 From fedora-cvs-commits at redhat.com Sat Mar 19 01:43:07 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 20:43:07 -0500 Subject: rpms/kernel/devel/configs config-ppc-generic,1.5,1.6 Message-ID: <200503190143.j2J1h7HL015300@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv15287/configs Modified Files: config-ppc-generic Log Message: build fix Index: config-ppc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc-generic,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-ppc-generic 19 Mar 2005 01:27:49 -0000 1.5 +++ config-ppc-generic 19 Mar 2005 01:43:05 -0000 1.6 @@ -27,7 +27,11 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_PMAC=y +# FIXME: BUILD_BREAK 18/Mar/2005 +# arch/ppc/platforms/built-in.o(.pmac.text+0xd344): In function `pmac_cpufreq_verify': +# arch/ppc/platforms/pmac_cpufreq.c:315: undefined reference to `cpufreq_frequency_table_verify' +# arch/ppc/platforms/built-in.o(.pmac.text+0xd394): In function `pmac_cpufreq_target': +# CONFIG_CPU_FREQ_PMAC is not set CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y From fedora-cvs-commits at redhat.com Sat Mar 19 01:44:53 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 20:44:53 -0500 Subject: rpms/hal/devel .cvsignore, 1.22, 1.23 hal.spec, 1.43, 1.44 sources, 1.22, 1.23 Message-ID: <200503190144.j2J1ir7O015404@cvs.devel.redhat.com> Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15369 Modified Files: .cvsignore hal.spec sources Log Message: * Fri Mar 18 2005 David Zeuthen 0.5.0.cvs20050318-1 - Snapshot from upstream CVS; should fix selinux labeling problems for /etc/fstab entries Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 10 Mar 2005 20:26:39 -0000 1.22 +++ .cvsignore 19 Mar 2005 01:44:50 -0000 1.23 @@ -10,3 +10,4 @@ hal-0.4.7.tar.gz hal-0.5.0.tar.gz hal-0.5.0.cvs20050310.tar.gz +hal-0.5.0.cvs20050318.tar.gz Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- hal.spec 10 Mar 2005 20:26:39 -0000 1.43 +++ hal.spec 19 Mar 2005 01:44:50 -0000 1.44 @@ -14,7 +14,7 @@ Summary: Hardware Abstraction Layer Name: hal -Version: 0.5.0.cvs20050310 +Version: 0.5.0.cvs20050318 Release: 1 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz @@ -154,8 +154,11 @@ %{_datadir}/hal/device-manager/* %{_bindir}/hal-device-manager - %changelog +* Fri Mar 18 2005 David Zeuthen 0.5.0.cvs20050318-1 +- Snapshot from upstream CVS; should fix selinux labeling problems + for /etc/fstab entries + * Thu Mar 10 2005 David Zeuthen 0.5.0.cvs20050310-1 - Snapshot from CVS; should fix ACPI issues reported on f-d-l Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 10 Mar 2005 20:26:39 -0000 1.22 +++ sources 19 Mar 2005 01:44:51 -0000 1.23 @@ -1 +1 @@ -aeceda82956ac76faaa28a204cccb42b hal-0.5.0.cvs20050310.tar.gz +281403c065e5d4458786802f6c6cebbc hal-0.5.0.cvs20050318.tar.gz From fedora-cvs-commits at redhat.com Sat Mar 19 03:56:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 22:56:36 -0500 Subject: rpms/mysql/FC-3 mysql-3.23.58-security2.patch, NONE, 1.1 mysql.spec, 1.32, 1.33 Message-ID: <200503190356.j2J3uaR6021726@cvs.devel.redhat.com> Update of /cvs/dist/rpms/mysql/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv21712 Modified Files: mysql.spec Added Files: mysql-3.23.58-security2.patch Log Message: Backpatch repair for CAN-2005-0709, CAN-2005-0710, CAN-2005-0711 (bz#151051). mysql-3.23.58-security2.patch: include/my_global.h | 3 + isam/create.c | 5 +- merge/create.c | 2 myisam/mi_create.c | 13 +++-- myisammrg/myrg_create.c | 2 mysys/mf_tempfile.c | 8 +-- sql/ha_myisam.cc | 18 ++++---- sql/mysql_priv.h | 3 - sql/mysqld.cc | 11 ++++ sql/share/english/errmsg.txt | 2 sql/sql_udf.cc | 96 +++++++++++++++++++++++++++++-------------- sql/table.cc | 6 ++ 12 files changed, 114 insertions(+), 55 deletions(-) --- NEW FILE mysql-3.23.58-security2.patch --- This patch repairs CAN-2005-0709, CAN-2005-0710, CAN-2005-0711. It is a backported version of MySQLs original patch for 4.0 which was available at: http://mysql.bkbits.net:8080/mysql-4.0/cset at 42275cb1vIySS0vWwwUFE48ltGkmNA Thanks to Christian Hammers for doing the bulk of the backport work. diff -Naur mysql-3.23.58.orig/include/my_global.h mysql-3.23.58/include/my_global.h --- mysql-3.23.58.orig/include/my_global.h 2003-09-11 07:50:43.000000000 -0400 +++ mysql-3.23.58/include/my_global.h 2005-03-18 17:03:59.000000000 -0500 @@ -420,6 +420,9 @@ #ifndef O_SHORT_LIVED #define O_SHORT_LIVED 0 #endif +#ifndef O_NOFOLLOW +#define O_NOFOLLOW 0 +#endif /* #define USE_RECORD_LOCK */ diff -Naur mysql-3.23.58.orig/isam/create.c mysql-3.23.58/isam/create.c --- mysql-3.23.58.orig/isam/create.c 2003-09-11 07:49:19.000000000 -0400 +++ mysql-3.23.58/isam/create.c 2005-03-18 17:03:59.000000000 -0500 @@ -58,13 +58,14 @@ base_pos=512; /* Enough for N_STATE_INFO */ bzero((byte*) &share,sizeof(share)); if ((file = my_create(fn_format(buff,name,"",N_NAME_IEXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0) goto err; errpos=1; VOID(fn_format(buff,name,"",N_NAME_DEXT,2+4)); if (!(flags & HA_DONT_TOUCH_DATA)) { - if ((dfile = my_create(buff,0,O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + if ((dfile = my_create(buff,0,O_RDWR | O_EXCL | O_NOFOLLOW, + MYF(MY_WME))) < 0) goto err; errpos=2; } diff -Naur mysql-3.23.58.orig/merge/create.c mysql-3.23.58/merge/create.c --- mysql-3.23.58.orig/merge/create.c 2003-09-11 07:49:19.000000000 -0400 +++ mysql-3.23.58/merge/create.c 2005-03-18 17:03:59.000000000 -0500 @@ -33,7 +33,7 @@ errpos=0; if ((file = my_create(fn_format(buff,name,"",MRG_NAME_EXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0) goto err; errpos=1; if (table_names) diff -Naur mysql-3.23.58.orig/myisam/mi_create.c mysql-3.23.58/myisam/mi_create.c --- mysql-3.23.58.orig/myisam/mi_create.c 2003-09-11 07:49:20.000000000 -0400 +++ mysql-3.23.58/myisam/mi_create.c 2005-03-18 17:03:59.000000000 -0500 @@ -37,7 +37,7 @@ { register uint i,j; File dfile,file; - int errpos,save_errno; + int errpos,save_errno, create_mode= O_RDWR | O_TRUNC; uint fields,length,max_key_length,packed,pointer, key_length,info_length,key_segs,options,min_key_length_skipp, base_pos,varchar_count,long_varchar_count,varchar_length, @@ -170,7 +170,10 @@ min_pack_length+=varchar_length+2*varchar_count; } if (flags & HA_CREATE_TMP_TABLE) + { options|= HA_OPTION_TMP_TABLE; + create_mode|= O_EXCL | O_NOFOLLOW; + } if (flags & HA_CREATE_CHECKSUM || (options & HA_OPTION_CHECKSUM)) { options|= HA_OPTION_CHECKSUM; @@ -471,8 +474,8 @@ if (! (flags & HA_DONT_TOUCH_DATA)) share.state.create_time= (long) time((time_t*) 0); - if ((file = my_create(fn_format(buff,name,"",MI_NAME_IEXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + if ((file = my_create(fn_format(buff,name,"",MI_NAME_IEXT,4),0, create_mode, + MYF(MY_WME))) < 0) goto err; errpos=1; VOID(fn_format(buff,name,"",MI_NAME_DEXT,2+4)); @@ -481,7 +484,7 @@ #ifdef USE_RAID if (share.base.raid_type) { - if ((dfile=my_raid_create(buff,0,O_RDWR | O_TRUNC, + if ((dfile=my_raid_create(buff, 0, create_mode, share.base.raid_type, share.base.raid_chunks, share.base.raid_chunksize, @@ -490,7 +493,7 @@ } else #endif - if ((dfile = my_create(buff,0,O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + if ((dfile = my_create(buff, 0, create_mode, MYF(MY_WME))) < 0) goto err; errpos=3; diff -Naur mysql-3.23.58.orig/myisammrg/myrg_create.c mysql-3.23.58/myisammrg/myrg_create.c --- mysql-3.23.58.orig/myisammrg/myrg_create.c 2003-09-11 07:49:20.000000000 -0400 +++ mysql-3.23.58/myisammrg/myrg_create.c 2005-03-18 17:03:59.000000000 -0500 @@ -33,7 +33,7 @@ errpos=0; if ((file = my_create(fn_format(buff,name,"",MYRG_NAME_EXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0) goto err; errpos=1; if (table_names) diff -Naur mysql-3.23.58.orig/mysys/mf_tempfile.c mysql-3.23.58/mysys/mf_tempfile.c --- mysql-3.23.58.orig/mysys/mf_tempfile.c 2003-09-11 07:49:20.000000000 -0400 +++ mysql-3.23.58/mysys/mf_tempfile.c 2005-03-18 17:03:59.000000000 -0500 @@ -71,7 +71,7 @@ { strmake(to,res,FN_REFLEN-1); (*free)(res); - file=my_create(to,0, mode, MyFlags); + file=my_create(to,0, mode | O_EXCL | O_NOFOLLOW, MyFlags); } environ=old_env; } @@ -82,7 +82,7 @@ { strmake(to,res,FN_REFLEN-1); (*free)(res); - file=my_create(to, 0, mode, MyFlags); + file=my_create(to, 0, mode | O_EXCL | O_NOFOLLOW, MyFlags); } #elif defined(HAVE_MKSTEMP) { @@ -143,7 +143,7 @@ strmake(to,res,FN_REFLEN-1); (*free)(res); file=my_create(to,0, - (int) (O_RDWR | O_BINARY | O_TRUNC | + (int) (O_RDWR | O_BINARY | O_TRUNC | O_EXCL | O_NOFOLLOW | O_TEMPORARY | O_SHORT_LIVED), MYF(MY_WME)); @@ -186,7 +186,7 @@ } (void) strmov(end_pos,TMP_EXT); file=my_create(to,0, - (int) (O_RDWR | O_BINARY | O_TRUNC | + (int) (O_RDWR | O_BINARY | O_TRUNC | O_EXCL | O_NOFOLLOW | O_TEMPORARY | O_SHORT_LIVED), MYF(MY_WME)); } diff -Naur mysql-3.23.58.orig/sql/ha_myisam.cc mysql-3.23.58/sql/ha_myisam.cc --- mysql-3.23.58.orig/sql/ha_myisam.cc 2003-09-11 07:49:21.000000000 -0400 +++ mysql-3.23.58/sql/ha_myisam.cc 2005-03-18 17:03:59.000000000 -0500 @@ -936,7 +936,7 @@ HA_CREATE_INFO *info) { int error; - uint i,j,recpos,minpos,fieldpos,temp_length,length; + uint i,j,recpos,minpos,fieldpos,temp_length,length, create_flags; bool found_auto_increment=0; enum ha_base_keytype type; char buff[FN_REFLEN]; @@ -1101,16 +1101,20 @@ create_info.raid_chunks=info->raid_chunks ? info->raid_chunks : RAID_DEFAULT_CHUNKS; create_info.raid_chunksize=info->raid_chunksize ? info->raid_chunksize : RAID_DEFAULT_CHUNKSIZE; + if (info->options & HA_LEX_CREATE_TMP_TABLE) + create_flags|= HA_CREATE_TMP_TABLE; + if (options & HA_OPTION_PACK_RECORD) + create_flags|= HA_PACK_RECORD; + if (options & HA_OPTION_CHECKSUM) + create_flags|= HA_CREATE_CHECKSUM; + if (options & HA_OPTION_DELAY_KEY_WRITE) + create_flags|= HA_CREATE_DELAY_KEY_WRITE; + error=mi_create(fn_format(buff,name,"","",2+4+16), form->keys,keydef, (uint) (recinfo_pos-recinfo), recinfo, 0, (MI_UNIQUEDEF*) 0, - &create_info, - (((options & HA_OPTION_PACK_RECORD) ? HA_PACK_RECORD : 0) | - ((options & HA_OPTION_CHECKSUM) ? HA_CREATE_CHECKSUM : 0) | - ((options & HA_OPTION_DELAY_KEY_WRITE) ? - HA_CREATE_DELAY_KEY_WRITE : 0))); - + &create_info, create_flags); my_free((gptr) recinfo,MYF(0)); DBUG_RETURN(error); diff -Naur mysql-3.23.58.orig/sql/mysql_priv.h mysql-3.23.58/sql/mysql_priv.h --- mysql-3.23.58.orig/sql/mysql_priv.h 2003-09-11 07:49:21.000000000 -0400 +++ mysql-3.23.58/sql/mysql_priv.h 2005-03-18 17:03:59.000000000 -0500 @@ -541,7 +541,8 @@ COND_slave_stopped, COND_slave_start; extern pthread_attr_t connection_attrib; extern bool opt_endinfo, using_udf_functions, locked_in_memory, - opt_using_transactions, use_temp_pool, opt_local_infile; + opt_using_transactions, use_temp_pool, opt_local_infile, + opt_allow_suspicious_udfs; extern char f_fyllchar; extern ulong ha_read_count, ha_write_count, ha_delete_count, ha_update_count, ha_read_key_count, ha_read_next_count, ha_read_prev_count, diff -Naur mysql-3.23.58.orig/sql/mysqld.cc mysql-3.23.58/sql/mysqld.cc --- mysql-3.23.58.orig/sql/mysqld.cc 2003-09-11 07:49:19.000000000 -0400 +++ mysql-3.23.58/sql/mysqld.cc 2005-03-18 17:06:14.000000000 -0500 @@ -241,7 +241,7 @@ opt_myisam_log=0, opt_large_files=sizeof(my_off_t) > 4; bool opt_sql_bin_update = 0, opt_log_slave_updates = 0, opt_safe_show_db=0, - opt_safe_user_create=0; + opt_safe_user_create=0, opt_allow_suspicious_udfs; FILE *bootstrap_file=0; int segfaulted = 0; // ensure we do not enter SIGSEGV handler twice extern MASTER_INFO glob_mi; @@ -2752,10 +2752,12 @@ OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL, OPT_SAFE_USER_CREATE, OPT_SQL_MODE, OPT_HAVE_NAMED_PIPE, - OPT_SLAVE_SKIP_ERRORS, OPT_LOCAL_INFILE + OPT_SLAVE_SKIP_ERRORS, OPT_LOCAL_INFILE, + OPT_ALLOW_SUSPICIOUS_UDFS }; static struct option long_options[] = { + {"allow-suspicious-udfs", no_argument, 0, (int) OPT_ALLOW_SUSPICIOUS_UDFS}, {"ansi", no_argument, 0, 'a'}, {"basedir", required_argument, 0, 'b'}, #ifdef HAVE_BERKELEY_DB @@ -3343,6 +3345,11 @@ printf("Usage: %s [OPTIONS]\n", my_progname); puts("\n\ --ansi Use ANSI SQL syntax instead of MySQL syntax\n\ + --allow-suspicious-udfs\n\ + Allows to use UDF's consisting of only one symbol\n\ + xxx() without corresponing xxx_init() or xxx_deinit().\n\ + That also means that one can load any function from\n\ + any library, for example exit() from libc.so\n\ -b, --basedir=path Path to installation directory. All paths are\n\ usually resolved relative to this\n\ --big-tables Allow big result sets by saving all temporary sets\n\ diff -Naur mysql-3.23.58.orig/sql/share/english/errmsg.txt mysql-3.23.58/sql/share/english/errmsg.txt --- mysql-3.23.58.orig/sql/share/english/errmsg.txt 2003-09-11 08:00:00.000000000 -0400 +++ mysql-3.23.58/sql/share/english/errmsg.txt 2005-03-18 17:03:59.000000000 -0500 @@ -128,7 +128,7 @@ "No paths allowed for shared library", "Function '%-.64s' already exist", "Can't open shared library '%-.64s' (errno: %d %-.64s)", -"Can't find function '%-.64s' in library'", +"Can't find function '%-.64s' in library", "Function '%-.64s' is not defined", "Host '%-.64s' is blocked because of many connection errors. Unblock with 'mysqladmin flush-hosts'", "Host '%-.64s' is not allowed to connect to this MySQL server", diff -Naur mysql-3.23.58.orig/sql/sql_udf.cc mysql-3.23.58/sql/sql_udf.cc --- mysql-3.23.58.orig/sql/sql_udf.cc 2003-09-11 07:49:20.000000000 -0400 +++ mysql-3.23.58/sql/sql_udf.cc 2005-03-18 17:03:59.000000000 -0500 @@ -75,29 +75,49 @@ static pthread_mutex_t THR_LOCK_udf; -static udf_func *add_udf(char *name, Item_result ret, char *dl, - Item_udftype typ); +static udf_func *add_udf(char *name, Item_result ret, + char *dl, Item_udftype typ); static void del_udf(udf_func *udf); static void *find_udf_dl(const char *dl); - -static void init_syms(udf_func *tmp) +static char *init_syms(udf_func *tmp, char *nm) { - char nm[MAX_FIELD_NAME+16],*end; + char *end; + + if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name)))) + return tmp->name; - tmp->func = dlsym(tmp->dlhandle, tmp->name); end=strmov(nm,tmp->name); - (void) strmov(end,"_init"); - tmp->func_init = dlsym(tmp->dlhandle, nm); - (void) strmov(end,"_deinit"); - tmp->func_deinit = dlsym(tmp->dlhandle, nm); + if (tmp->type == UDFTYPE_AGGREGATE) { - (void)strmov( end, "_reset" ); - tmp->func_reset = dlsym( tmp->dlhandle, nm ); - (void)strmov( end, "_add" ); - tmp->func_add = dlsym( tmp->dlhandle, nm ); + (void)strmov(end, "_reset"); + if (!((tmp->func_reset= dlsym(tmp->dlhandle, nm)))) + return nm; + (void)strmov(end, "_add"); + if (!((tmp->func_add= dlsym(tmp->dlhandle, nm)))) + return nm; + } + + (void) strmov(end,"_deinit"); + tmp->func_deinit= dlsym(tmp->dlhandle, nm); + + (void) strmov(end,"_init"); + tmp->func_init= dlsym(tmp->dlhandle, nm); + + /* + to prefent loading "udf" from, e.g. libc.so + let's ensure that at least one auxiliary symbol is defined + */ + if (!tmp->func_init && !tmp->func_deinit && tmp->type != UDFTYPE_AGGREGATE) + { + if (opt_allow_suspicious_udfs) + sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), nm); + else + return nm; } + + return 0; } static byte* get_hash_key(const byte *buff,uint *length, @@ -109,7 +129,7 @@ } /* -** Read all predeclared functions from func at mysql and accept all that +** Read all predeclared functions from mysql.func and accept all that ** can be used. */ @@ -151,7 +171,7 @@ if (open_tables(new_thd, &tables)) { DBUG_PRINT("error",("Can't open udf table")); - sql_print_error("Can't open mysql/func table"); + sql_print_error("Can't open mysql.func table. Please run the mysql_install_db script to create it."); close_thread_tables(new_thd); delete new_thd; DBUG_VOID_RETURN; @@ -169,10 +189,22 @@ if (table->fields >= 4) // New func table udftype=(Item_udftype) table->field[3]->val_int(); + /* + Ensure that the .dll doesn't have a path + This is done to ensure that only approved dll from the system + directories are used (to make this even remotely secure). + */ + if (strchr(dl_name, '/') || strlen(name) > NAME_LEN) + { + sql_print_error("Invalid row in mysql.func table for function '%.64s'", + name); + continue; + } + if (!(tmp = add_udf(name,(Item_result) table->field[1]->val_int(), dl_name, udftype))) { - sql_print_error("Can't alloc memory for udf function: name"); + sql_print_error("Can't alloc memory for udf function: '%.64s'", name); continue; } @@ -189,13 +221,15 @@ new_dl=1; } tmp->dlhandle = dl; - init_syms(tmp); - if (!tmp->func) { - sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), name); - del_udf(tmp); - if (new_dl) - dlclose(dl); + char buf[MAX_FIELD_NAME+16], *missing; + if ((missing= init_syms(tmp, buf))) + { + sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), missing); + del_udf(tmp); + if (new_dl) + dlclose(dl); + } } } if (error > 0) @@ -382,13 +416,15 @@ new_dl=1; } udf->dlhandle=dl; - init_syms(udf); - - if (udf->func == NULL) { - net_printf(&thd->net, ER_CANT_FIND_DL_ENTRY, udf->name); - goto err; + char buf[MAX_FIELD_NAME+16], *missing; + if ((missing= init_syms(udf, buf))) + { + net_printf(&thd->net, ER_CANT_FIND_DL_ENTRY, missing); + goto err; + } } + udf->name=strdup_root(&mem,udf->name); udf->dl=strdup_root(&mem,udf->dl); if (!udf->name || !udf->dl || @@ -404,7 +440,7 @@ u_d->func_reset=udf->func_reset; u_d->func_add=udf->func_add; - /* create entry in mysql/func table */ + /* create entry in mysql.func table */ bzero((char*) &tables,sizeof(tables)); tables.db= (char*) "mysql"; @@ -424,7 +460,7 @@ close_thread_tables(thd); if (error) { - net_printf(&thd->net, ER_ERROR_ON_WRITE, "func at mysql",error); + net_printf(&thd->net, ER_ERROR_ON_WRITE, "mysql.func",error); del_udf(u_d); goto err; } diff -Naur mysql-3.23.58.orig/sql/table.cc mysql-3.23.58/sql/table.cc --- mysql-3.23.58.orig/sql/table.cc 2003-09-11 07:49:21.000000000 -0400 +++ mysql-3.23.58/sql/table.cc 2005-03-18 17:03:59.000000000 -0500 @@ -956,6 +956,10 @@ uint key_length; ulong length; char fill[IO_SIZE]; + int create_flags= O_RDWR | O_TRUNC; + + if (create_info->options & HA_LEX_CREATE_TMP_TABLE) + create_flags|= O_EXCL | O_NOFOLLOW; #if SIZEOF_OFF_T > 4 /* Fix this in MySQL 4.0; The current limit is 4G rows (QQ) */ @@ -965,7 +969,7 @@ create_info->min_rows= ~(ulong) 0; #endif - if ((file=my_create(name,CREATE_MODE,O_RDWR | O_TRUNC,MYF(MY_WME))) >= 0) + if ((file= my_create(name, CREATE_MODE, create_flags, MYF(MY_WME))) >= 0) { bzero((char*) fileinfo,64); fileinfo[0]=(uchar) 254; fileinfo[1]= 1; fileinfo[2]= FRM_VER+1; // Header Index: mysql.spec =================================================================== RCS file: /cvs/dist/rpms/mysql/FC-3/mysql.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- mysql.spec 5 Jan 2005 18:06:23 -0000 1.32 +++ mysql.spec 19 Mar 2005 03:56:34 -0000 1.33 @@ -1,6 +1,6 @@ Name: mysql Version: 3.23.58 -Release: 14 +Release: 15.FC3.1 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.gz Source1: mysql.init Source2: mysql.logrotate @@ -19,6 +19,7 @@ Patch8: mysql-3.23.58-config.patch Patch9: mysql-3.23.58-security.patch Patch10: mysql-3.23.58-selinux.patch +Patch11: mysql-3.23.58-security2.patch URL: http://www.mysql.com BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: MySQL client programs and shared libraries. @@ -101,6 +102,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 libtoolize --force aclocal @@ -311,6 +313,9 @@ %{_datadir}/sql-bench %changelog +* Fri Mar 18 2005 Tom Lane 3.23.58-15.FC3.1 +- Backpatch repair for CAN-2005-0709, CAN-2005-0710, CAN-2005-0711 (bz#151051). + * Wed Jan 5 2005 Tom Lane 3.23.58-14 - work around SELinux restriction that breaks mysql_install_db (bug #141062) - Add a restorecon to keep the mysql.log file in the right context (bz#143887) From fedora-cvs-commits at redhat.com Sat Mar 19 04:14:21 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 Mar 2005 23:14:21 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1190,1.1191 Message-ID: <200503190414.j2J4ELJp021956@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21943 Modified Files: kernel-2.6.spec Log Message: !xen buildfix Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1190 retrieving revision 1.1191 diff -u -r1.1190 -r1.1191 --- kernel-2.6.spec 19 Mar 2005 00:34:07 -0000 1.1190 +++ kernel-2.6.spec 19 Mar 2005 04:14:19 -0000 1.1191 @@ -833,7 +833,10 @@ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cd include - cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include + cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include +%if %{buildxen} + cp -a asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include +%endif cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include # Make sure the Makefile and version.h have a matching timestamp so that # external modules can be built From fedora-cvs-commits at redhat.com Sat Mar 19 07:44:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 02:44:45 -0500 Subject: rpms/libselinux/FC-3 libselinux-rhat.patch, 1.23, 1.24 libselinux.spec, 1.45, 1.46 Message-ID: <200503190744.j2J7ijY2024754@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libselinux/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv24739 Modified Files: libselinux-rhat.patch libselinux.spec Log Message: * Sat Mar 19 2005 Dan Walsh 1.19.1-9 - Back port many fixes from Rawhide libselinux libselinux-rhat.patch: include/selinux/avc.h | 8 include/selinux/context.h | 9 include/selinux/flask.h | 1 include/selinux/get_context_list.h | 9 include/selinux/get_default_type.h | 9 include/selinux/selinux.h | 83 ++++ man/man3/checkPasswdAccess.3 | 1 man/man3/context_free.3 | 1 man/man3/context_new.3 | 58 +++ man/man3/context_range_get.3 | 1 man/man3/context_range_set.3 | 1 man/man3/context_role_get.3 | 1 man/man3/context_role_set.3 | 1 man/man3/context_type_get.3 | 1 man/man3/context_type_set.3 | 1 man/man3/context_user_get.3 | 1 man/man3/context_user_set.3 | 1 man/man3/get_default_context_with_role.3 | 1 man/man3/get_ordered_context_list.3 | 19 - man/man3/getcon.3 | 9 man/man3/getexeccon.3 | 18 man/man3/getpeercon.3 | 1 man/man3/is_context_customizable.3 | 22 + man/man3/matchmediacon.3 | 26 + man/man3/matchpathcon.3 | 102 ++++- man/man3/rpm_execcon.3 | 1 man/man3/security_commit_booleans.3 | 1 man/man3/security_compute_av.3 | 5 man/man3/security_get_boolean_active.3 | 1 man/man3/security_get_boolean_names.3 | 1 man/man3/security_get_boolean_pending.3 | 1 man/man3/security_load_booleans.3 | 59 +++ man/man3/security_set_boolean.3 | 1 man/man3/selinux_binary_policy_path.3 | 63 +++ man/man3/selinux_booleans_path.3 | 1 man/man3/selinux_contexts_path.3 | 1 man/man3/selinux_default_context_path.3 | 1 man/man3/selinux_failsafe_context_path.3 | 1 man/man3/selinux_file_context_path.3 | 1 man/man3/selinux_media_context_path.3 | 1 man/man3/selinux_removable_context_path.3 | 1 man/man3/selinux_user_contexts_path.3 | 1 man/man3/set_matchpathcon_printf.3 | 1 man/man8/avcstat.8 | 28 + man/man8/getsebool.8 | 11 src/Makefile | 5 src/compute_create.c | 3 src/context.c | 3 src/context_internal.h | 4 src/file_path_suffixes.h | 2 src/get_context_list.c | 2 src/getfilecon.c | 3 src/init.c | 8 src/is_customizable_type.c | 83 ++++ src/matchpathcon.c | 565 ++++++++++++++++++++++-------- src/query_user_context.c | 16 src/rpm.c | 7 src/selinux_config.c | 31 + src/selinux_internal.h | 7 src/setexeccon.c | 3 utils/Makefile | 4 utils/avcstat.c | 225 +++++++++++ utils/getsebool.c | 10 utils/setsebool.c | 24 + 64 files changed, 1390 insertions(+), 181 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.23 -r 1.24 libselinux-rhat.patch Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-3/libselinux-rhat.patch,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libselinux-rhat.patch 24 Nov 2004 16:25:59 -0000 1.23 +++ libselinux-rhat.patch 19 Mar 2005 07:44:42 -0000 1.24 @@ -1,286 +1,364 @@ ---- libselinux-1.19.1/include/selinux/selinux.h.rhat 2004-11-09 09:14:24.000000000 -0500 -+++ libselinux-1.19.1/include/selinux/selinux.h 2004-11-19 11:21:37.514236820 -0500 -@@ -176,7 +176,7 @@ - /* Match the specified media and against the media contexts - configuration and set *con to refer to the resulting context. - Caller must free con via freecon. */ --extern int matchmediacon(const char *path, -+extern int matchmediacon(const char *media, - security_context_t *con); +diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/avc.h libselinux-1.19.1/include/selinux/avc.h +--- nsalibselinux/include/selinux/avc.h 2004-11-09 09:14:24.000000000 -0500 ++++ libselinux-1.19.1/include/selinux/avc.h 2005-03-19 02:27:48.000000000 -0500 +@@ -11,6 +11,10 @@ + #include + #include - /* ---- libselinux-1.19.1/utils/setsebool.c.rhat 2004-11-09 09:14:24.000000000 -0500 -+++ libselinux-1.19.1/utils/setsebool.c 2004-11-19 11:21:37.560231630 -0500 -@@ -35,6 +35,8 @@ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif - if (strcmp(argv[1], "-P") == 0) { - permanent = 1; -+ if (argc < 3) -+ usage(); - start = 2; - } - else ---- libselinux-1.19.1/utils/getsebool.c.rhat 2004-11-09 09:14:24.000000000 -0500 -+++ libselinux-1.19.1/utils/getsebool.c 2004-11-19 11:21:37.559231743 -0500 -@@ -83,8 +83,14 @@ - rc = -1; - goto out; - } -- printf("%s --> active: %d pending: %d\n", names[i], -- active, pending); -+ if (pending != active) { -+ printf("%s --> %s pending: %s\n", names[i], -+ ( active ? "active" : "inactive"), -+ ( pending ? "active" : "inactive")); -+ } else { -+ printf("%s --> %s\n", names[i], -+ ( active ? "active" : "inactive")); -+ } - } + /* + * SID format and operations +@@ -362,4 +366,8 @@ + */ + void avc_sid_stats(void); - out: ---- /dev/null 2004-11-19 04:10:22.696886456 -0500 -+++ libselinux-1.19.1/utils/avcstat.c 2004-11-19 11:21:37.558231856 -0500 -@@ -0,0 +1,224 @@ -+/* -+ * avcstat - Display SELinux avc statistics. -+ * -+ * Copyright (C) 2004 Red Hat, Inc., James Morris -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2, -+ * as published by the Free Software Foundation. -+ * -+ */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define DEF_STAT_FILE "/avc/cache_stats" -+#define DEF_BUF_SIZE 8192 -+#define HEADERS "lookups hits misses allocations reclaims frees" -+ -+struct avc_cache_stats { -+ unsigned int lookups; -+ unsigned int hits; -+ unsigned int misses; -+ unsigned int allocations; -+ unsigned int reclaims; -+ unsigned int frees; -+}; -+ -+static int interval; -+static int rows; -+static char *progname; -+static char buf[DEF_BUF_SIZE]; -+ -+/* selinuxfs mount point */ -+extern char *selinux_mnt; -+ ++#ifdef __cplusplus ++} ++#endif + -+static void die(const char *msg, ...) + #endif /* _SELINUX_AVC_H_ */ +diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/context.h libselinux-1.19.1/include/selinux/context.h +--- nsalibselinux/include/selinux/context.h 2004-11-09 09:14:24.000000000 -0500 ++++ libselinux-1.19.1/include/selinux/context.h 2005-03-19 02:26:56.000000000 -0500 +@@ -1,6 +1,11 @@ + #ifndef _SELINUX_CONTEXT_H_ + #define _SELINUX_CONTEXT_H_ + ++#ifdef __cplusplus ++extern "C" +{ -+ va_list args; -+ -+ fputs("ERROR: ", stderr); -+ -+ va_start(args, msg); -+ vfprintf(stderr, msg, args); -+ va_end(args); -+ -+ if (errno) -+ fprintf(stderr, ": %s", strerror(errno)); -+ -+ fputc('\n', stderr); -+ exit(1); ++#endif ++ + /* + * Functions to deal with security contexts in user space. + */ +@@ -40,4 +45,8 @@ + extern int context_role_set(context_t,const char*); + extern int context_user_set(context_t,const char*); + ++#ifdef __cplusplus +} ++#endif + -+static void usage(void) + #endif +diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/flask.h libselinux-1.19.1/include/selinux/flask.h +--- nsalibselinux/include/selinux/flask.h 2004-11-09 09:14:24.000000000 -0500 ++++ libselinux-1.19.1/include/selinux/flask.h 2005-03-19 02:26:56.000000000 -0500 +@@ -58,6 +58,7 @@ + #define SECCLASS_NETLINK_DNRT_SOCKET 51 + #define SECCLASS_DBUS 52 + #define SECCLASS_NSCD 53 ++#define SECCLASS_ASSOCIATION 54 + + /* + * Security identifier indices for initial entities +diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/get_context_list.h libselinux-1.19.1/include/selinux/get_context_list.h +--- nsalibselinux/include/selinux/get_context_list.h 2004-11-09 09:14:24.000000000 -0500 ++++ libselinux-1.19.1/include/selinux/get_context_list.h 2005-03-19 02:26:58.000000000 -0500 +@@ -3,6 +3,11 @@ + + #include + ++#ifdef __cplusplus ++extern "C" +{ -+ printf("\nUsage: %s [-c] [-f status_file] [interval]\n\n", progname); -+ printf("Display SELinux AVC statistics. If the interval parameter is specified, the\n"); -+ printf("program will loop, displaying updated statistics every \'interval\' seconds.\n"); -+ printf("Relative values are displayed by default. Use the -c option to specify the\n"); -+ printf("display of cumulative values. The -f option specifies the location of the\n"); -+ printf("AVC statistics file, defaulting to \'%s\%s\'.\n\n", selinux_mnt, DEF_STAT_FILE); ++#endif ++ + #define SELINUX_DEFAULTUSER "user_u" + + /* Get an ordered list of authorized security contexts for a user session +@@ -49,4 +54,8 @@ + extern int manual_user_enter_context(const char *user, + security_context_t *newcon); + ++#ifdef __cplusplus +} ++#endif + -+static void set_window_rows(void) + #endif +diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/get_default_type.h libselinux-1.19.1/include/selinux/get_default_type.h [...2434 lines suppressed...] ++ if (errno == ERANGE) { ++ usage(); ++ die("invalid interval \'%s\'", arg); ++ } ++ if (n == 0) { ++ usage(); ++ exit (0); ++ } ++ interval = n; ++ } ++ ++ sa.sa_handler = sighandler; ++ sa.sa_flags = SA_RESTART; ++ ++ i = sigaction(SIGWINCH, &sa, NULL); ++ if (i < 0) ++ die("sigaction"); ++ ++ set_window_rows(); ++ fd = open(avcstatfile, O_RDONLY); ++ if (fd < 0) ++ die("open: \'%s\'", avcstatfile); ++ ++ for (i = 0;; i++) { ++ char *line; ++ ssize_t ret, parsed = 0; ++ struct avc_cache_stats tot, rel, last; ++ ++ memset(buf, 0, DEF_BUF_SIZE); ++ ret = read(fd, buf, DEF_BUF_SIZE); ++ if (ret < 0) ++ die("read"); ++ ++ if (ret == 0) ++ die("read: \'%s\': unexpected end of file", avcstatfile); ++ ++ line = strtok(buf, "\n"); ++ if (!line) ++ die("unable to parse \'%s\': end of line not found", avcstatfile); ++ ++ if (strcmp(line, HEADERS)) ++ die("unable to parse \'%s\': invalid headers", avcstatfile); ++ ++ if (!i || !(i % (rows - 2))) ++ printf("%10s %10s %10s %10s %10s %10s\n", "lookups", ++ "hits", "misses", "allocs", "reclaims", "frees"); ++ ++ memset(&tot, 0, sizeof(tot)); ++ memset(&last, 0, sizeof(last)); ++ ++ while ((line = strtok(NULL, "\n"))) { ++ struct avc_cache_stats tmp; ++ ++ ret = sscanf(line, "%u %u %u %u %u %u", ++ &tmp.lookups, ++ &tmp.hits, ++ &tmp.misses, ++ &tmp.allocations, ++ &tmp.reclaims, ++ &tmp.frees); ++ if (ret != 6) ++ die("unable to parse \'%s\': scan error", avcstatfile); ++ ++ tot.lookups += tmp.lookups; ++ tot.hits += tmp.hits; ++ tot.misses += tmp.misses; ++ tot.allocations += tmp.allocations; ++ tot.reclaims += tmp.reclaims; ++ tot.frees += tmp.frees; ++ parsed = 1; ++ } ++ ++ if (!parsed) ++ die("unable to parse \'%s\': no data", avcstatfile); ++ ++ if (cumulative || (!cumulative && !i)) ++ printf("%10u %10u %10u %10u %10u %10u\n", ++ tot.lookups, tot.hits, tot.misses, ++ tot.allocations, tot.reclaims, tot.frees); ++ else { ++ rel.lookups = tot.lookups - last.lookups; ++ rel.hits = tot.hits - last.hits; ++ rel.misses = tot.misses - last.misses; ++ rel.allocations = tot.allocations - last.allocations; ++ rel.reclaims = tot.reclaims - last.reclaims; ++ rel.frees = tot.frees - last.frees; ++ printf("%10u %10u %10u %10u %10u %10u\n", ++ rel.lookups, rel.hits, rel.misses, ++ rel.allocations, rel.reclaims, rel.frees); ++ } ++ ++ if (!interval) ++ break; ++ ++ memcpy(&last, &tot, sizeof(last)); ++ sleep(interval); ++ ++ ret = lseek(fd, 0, 0); ++ if (ret < 0) ++ die("lseek"); ++ } ++ ++ close(fd); ++ return 0; ++} +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-1.19.1/utils/getsebool.c +--- nsalibselinux/utils/getsebool.c 2004-11-09 09:14:24.000000000 -0500 ++++ libselinux-1.19.1/utils/getsebool.c 2005-03-19 02:15:14.000000000 -0500 +@@ -83,8 +83,14 @@ + rc = -1; + goto out; + } +- printf("%s --> active: %d pending: %d\n", names[i], +- active, pending); ++ if (pending != active) { ++ printf("%s --> %s pending: %s\n", names[i], ++ ( active ? "active" : "inactive"), ++ ( pending ? "active" : "inactive")); ++ } else { ++ printf("%s --> %s\n", names[i], ++ ( active ? "active" : "inactive")); ++ } + } + + out: +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-1.19.1/utils/Makefile +--- nsalibselinux/utils/Makefile 2004-11-09 09:14:24.000000000 -0500 ++++ libselinux-1.19.1/utils/Makefile 2005-03-19 02:29:54.000000000 -0500 +@@ -1,9 +1,9 @@ + # Installation directories. + PREFIX ?= $(DESTDIR)/usr +-BINDIR ?= $(PREFIX)/bin ++BINDIR ?= $(PREFIX)/sbin + + CFLAGS = -Wall +-override CFLAGS += -I../include ++override CFLAGS += -I../include -D_GNU_SOURCE + LDLIBS += -L../src -lselinux + + TARGETS=$(patsubst %.c,%,$(wildcard *.c)) +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/setsebool.c libselinux-1.19.1/utils/setsebool.c +--- nsalibselinux/utils/setsebool.c 2004-11-09 09:14:24.000000000 -0500 ++++ libselinux-1.19.1/utils/setsebool.c 2005-03-19 02:28:57.000000000 -0500 +@@ -35,6 +35,8 @@ + + if (strcmp(argv[1], "-P") == 0) { + permanent = 1; ++ if (argc < 3) ++ usage(); + start = 2; + } + else +@@ -120,6 +122,7 @@ + if (permanent) { + char **names; + const char *bool_file; ++ char *tmp_bool_file; + int rc, len, fd, j; + + rc = security_get_boolean_names(&names, &len); +@@ -141,8 +144,9 @@ + + /* Open file */ + bool_file = selinux_booleans_path(); +- fd = open(bool_file, O_CREAT | O_TRUNC | O_WRONLY, +- S_IRUSR | S_IWUSR); ++ tmp_bool_file = (char *) alloca (strlen(bool_file) + 8); ++ strcpy(stpcpy(tmp_bool_file, bool_file), ".XXXXXX"); ++ fd = mkstemp(tmp_bool_file); + if (fd < 0) { + fprintf(stderr, + "Error creating boolean file %s\n", +@@ -155,13 +159,25 @@ + /* Walk the list in pending memory, writing each to the file */ + for (j=0; j 1.19.1-9 +- Back port many fixes from Rawhide libselinux + * Thu Nov 24 2004 Dan Walsh 1.19.1-8 - Bump for FC-3 From fedora-cvs-commits at redhat.com Sat Mar 19 09:31:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 04:31:59 -0500 Subject: rpms/openoffice.org/devel openoffice.org-1.9.69.directinstall.patch, 1.1, 1.2 Message-ID: <200503190931.j2J9VxEm017074@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17061 Modified Files: openoffice.org-1.9.69.directinstall.patch Log Message: make missing files during localized install a warning, not an error openoffice.org-1.9.69.directinstall.patch: bin/modules/installer/scriptitems.pm | 0 config_office/configure.in | 11 +++++++++++ config_office/set_soenv.in | 1 + instsetoo_native/util/makefile.mk | 4 ++-- solenv/bin/modules/installer/scriptitems.pm | 3 +-- util/makefile.mk | 0 6 files changed, 15 insertions(+), 4 deletions(-) Index: openoffice.org-1.9.69.directinstall.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.69.directinstall.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-1.9.69.directinstall.patch 2 Mar 2005 09:13:17 -0000 1.1 +++ openoffice.org-1.9.69.directinstall.patch 19 Mar 2005 09:31:56 -0000 1.2 @@ -61,3 +61,20 @@ .ELSE # "$(alllangiso)"!="" openoffice: +Index: bin/modules/installer/scriptitems.pm +=================================================================== +RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v +retrieving revision 1.17 +diff -u -p -r1.17 scriptitems.pm +--- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000 1.17 ++++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000 +@@ -930,8 +930,7 @@ sub remove_Files_Without_Sourcedirectory + $infoline = "ERROR: Removing file $filename from file list.\n"; + push( @installer::globals::logfileinfo, $infoline); + +- push(@missingfiles, "ERROR: File not found: $filename\n"); +- $error_occured = 1; ++ push(@missingfiles, "Warning: File not found: $filename\n"); + + next; # removing this file from list, if sourcepath is empty + } From fedora-cvs-commits at redhat.com Sat Mar 19 14:17:12 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 09:17:12 -0500 Subject: rpms/system-config-nfs/devel .cvsignore, 1.9, 1.10 sources, 1.11, 1.12 system-config-nfs.spec, 1.10, 1.11 Message-ID: <200503191417.j2JEHCih018374@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-nfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18360 Modified Files: .cvsignore sources system-config-nfs.spec Log Message: install glade file Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 18 Mar 2005 21:38:13 -0000 1.9 +++ .cvsignore 19 Mar 2005 14:17:09 -0000 1.10 @@ -1 +1 @@ -system-config-nfs-1.3.1.tar.bz2 +system-config-nfs-1.3.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 18 Mar 2005 21:38:13 -0000 1.11 +++ sources 19 Mar 2005 14:17:09 -0000 1.12 @@ -1 +1 @@ -e522b30eb7e19ac9a2809583ceb8c0b9 system-config-nfs-1.3.1.tar.bz2 +b018172f601ad86545e54caf58612e9c system-config-nfs-1.3.2.tar.bz2 Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/system-config-nfs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- system-config-nfs.spec 18 Mar 2005 21:38:13 -0000 1.10 +++ system-config-nfs.spec 19 Mar 2005 14:17:10 -0000 1.11 @@ -1,6 +1,6 @@ Summary: NFS server configuration tool Name: system-config-nfs -Version: 1.3.1 +Version: 1.3.2 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -64,6 +64,9 @@ %changelog +* Sat Mar 19 2005 Nils Philippsen 1.3.2-1 +- install glade file + * Fri Mar 18 2005 Nils Philippsen 1.3.1-1 - make nohide, mp, fsid options configurable From fedora-cvs-commits at redhat.com Sat Mar 19 14:43:11 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 09:43:11 -0500 Subject: rpms/system-config-nfs/devel .cvsignore, 1.10, 1.11 sources, 1.12, 1.13 system-config-nfs.spec, 1.11, 1.12 Message-ID: <200503191443.j2JEhBH8029497@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-nfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29482 Modified Files: .cvsignore sources system-config-nfs.spec Log Message: install python files as well... Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 19 Mar 2005 14:17:09 -0000 1.10 +++ .cvsignore 19 Mar 2005 14:43:09 -0000 1.11 @@ -1 +1 @@ -system-config-nfs-1.3.2.tar.bz2 +system-config-nfs-1.3.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 19 Mar 2005 14:17:09 -0000 1.12 +++ sources 19 Mar 2005 14:43:09 -0000 1.13 @@ -1 +1 @@ -b018172f601ad86545e54caf58612e9c system-config-nfs-1.3.2.tar.bz2 +5f0d174ebe80c68d272c33e238be65cb system-config-nfs-1.3.3.tar.bz2 Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/system-config-nfs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- system-config-nfs.spec 19 Mar 2005 14:17:10 -0000 1.11 +++ system-config-nfs.spec 19 Mar 2005 14:43:09 -0000 1.12 @@ -1,6 +1,6 @@ Summary: NFS server configuration tool Name: system-config-nfs -Version: 1.3.2 +Version: 1.3.3 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -64,6 +64,9 @@ %changelog +* Sat Mar 19 2005 Nils Philippsen 1.3.3-1 +- install python files as well... + * Sat Mar 19 2005 Nils Philippsen 1.3.2-1 - install glade file From fedora-cvs-commits at redhat.com Sat Mar 19 15:06:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 10:06:28 -0500 Subject: rpms/nfs-utils/devel nfs-utils.spec,1.48,1.49 nfs.init,1.18,1.19 Message-ID: <200503191506.j2JF6StU011331@cvs.devel.redhat.com> Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11306 Modified Files: nfs-utils.spec nfs.init Log Message: Reworked how /etc/exports is setup (bz 151389) Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- nfs-utils.spec 2 Mar 2005 18:57:05 -0000 1.48 +++ nfs-utils.spec 19 Mar 2005 15:06:26 -0000 1.49 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.7 -Release: 2 +Release: 3 # group all 32bit related archs %define all_32bit_archs i386 i686 athlon @@ -239,6 +239,9 @@ %config /etc/rc.d/init.d/nfslock %changelog +* Sat Mar 19 2005 Steve Dickson 1.0.7-3 +- Reworked how /etc/exports is setup (bz 151389) + * Wed Mar 2 2005 Steve Dickson 1.0.7-2 - Tied the rpcsecgss debugging in with gssd and svcgssd debugging Index: nfs.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs.init,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nfs.init 14 Feb 2005 19:29:31 -0000 1.18 +++ nfs.init 19 Mar 2005 15:06:26 -0000 1.19 @@ -28,8 +28,8 @@ [ -x /usr/sbin/exportfs ] || exit 0 # Don't fail if /etc/exports doesn't exist; create a bare-bones version and continue. -[ -s /etc/exports ] || \ - { echo "#" > /etc/exports && chmod u+rw,g+r,o+r /etc/exports ; } || \ +[ -r /etc/exports ] || \ + { touch /etc/exports && chmod u+rw,g+r,o+r /etc/exports ; } || \ { echo "/etc/exports does not exist" ; exit 0 ; } # Check for and source configuration file otherwise set defaults From fedora-cvs-commits at redhat.com Sat Mar 19 16:37:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 11:37:25 -0500 Subject: rpms/splint/devel splint.spec,1.8,1.9 manual.html,1.1,NONE Message-ID: <200503191637.j2JGbPRm021443@cvs.devel.redhat.com> Update of /cvs/dist/rpms/splint/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21430 Modified Files: splint.spec Removed Files: manual.html Log Message: * Sat Mar 19 2005 Miloslav Trmac - 3.1.1-6 - Ship the manual in PDF instead of HTML with missing images (#62434) Index: splint.spec =================================================================== RCS file: /cvs/dist/rpms/splint/devel/splint.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- splint.spec 4 Mar 2005 15:18:56 -0000 1.8 +++ splint.spec 19 Mar 2005 16:37:23 -0000 1.9 @@ -1,9 +1,8 @@ Summary: An implementation of the lint program Name: splint Version: 3.1.1 -Release: 5 +Release: 6 Source0: http://www.splint.org/downloads/%{name}-%{version}.src.tgz -Source1: http://www.splint.org/manual/manual.html URL: http://www.splint.org/ Group: Development/Tools License: GPL @@ -18,7 +17,6 @@ %prep %setup -q -cp %{SOURCE1} . %build %configure @@ -34,12 +32,15 @@ %files %defattr(-,root,root) -%doc README manual.html +%doc README doc/manual.pdf %{_bindir}/* %{_mandir}/man1/* %{_datadir}/%{name} %changelog +* Sat Mar 19 2005 Miloslav Trmac - 3.1.1-6 +- Ship the manual in PDF instead of HTML with missing images (#62434) + * Fri Mar 4 2005 Jeff Johnson 3.1.1-5 - rebuild with gcc4. --- manual.html DELETED --- From fedora-cvs-commits at redhat.com Sat Mar 19 17:33:50 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 12:33:50 -0500 Subject: rpms/nfs-utils/devel nfs-utils-1.0.7-xlog-loginfo.patch, NONE, 1.1 nfs-utils.spec, 1.49, 1.50 Message-ID: <200503191733.j2JHXonH017439@cvs.devel.redhat.com> Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17424 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.0.7-xlog-loginfo.patch Log Message: Changed xlog to use LOG_INFO instead of LOG_DEBUG so debug messages will appear w/out any config changes to syslog.conf. nfs-utils-1.0.7-xlog-loginfo.patch: xlog.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE nfs-utils-1.0.7-xlog-loginfo.patch --- --- nfs-utils-1.0.7/support/nfs/xlog.c.save 2003-07-24 21:53:59.000000000 -0400 +++ nfs-utils-1.0.7/support/nfs/xlog.c 2005-03-19 11:51:40.236851728 -0500 @@ -167,7 +167,7 @@ xlog(int kind, const char *fmt, ...) } if (!logged || foreground) { if (!logged && log_fp == NULL) { - syslog(LOG_DEBUG, "%s", buff); + syslog(LOG_INFO, "%s", buff); } else if (log_fp != NULL) { #ifdef VERBOSE_PRINTF time(&now); Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- nfs-utils.spec 19 Mar 2005 15:06:26 -0000 1.49 +++ nfs-utils.spec 19 Mar 2005 17:33:48 -0000 1.50 @@ -39,6 +39,7 @@ Patch58: nfs-utils-1.0.6-rquotad-overflow.patch Patch59: nfs-utils-1.0.6-statd-notify-hostname.patch Patch60: nfs-utils-1.0.7-rpcsecgss-debug.patch +Patch61: nfs-utils-1.0.7-xlog-loginfo.patch Patch100: nfs-utils-1.0.7-compile.patch Patch150: nfs-utils-1.0.6-pie.patch @@ -92,6 +93,7 @@ %patch58 -p1 -b .overflow %patch59 -p1 -b .notify %patch60 -p1 -b .rpcsecgss +%patch61 -p1 -b .xlog # Do the magic to get things to compile @@ -240,6 +242,9 @@ %changelog * Sat Mar 19 2005 Steve Dickson 1.0.7-3 +- Changed xlog to use LOG_INFO instead of LOG_DEBUG + so debug messages will appear w/out any config + changes to syslog.conf. - Reworked how /etc/exports is setup (bz 151389) * Wed Mar 2 2005 Steve Dickson 1.0.7-2 From fedora-cvs-commits at redhat.com Sat Mar 19 18:22:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 13:22:02 -0500 Subject: rpms/pam/devel .cvsignore, 1.27, 1.28 pam.spec, 1.61, 1.62 sources, 1.29, 1.30 Message-ID: <200503191822.j2JIM2TX002373@cvs.devel.redhat.com> Update of /cvs/dist/rpms/pam/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2357 Modified Files: .cvsignore pam.spec sources Log Message: * Fri Mar 18 2005 Tomas Mraz 0.78-8 - remove ownership and permissions handling from pam_console call pam_console_apply as a handler instead Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 10 Mar 2005 08:14:36 -0000 1.27 +++ .cvsignore 19 Mar 2005 18:22:00 -0000 1.28 @@ -1,4 +1,4 @@ pwdb-0.62.tar.gz Linux-PAM-0.78.tar.bz2 db-4.3.27.tar.gz -pam-redhat-0.78-4.tar.bz2 +pam-redhat-0.78-5.tar.bz2 Index: pam.spec =================================================================== RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- pam.spec 14 Mar 2005 21:06:07 -0000 1.61 +++ pam.spec 19 Mar 2005 18:22:00 -0000 1.62 @@ -6,12 +6,12 @@ %define pwdb_version 0.62 %define db_version 4.3.27 %define db_conflicting_version 4.4.0 -%define pam_redhat_release 4 +%define pam_redhat_release 5 Summary: A security tool which provides authentication for applications. Name: pam Version: 0.78 -Release: 7 +Release: 8 License: GPL or BSD Group: System Environment/Base Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -31,7 +31,6 @@ Patch60: pam-0.78-selinux.patch Patch61: pam-pwdbselinux.patch Patch84: pam-0.77-unix-passwd-parse.patch -Patch85: pam-0.78-console-glib-dynamic.patch Patch90: pam-0.78-loginuid.patch BuildRoot: %{_tmppath}/%{name}-root @@ -84,7 +83,6 @@ %patch61 -p1 -b .pwdbselinux %endif %patch84 -p1 -b .passwd-parse -%patch85 -p1 -b .glib-dynamic %patch90 -p1 -b .loginuid for readme in modules/pam_*/README ; do @@ -353,6 +351,10 @@ %{_libdir}/libpam_misc.so %changelog +* Fri Mar 18 2005 Tomas Mraz 0.78-8 +- remove ownership and permissions handling from pam_console call + pam_console_apply as a handler instead + * Mon Mar 14 2005 Tomas Mraz 0.78-7 - add pam_loginuid module for setting the the login uid for auditing purposes (by Steve Grubb) Index: sources =================================================================== RCS file: /cvs/dist/rpms/pam/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 10 Mar 2005 10:35:07 -0000 1.29 +++ sources 19 Mar 2005 18:22:00 -0000 1.30 @@ -1,4 +1,4 @@ 1a1fd0312040ef37aa741d09465774b4 pwdb-0.62.tar.gz 34938b4f2449d4d3b2ffdbf354257205 Linux-PAM-0.78.tar.bz2 fcc481d52c3b80e20a328f8c0cb042bd db-4.3.27.tar.gz -b746a6e7a2769ce3ecb92b208b82aeb0 pam-redhat-0.78-4.tar.bz2 +9e8128ac28b086c3d1af88b7a4cc2e28 pam-redhat-0.78-5.tar.bz2 From fedora-cvs-commits at redhat.com Sat Mar 19 18:36:20 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 13:36:20 -0500 Subject: rpms/splint/devel splint.spec,1.9,1.10 Message-ID: <200503191836.j2JIaKSY013478@cvs.devel.redhat.com> Update of /cvs/dist/rpms/splint/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13465 Modified Files: splint.spec Log Message: Bump revision for rebuild Index: splint.spec =================================================================== RCS file: /cvs/dist/rpms/splint/devel/splint.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- splint.spec 19 Mar 2005 16:37:23 -0000 1.9 +++ splint.spec 19 Mar 2005 18:36:17 -0000 1.10 @@ -1,7 +1,7 @@ Summary: An implementation of the lint program Name: splint Version: 3.1.1 -Release: 6 +Release: 7 Source0: http://www.splint.org/downloads/%{name}-%{version}.src.tgz URL: http://www.splint.org/ Group: Development/Tools From fedora-cvs-commits at redhat.com Sat Mar 19 20:27:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 15:27:47 -0500 Subject: rpms/mysql/FC-2 mysql-3.23.58-security2.patch, NONE, 1.1 mysql.init, 1.11, 1.12 mysql.spec, 1.30, 1.31 Message-ID: <200503192027.j2JKRlOQ005543@cvs.devel.redhat.com> Update of /cvs/dist/rpms/mysql/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv5529 Modified Files: mysql.init mysql.spec Added Files: mysql-3.23.58-security2.patch Log Message: Backpatch repair for CAN-2005-0709, CAN-2005-0710, CAN-2005-0711 (bz#151051). mysql-3.23.58-security2.patch: include/my_global.h | 3 + isam/create.c | 5 +- merge/create.c | 2 myisam/mi_create.c | 13 +++-- myisammrg/myrg_create.c | 2 mysys/mf_tempfile.c | 8 +-- sql/ha_myisam.cc | 18 ++++---- sql/mysql_priv.h | 3 - sql/mysqld.cc | 11 ++++ sql/share/english/errmsg.txt | 2 sql/sql_udf.cc | 96 +++++++++++++++++++++++++++++-------------- sql/table.cc | 6 ++ 12 files changed, 114 insertions(+), 55 deletions(-) --- NEW FILE mysql-3.23.58-security2.patch --- This patch repairs CAN-2005-0709, CAN-2005-0710, CAN-2005-0711. It is a backported version of MySQLs original patch for 4.0 which was available at: http://mysql.bkbits.net:8080/mysql-4.0/cset at 42275cb1vIySS0vWwwUFE48ltGkmNA Thanks to Christian Hammers for doing the bulk of the backport work. diff -Naur mysql-3.23.58.orig/include/my_global.h mysql-3.23.58/include/my_global.h --- mysql-3.23.58.orig/include/my_global.h 2003-09-11 07:50:43.000000000 -0400 +++ mysql-3.23.58/include/my_global.h 2005-03-18 17:03:59.000000000 -0500 @@ -420,6 +420,9 @@ #ifndef O_SHORT_LIVED #define O_SHORT_LIVED 0 #endif +#ifndef O_NOFOLLOW +#define O_NOFOLLOW 0 +#endif /* #define USE_RECORD_LOCK */ diff -Naur mysql-3.23.58.orig/isam/create.c mysql-3.23.58/isam/create.c --- mysql-3.23.58.orig/isam/create.c 2003-09-11 07:49:19.000000000 -0400 +++ mysql-3.23.58/isam/create.c 2005-03-18 17:03:59.000000000 -0500 @@ -58,13 +58,14 @@ base_pos=512; /* Enough for N_STATE_INFO */ bzero((byte*) &share,sizeof(share)); if ((file = my_create(fn_format(buff,name,"",N_NAME_IEXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0) goto err; errpos=1; VOID(fn_format(buff,name,"",N_NAME_DEXT,2+4)); if (!(flags & HA_DONT_TOUCH_DATA)) { - if ((dfile = my_create(buff,0,O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + if ((dfile = my_create(buff,0,O_RDWR | O_EXCL | O_NOFOLLOW, + MYF(MY_WME))) < 0) goto err; errpos=2; } diff -Naur mysql-3.23.58.orig/merge/create.c mysql-3.23.58/merge/create.c --- mysql-3.23.58.orig/merge/create.c 2003-09-11 07:49:19.000000000 -0400 +++ mysql-3.23.58/merge/create.c 2005-03-18 17:03:59.000000000 -0500 @@ -33,7 +33,7 @@ errpos=0; if ((file = my_create(fn_format(buff,name,"",MRG_NAME_EXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0) goto err; errpos=1; if (table_names) diff -Naur mysql-3.23.58.orig/myisam/mi_create.c mysql-3.23.58/myisam/mi_create.c --- mysql-3.23.58.orig/myisam/mi_create.c 2003-09-11 07:49:20.000000000 -0400 +++ mysql-3.23.58/myisam/mi_create.c 2005-03-18 17:03:59.000000000 -0500 @@ -37,7 +37,7 @@ { register uint i,j; File dfile,file; - int errpos,save_errno; + int errpos,save_errno, create_mode= O_RDWR | O_TRUNC; uint fields,length,max_key_length,packed,pointer, key_length,info_length,key_segs,options,min_key_length_skipp, base_pos,varchar_count,long_varchar_count,varchar_length, @@ -170,7 +170,10 @@ min_pack_length+=varchar_length+2*varchar_count; } if (flags & HA_CREATE_TMP_TABLE) + { options|= HA_OPTION_TMP_TABLE; + create_mode|= O_EXCL | O_NOFOLLOW; + } if (flags & HA_CREATE_CHECKSUM || (options & HA_OPTION_CHECKSUM)) { options|= HA_OPTION_CHECKSUM; @@ -471,8 +474,8 @@ if (! (flags & HA_DONT_TOUCH_DATA)) share.state.create_time= (long) time((time_t*) 0); - if ((file = my_create(fn_format(buff,name,"",MI_NAME_IEXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + if ((file = my_create(fn_format(buff,name,"",MI_NAME_IEXT,4),0, create_mode, + MYF(MY_WME))) < 0) goto err; errpos=1; VOID(fn_format(buff,name,"",MI_NAME_DEXT,2+4)); @@ -481,7 +484,7 @@ #ifdef USE_RAID if (share.base.raid_type) { - if ((dfile=my_raid_create(buff,0,O_RDWR | O_TRUNC, + if ((dfile=my_raid_create(buff, 0, create_mode, share.base.raid_type, share.base.raid_chunks, share.base.raid_chunksize, @@ -490,7 +493,7 @@ } else #endif - if ((dfile = my_create(buff,0,O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + if ((dfile = my_create(buff, 0, create_mode, MYF(MY_WME))) < 0) goto err; errpos=3; diff -Naur mysql-3.23.58.orig/myisammrg/myrg_create.c mysql-3.23.58/myisammrg/myrg_create.c --- mysql-3.23.58.orig/myisammrg/myrg_create.c 2003-09-11 07:49:20.000000000 -0400 +++ mysql-3.23.58/myisammrg/myrg_create.c 2005-03-18 17:03:59.000000000 -0500 @@ -33,7 +33,7 @@ errpos=0; if ((file = my_create(fn_format(buff,name,"",MYRG_NAME_EXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0) goto err; errpos=1; if (table_names) diff -Naur mysql-3.23.58.orig/mysys/mf_tempfile.c mysql-3.23.58/mysys/mf_tempfile.c --- mysql-3.23.58.orig/mysys/mf_tempfile.c 2003-09-11 07:49:20.000000000 -0400 +++ mysql-3.23.58/mysys/mf_tempfile.c 2005-03-18 17:03:59.000000000 -0500 @@ -71,7 +71,7 @@ { strmake(to,res,FN_REFLEN-1); (*free)(res); - file=my_create(to,0, mode, MyFlags); + file=my_create(to,0, mode | O_EXCL | O_NOFOLLOW, MyFlags); } environ=old_env; } @@ -82,7 +82,7 @@ { strmake(to,res,FN_REFLEN-1); (*free)(res); - file=my_create(to, 0, mode, MyFlags); + file=my_create(to, 0, mode | O_EXCL | O_NOFOLLOW, MyFlags); } #elif defined(HAVE_MKSTEMP) { @@ -143,7 +143,7 @@ strmake(to,res,FN_REFLEN-1); (*free)(res); file=my_create(to,0, - (int) (O_RDWR | O_BINARY | O_TRUNC | + (int) (O_RDWR | O_BINARY | O_TRUNC | O_EXCL | O_NOFOLLOW | O_TEMPORARY | O_SHORT_LIVED), MYF(MY_WME)); @@ -186,7 +186,7 @@ } (void) strmov(end_pos,TMP_EXT); file=my_create(to,0, - (int) (O_RDWR | O_BINARY | O_TRUNC | + (int) (O_RDWR | O_BINARY | O_TRUNC | O_EXCL | O_NOFOLLOW | O_TEMPORARY | O_SHORT_LIVED), MYF(MY_WME)); } diff -Naur mysql-3.23.58.orig/sql/ha_myisam.cc mysql-3.23.58/sql/ha_myisam.cc --- mysql-3.23.58.orig/sql/ha_myisam.cc 2003-09-11 07:49:21.000000000 -0400 +++ mysql-3.23.58/sql/ha_myisam.cc 2005-03-18 17:03:59.000000000 -0500 @@ -936,7 +936,7 @@ HA_CREATE_INFO *info) { int error; - uint i,j,recpos,minpos,fieldpos,temp_length,length; + uint i,j,recpos,minpos,fieldpos,temp_length,length, create_flags; bool found_auto_increment=0; enum ha_base_keytype type; char buff[FN_REFLEN]; @@ -1101,16 +1101,20 @@ create_info.raid_chunks=info->raid_chunks ? info->raid_chunks : RAID_DEFAULT_CHUNKS; create_info.raid_chunksize=info->raid_chunksize ? info->raid_chunksize : RAID_DEFAULT_CHUNKSIZE; + if (info->options & HA_LEX_CREATE_TMP_TABLE) + create_flags|= HA_CREATE_TMP_TABLE; + if (options & HA_OPTION_PACK_RECORD) + create_flags|= HA_PACK_RECORD; + if (options & HA_OPTION_CHECKSUM) + create_flags|= HA_CREATE_CHECKSUM; + if (options & HA_OPTION_DELAY_KEY_WRITE) + create_flags|= HA_CREATE_DELAY_KEY_WRITE; + error=mi_create(fn_format(buff,name,"","",2+4+16), form->keys,keydef, (uint) (recinfo_pos-recinfo), recinfo, 0, (MI_UNIQUEDEF*) 0, - &create_info, - (((options & HA_OPTION_PACK_RECORD) ? HA_PACK_RECORD : 0) | - ((options & HA_OPTION_CHECKSUM) ? HA_CREATE_CHECKSUM : 0) | - ((options & HA_OPTION_DELAY_KEY_WRITE) ? - HA_CREATE_DELAY_KEY_WRITE : 0))); - + &create_info, create_flags); my_free((gptr) recinfo,MYF(0)); DBUG_RETURN(error); diff -Naur mysql-3.23.58.orig/sql/mysql_priv.h mysql-3.23.58/sql/mysql_priv.h --- mysql-3.23.58.orig/sql/mysql_priv.h 2003-09-11 07:49:21.000000000 -0400 +++ mysql-3.23.58/sql/mysql_priv.h 2005-03-18 17:03:59.000000000 -0500 @@ -541,7 +541,8 @@ COND_slave_stopped, COND_slave_start; extern pthread_attr_t connection_attrib; extern bool opt_endinfo, using_udf_functions, locked_in_memory, - opt_using_transactions, use_temp_pool, opt_local_infile; + opt_using_transactions, use_temp_pool, opt_local_infile, + opt_allow_suspicious_udfs; extern char f_fyllchar; extern ulong ha_read_count, ha_write_count, ha_delete_count, ha_update_count, ha_read_key_count, ha_read_next_count, ha_read_prev_count, diff -Naur mysql-3.23.58.orig/sql/mysqld.cc mysql-3.23.58/sql/mysqld.cc --- mysql-3.23.58.orig/sql/mysqld.cc 2003-09-11 07:49:19.000000000 -0400 +++ mysql-3.23.58/sql/mysqld.cc 2005-03-18 17:06:14.000000000 -0500 @@ -241,7 +241,7 @@ opt_myisam_log=0, opt_large_files=sizeof(my_off_t) > 4; bool opt_sql_bin_update = 0, opt_log_slave_updates = 0, opt_safe_show_db=0, - opt_safe_user_create=0; + opt_safe_user_create=0, opt_allow_suspicious_udfs; FILE *bootstrap_file=0; int segfaulted = 0; // ensure we do not enter SIGSEGV handler twice extern MASTER_INFO glob_mi; @@ -2752,10 +2752,12 @@ OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL, OPT_SAFE_USER_CREATE, OPT_SQL_MODE, OPT_HAVE_NAMED_PIPE, - OPT_SLAVE_SKIP_ERRORS, OPT_LOCAL_INFILE + OPT_SLAVE_SKIP_ERRORS, OPT_LOCAL_INFILE, + OPT_ALLOW_SUSPICIOUS_UDFS }; static struct option long_options[] = { + {"allow-suspicious-udfs", no_argument, 0, (int) OPT_ALLOW_SUSPICIOUS_UDFS}, {"ansi", no_argument, 0, 'a'}, {"basedir", required_argument, 0, 'b'}, #ifdef HAVE_BERKELEY_DB @@ -3343,6 +3345,11 @@ printf("Usage: %s [OPTIONS]\n", my_progname); puts("\n\ --ansi Use ANSI SQL syntax instead of MySQL syntax\n\ + --allow-suspicious-udfs\n\ + Allows to use UDF's consisting of only one symbol\n\ + xxx() without corresponing xxx_init() or xxx_deinit().\n\ + That also means that one can load any function from\n\ + any library, for example exit() from libc.so\n\ -b, --basedir=path Path to installation directory. All paths are\n\ usually resolved relative to this\n\ --big-tables Allow big result sets by saving all temporary sets\n\ diff -Naur mysql-3.23.58.orig/sql/share/english/errmsg.txt mysql-3.23.58/sql/share/english/errmsg.txt --- mysql-3.23.58.orig/sql/share/english/errmsg.txt 2003-09-11 08:00:00.000000000 -0400 +++ mysql-3.23.58/sql/share/english/errmsg.txt 2005-03-18 17:03:59.000000000 -0500 @@ -128,7 +128,7 @@ "No paths allowed for shared library", "Function '%-.64s' already exist", "Can't open shared library '%-.64s' (errno: %d %-.64s)", -"Can't find function '%-.64s' in library'", +"Can't find function '%-.64s' in library", "Function '%-.64s' is not defined", "Host '%-.64s' is blocked because of many connection errors. Unblock with 'mysqladmin flush-hosts'", "Host '%-.64s' is not allowed to connect to this MySQL server", diff -Naur mysql-3.23.58.orig/sql/sql_udf.cc mysql-3.23.58/sql/sql_udf.cc --- mysql-3.23.58.orig/sql/sql_udf.cc 2003-09-11 07:49:20.000000000 -0400 +++ mysql-3.23.58/sql/sql_udf.cc 2005-03-18 17:03:59.000000000 -0500 @@ -75,29 +75,49 @@ static pthread_mutex_t THR_LOCK_udf; -static udf_func *add_udf(char *name, Item_result ret, char *dl, - Item_udftype typ); +static udf_func *add_udf(char *name, Item_result ret, + char *dl, Item_udftype typ); static void del_udf(udf_func *udf); static void *find_udf_dl(const char *dl); - -static void init_syms(udf_func *tmp) +static char *init_syms(udf_func *tmp, char *nm) { - char nm[MAX_FIELD_NAME+16],*end; + char *end; + + if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name)))) + return tmp->name; - tmp->func = dlsym(tmp->dlhandle, tmp->name); end=strmov(nm,tmp->name); - (void) strmov(end,"_init"); - tmp->func_init = dlsym(tmp->dlhandle, nm); - (void) strmov(end,"_deinit"); - tmp->func_deinit = dlsym(tmp->dlhandle, nm); + if (tmp->type == UDFTYPE_AGGREGATE) { - (void)strmov( end, "_reset" ); - tmp->func_reset = dlsym( tmp->dlhandle, nm ); - (void)strmov( end, "_add" ); - tmp->func_add = dlsym( tmp->dlhandle, nm ); + (void)strmov(end, "_reset"); + if (!((tmp->func_reset= dlsym(tmp->dlhandle, nm)))) + return nm; + (void)strmov(end, "_add"); + if (!((tmp->func_add= dlsym(tmp->dlhandle, nm)))) + return nm; + } + + (void) strmov(end,"_deinit"); + tmp->func_deinit= dlsym(tmp->dlhandle, nm); + + (void) strmov(end,"_init"); + tmp->func_init= dlsym(tmp->dlhandle, nm); + + /* + to prefent loading "udf" from, e.g. libc.so + let's ensure that at least one auxiliary symbol is defined + */ + if (!tmp->func_init && !tmp->func_deinit && tmp->type != UDFTYPE_AGGREGATE) + { + if (opt_allow_suspicious_udfs) + sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), nm); + else + return nm; } + + return 0; } static byte* get_hash_key(const byte *buff,uint *length, @@ -109,7 +129,7 @@ } /* -** Read all predeclared functions from func at mysql and accept all that +** Read all predeclared functions from mysql.func and accept all that ** can be used. */ @@ -151,7 +171,7 @@ if (open_tables(new_thd, &tables)) { DBUG_PRINT("error",("Can't open udf table")); - sql_print_error("Can't open mysql/func table"); + sql_print_error("Can't open mysql.func table. Please run the mysql_install_db script to create it."); close_thread_tables(new_thd); delete new_thd; DBUG_VOID_RETURN; @@ -169,10 +189,22 @@ if (table->fields >= 4) // New func table udftype=(Item_udftype) table->field[3]->val_int(); + /* + Ensure that the .dll doesn't have a path + This is done to ensure that only approved dll from the system + directories are used (to make this even remotely secure). + */ + if (strchr(dl_name, '/') || strlen(name) > NAME_LEN) + { + sql_print_error("Invalid row in mysql.func table for function '%.64s'", + name); + continue; + } + if (!(tmp = add_udf(name,(Item_result) table->field[1]->val_int(), dl_name, udftype))) { - sql_print_error("Can't alloc memory for udf function: name"); + sql_print_error("Can't alloc memory for udf function: '%.64s'", name); continue; } @@ -189,13 +221,15 @@ new_dl=1; } tmp->dlhandle = dl; - init_syms(tmp); - if (!tmp->func) { - sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), name); - del_udf(tmp); - if (new_dl) - dlclose(dl); + char buf[MAX_FIELD_NAME+16], *missing; + if ((missing= init_syms(tmp, buf))) + { + sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), missing); + del_udf(tmp); + if (new_dl) + dlclose(dl); + } } } if (error > 0) @@ -382,13 +416,15 @@ new_dl=1; } udf->dlhandle=dl; - init_syms(udf); - - if (udf->func == NULL) { - net_printf(&thd->net, ER_CANT_FIND_DL_ENTRY, udf->name); - goto err; + char buf[MAX_FIELD_NAME+16], *missing; + if ((missing= init_syms(udf, buf))) + { + net_printf(&thd->net, ER_CANT_FIND_DL_ENTRY, missing); + goto err; + } } + udf->name=strdup_root(&mem,udf->name); udf->dl=strdup_root(&mem,udf->dl); if (!udf->name || !udf->dl || @@ -404,7 +440,7 @@ u_d->func_reset=udf->func_reset; u_d->func_add=udf->func_add; - /* create entry in mysql/func table */ + /* create entry in mysql.func table */ bzero((char*) &tables,sizeof(tables)); tables.db= (char*) "mysql"; @@ -424,7 +460,7 @@ close_thread_tables(thd); if (error) { - net_printf(&thd->net, ER_ERROR_ON_WRITE, "func at mysql",error); + net_printf(&thd->net, ER_ERROR_ON_WRITE, "mysql.func",error); del_udf(u_d); goto err; } diff -Naur mysql-3.23.58.orig/sql/table.cc mysql-3.23.58/sql/table.cc --- mysql-3.23.58.orig/sql/table.cc 2003-09-11 07:49:21.000000000 -0400 +++ mysql-3.23.58/sql/table.cc 2005-03-18 17:03:59.000000000 -0500 @@ -956,6 +956,10 @@ uint key_length; ulong length; char fill[IO_SIZE]; + int create_flags= O_RDWR | O_TRUNC; + + if (create_info->options & HA_LEX_CREATE_TMP_TABLE) + create_flags|= O_EXCL | O_NOFOLLOW; #if SIZEOF_OFF_T > 4 /* Fix this in MySQL 4.0; The current limit is 4G rows (QQ) */ @@ -965,7 +969,7 @@ create_info->min_rows= ~(ulong) 0; #endif - if ((file=my_create(name,CREATE_MODE,O_RDWR | O_TRUNC,MYF(MY_WME))) >= 0) + if ((file= my_create(name, CREATE_MODE, create_flags, MYF(MY_WME))) >= 0) { bzero((char*) fileinfo,64); fileinfo[0]=(uchar) 254; fileinfo[1]= 1; fileinfo[2]= FRM_VER+1; // Header Index: mysql.init =================================================================== RCS file: /cvs/dist/rpms/mysql/FC-2/mysql.init,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mysql.init 12 Oct 2004 19:34:31 -0000 1.11 +++ mysql.init 19 Mar 2005 20:27:45 -0000 1.12 @@ -24,31 +24,31 @@ touch /var/log/mysqld.log chown mysql:mysql /var/log/mysqld.log chmod 0640 /var/log/mysqld.log + [ -x /sbin/restorecon ] && /sbin/restorecon /var/log/mysqld.log if [ ! -d $datadir/mysql ] ; then action $"Initializing MySQL database: " /usr/bin/mysql_install_db ret=$? chown -R mysql:mysql $datadir if [ $ret -ne 0 ] ; then - return $ret; + return $ret fi fi chown -R mysql:mysql $datadir chmod 0755 $datadir - /usr/bin/safe_mysqld --defaults-file=/etc/my.cnf >/dev/null 2>&1 & + /usr/bin/safe_mysqld --defaults-file=/etc/my.cnf --pid-file=/var/run/mysqld/mysqld.pid >/dev/null 2>&1 & ret=$? - # If you've removed anonymous users, this line must be changed to - # use a user that is allowed to ping mysqld. - ping="/usr/bin/mysqladmin -uUNKNOWN_MYSQL_USER ping" - # Spin for a maximum of ten seconds waiting for the server to come up + # Spin for a maximum of N seconds waiting for the server to come up. + # Rather than assuming we know a valid username, accept an "access + # denied" response as meaning the server is functioning. if [ $ret -eq 0 ]; then - for x in 1 2 3 4 5 6 7 8 9 10; do - if [ -n "`$ping 2> /dev/null`" ]; then - break; - else - sleep 1; - fi - done - if !([ -n "`$ping 2> /dev/null`" ]); then + STARTTIMEOUT=10 + while [ $STARTTIMEOUT -gt 0 ]; do + RESPONSE=`/usr/bin/mysqladmin -uUNKNOWN_MYSQL_USER ping 2>&1` && break + echo "$RESPONSE" | grep -q "Access denied for user" && break + sleep 1 + let STARTTIMEOUT=${STARTTIMEOUT}-1 + done + if [ $STARTTIMEOUT -eq 0 ]; then echo "Timeout error occurred trying to start MySQL Daemon." action $"Starting $prog: " /bin/false else Index: mysql.spec =================================================================== RCS file: /cvs/dist/rpms/mysql/FC-2/mysql.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mysql.spec 12 Oct 2004 19:34:31 -0000 1.30 +++ mysql.spec 19 Mar 2005 20:27:45 -0000 1.31 @@ -1,6 +1,6 @@ Name: mysql Version: 3.23.58 -Release: 9.1 +Release: 15.FC2.1 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.gz Source1: mysql.init Source2: mysql.logrotate @@ -18,6 +18,7 @@ Patch7: mysql-3.23.58-dropdb.patch Patch8: mysql-3.23.58-config.patch Patch9: mysql-3.23.58-security.patch +Patch11: mysql-3.23.58-security2.patch URL: http://www.mysql.com BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: MySQL client programs and shared libraries. @@ -99,6 +100,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch11 -p1 libtoolize --force aclocal @@ -309,6 +311,11 @@ %{_datadir}/sql-bench %changelog +* Fri Mar 18 2005 Tom Lane 3.23.58-15.FC2.1 +- Backpatch repair for CAN-2005-0709, CAN-2005-0710, CAN-2005-0711 (bz#151051). +- Fix init script to not need a valid username for startup check (bz#142328) +- Don't assume /etc/my.cnf will specify pid-file (bz#143724) + * Tue Oct 12 2004 Tom Lane 3.23.58-9.1 - fix security issues CAN-2004-0835, CAN-2004-0836, CAN-2004-0837 (bugs #135372, 135375, 135387) From fedora-cvs-commits at redhat.com Sat Mar 19 20:37:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 15:37:51 -0500 Subject: rpms/glibc/FC-3 glibc-dlclose-gc.patch, NONE, 1.1 glibc.spec, 1.103, 1.104 Message-ID: <200503192037.j2JKbpAY005712@cvs.devel.redhat.com> Update of /cvs/dist/rpms/glibc/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv5698 Modified Files: glibc.spec Added Files: glibc-dlclose-gc.patch Log Message: 2.3.4-2.fc3.5 glibc-dlclose-gc.patch: elf/Makefile | 32 +++ elf/circleload1.c | 2 elf/dl-close.c | 364 ++++++++++++++++++--------------------------- elf/dl-deps.c | 2 elf/dl-fini.c | 185 +++++++++++++--------- elf/dl-load.c | 5 elf/dl-lookup.c | 21 -- elf/dl-open.c | 271 +++++++++++++++------------------ elf/do-lookup.h | 4 elf/loadtest.c | 8 elf/neededtest.c | 2 elf/neededtest2.c | 2 elf/neededtest3.c | 2 elf/neededtest4.c | 2 elf/order2.c | 46 +++++ elf/order2mod1.c | 8 elf/order2mod2.c | 18 ++ elf/order2mod3.c | 14 + elf/order2mod4.c | 16 + elf/rtld.c | 141 +++++++---------- elf/testobj2.c | 1 elf/unload.c | 4 elf/unload2.c | 4 elf/unload3mod4.c | 2 elf/unload4.c | 48 +++++ elf/unload4mod1.c | 10 + elf/unload4mod2.c | 8 elf/unload4mod3.c | 16 + elf/unload4mod4.c | 16 + elf/unload5.c | 42 +++++ include/link.h | 6 sysdeps/generic/ldsodefs.h | 5 32 files changed, 754 insertions(+), 553 deletions(-) --- NEW FILE glibc-dlclose-gc.patch --- 2005-03-19 Ulrich Drepper * elf/dl-lookup.c (add_dependency): Always search l_initfini if the list exists. * elf/Makefile: Add rules to build and run order2. * elf/order2.c: New file. * elf/order2mod1.c: New file. * elf/order2mod2.c: New file. * elf/order2mod3.c: New file. * elf/order2mod4.c: New file. 2005-03-19 Jakub Jelinek * elf/dl-open.c (dl_open_worker): Print exact l_direct_opencount value, it has been incremented before. 2005-03-18 Ulrich Drepper * elf/dl-fini.c (_dl_fini): Split sorting of the maps in separate function _dl_sort_fini. (_dl_sort_fini): New function. * sysdeps/generic/ldsodefs.h: Declare _dl_sort_fini. * elf/dl-close.c (_dl_close): Call _dl_sort_fini before running destructors to call them in the right order. 2005-03-18 Ulrich Drepper * include/link.h (struct link_map): Remove l_opencount. Add l_removed. Change type of l_idx to int. * elf/dl-close.c: Basically rewrite. Do not use l_opencount to determine whether a DSO has to be unloaded. Instead compute this in this function. * elf/dl-deps.c: No need to manipulate l_opencount anymore. * elf/dl-lookup.c: Likewise. * elf/rtld.c: Likewise * elf/dl-open.c: Likewise. Use l_init_called to determine whether object was just loaded. * elf/dl-fini.c: Bump l_direct_opencount instead of l_opencount. * elf/dl-load.c (_dl_map_object_from_fd): Do not recognize DSO which is about to be unloaded as a match. (_dl_map_object): Likewise. * elf/do-lookup.h (do_lookup_x): Do not look into DSO which is about to be unloaded. * elf/circleload1.c: Don't use l_opencount anymore. * elf/neededtest.c: Likewise. * elf/neededtest2.c: Likewise. * elf/neededtest3.c: Likewise. * elf/neededtest4.c: Likewise. * elf/unload.c: Likewise. * elf/unload2.c: Likewise. * elf/loadtest.c: Likewise. * elf/rtld.c: Preloading errors are now never fatal. 2005-03-08 Jakub Jelinek * elf/Makefile: Add rules to build and run unload5 test. * elf/unload5.c: New file. 2005-03-08 Jakub Jelinek * elf/Makefile: Add rules to build and run unload4 test. * elf/unload4.c: New file. * elf/unload4mod1.c: New file. * elf/unload4mod2.c: New file. * elf/unload4mod3.c: New file. * elf/unload4mod4.c: New file. 2005-03-05 Roland McGrath * elf/unload3mod4.c: Declare foo. * elf/testobj2.c: Include . --- libc/elf/rtld.c.jj 2005-02-23 16:31:50.000000000 +0100 +++ libc/elf/rtld.c 2005-03-18 18:20:25.000000000 +0100 @@ -270,7 +270,6 @@ _dl_start_final (void *arg, struct dl_st #endif _dl_setup_hash (&GL(dl_rtld_map)); GL(dl_rtld_map).l_real = &GL(dl_rtld_map); - GL(dl_rtld_map).l_opencount = 1; GL(dl_rtld_map).l_map_start = (ElfW(Addr)) _begin; GL(dl_rtld_map).l_map_end = (ElfW(Addr)) _end; GL(dl_rtld_map).l_text_end = (ElfW(Addr)) _etext; @@ -659,14 +658,48 @@ _dl_initial_error_catch_tsd (void) } #endif + +static unsigned int +do_preload (char *fname, struct link_map *main_map, const char *where) +{ + const char *objname; + const char *err_str = NULL; + struct map_args args; + + args.str = fname; + args.loader = main_map; + args.is_preloaded = 1; + args.mode = 0; + + unsigned int old_nloaded = GL(dl_ns)[LM_ID_BASE]._ns_nloaded; + + (void) _dl_catch_error (&objname, &err_str, map_doit, &args); + if (__builtin_expect (err_str != NULL, 0)) + { + _dl_error_printf ("\ +ERROR: ld.so: object '%s' from %s cannot be preloaded: ignored.\n", + fname, where); + /* No need to call free, this is still before + the libc's malloc is used. */ + } + else if (GL(dl_ns)[LM_ID_BASE]._ns_nloaded != old_nloaded) + /* It is no duplicate. */ + return 1; + + /* Nothing loaded. */ + return 0; +} + #if defined SHARED && defined _LIBC_REENTRANT \ && defined __rtld_lock_default_lock_recursive -static void rtld_lock_default_lock_recursive (void *lock) +static void +rtld_lock_default_lock_recursive (void *lock) { __rtld_lock_default_lock_recursive (lock); } -static void rtld_lock_default_unlock_recursive (void *lock) +static void +rtld_lock_default_unlock_recursive (void *lock) { __rtld_lock_default_unlock_recursive (lock); } @@ -687,8 +720,6 @@ dl_main (const ElfW(Phdr) *phdr, { const ElfW(Phdr) *ph; enum mode mode; - struct link_map **preloads; - unsigned int npreloads; struct link_map *main_map; size_t file_size; char *file; @@ -918,8 +949,6 @@ of this helper program; chances are you main_map->l_text_end = 0; /* Perhaps the executable has no PT_LOAD header entries at all. */ main_map->l_map_start = ~0; - /* We opened the file, account for it. */ - ++main_map->l_opencount; /* And it was opened directly. */ ++main_map->l_direct_opencount; @@ -1161,8 +1190,9 @@ of this helper program; chances are you /* We have two ways to specify objects to preload: via environment variable and via the file /etc/ld.so.preload. The latter can also be used when security is enabled. */ - preloads = NULL; - npreloads = 0; + assert (GL(dl_rtld_map).l_next == NULL); + struct link_map **preloads = NULL; + unsigned int npreloads = 0; if (__builtin_expect (preloadlist != NULL, 0)) { @@ -1181,14 +1211,7 @@ of this helper program; chances are you if (p[0] != '\0' && (__builtin_expect (! INTUSE(__libc_enable_secure), 1) || strchr (p, '/') == NULL)) - { - struct link_map *new_map = _dl_map_object (main_map, p, 1, - lt_library, 0, 0, - LM_ID_BASE); - if (++new_map->l_opencount == 1) - /* It is no duplicate. */ - ++npreloads; - } + npreloads += do_preload (p, main_map, "LD_PRELOAD"); HP_TIMING_NOW (stop); HP_TIMING_DIFF (diff, start, stop); @@ -1260,41 +1283,14 @@ of this helper program; chances are you runp = file; while ((p = strsep (&runp, ": \t\n")) != NULL) if (p[0] != '\0') - { - const char *objname; - const char *err_str = NULL; - struct map_args args; - - args.str = p; - args.loader = main_map; - args.is_preloaded = 1; - args.mode = 0; - - (void) _dl_catch_error (&objname, &err_str, map_doit, - &args); - if (__builtin_expect (err_str != NULL, 0)) - { - _dl_error_printf ("\ -ERROR: ld.so: object '%s' from %s cannot be preloaded: ignored.\n", - p, preload_file); - /* No need to call free, this is still before - the libc's malloc is used. */ - } - else if (++args.map->l_opencount == 1) - /* It is no duplicate. */ - ++npreloads; - } + npreloads += do_preload (p, main_map, preload_file); } if (problem != NULL) { char *p = strndupa (problem, file_size - (problem - file)); - struct link_map *new_map = _dl_map_object (main_map, p, 1, - lt_library, 0, 0, - LM_ID_BASE); - if (++new_map->l_opencount == 1) - /* It is no duplicate. */ - ++npreloads; + + npreloads += do_preload (p, main_map, preload_file); } HP_TIMING_NOW (stop); @@ -1348,18 +1344,9 @@ ERROR: ld.so: object '%s' from %s cannot if (test_fd >= 0) /* open did no fail.. */ __close(test_fd); /* avoid fd leaks */ - if (can_load != 0) { - struct link_map *new_map; - new_map = _dl_map_object (main_map, LIB_NOVERSION, - 1, lt_library, 0, 0, LM_ID_BASE); - if (++new_map->l_opencount == 1) { - /* It is no duplicate. */ - ++npreloads; -/* _dl_sysdep_message(" DONE\n", NULL); */ - } else { -/* _dl_sysdep_message(" FAILED\n", NULL); */ - } - } + if (can_load != 0) + npreloads += do_preload (LIB_NOVERSION, main_map, + "nonversioned binary"); HP_TIMING_NOW (stop); HP_TIMING_DIFF (diff, start, stop); @@ -1367,7 +1354,7 @@ ERROR: ld.so: object '%s' from %s cannot } #endif - if (__builtin_expect (npreloads, 0) != 0) + if (__builtin_expect (GL(dl_rtld_map).l_next != NULL, 0)) { /* Set up PRELOADS with a vector of the preloaded libraries. */ struct link_map *l; @@ -1464,14 +1451,9 @@ ERROR: ld.so: object '%s' from %s cannot HP_TIMING_DIFF (diff, start, stop); HP_TIMING_ACCUM_NT (load_time, diff); - /* Mark all objects as being in the global scope and set the open - counter. */ + /* Mark all objects as being in the global scope. */ for (i = main_map->l_searchlist.r_nlist; i > 0; ) - { - --i; - main_map->l_searchlist.r_list[i]->l_global = 1; - ++main_map->l_searchlist.r_list[i]->l_opencount; - } + main_map->l_searchlist.r_list[--i]->l_global = 1; #ifndef MAP_ANON /* We are done mapping things, so close the zero-fill descriptor. */ @@ -1481,18 +1463,22 @@ ERROR: ld.so: object '%s' from %s cannot /* Remove _dl_rtld_map from the chain. */ GL(dl_rtld_map).l_prev->l_next = GL(dl_rtld_map).l_next; - if (GL(dl_rtld_map).l_next) + if (GL(dl_rtld_map).l_next != NULL) GL(dl_rtld_map).l_next->l_prev = GL(dl_rtld_map).l_prev; - if (__builtin_expect (GL(dl_rtld_map).l_opencount > 1, 1)) + for (i = 1; i < main_map->l_searchlist.r_nlist; ++i) + if (main_map->l_searchlist.r_list[i] == &GL(dl_rtld_map)) + break; + + bool rtld_multiple_ref = false; + if (__builtin_expect (i < main_map->l_searchlist.r_nlist, 1)) { /* Some DT_NEEDED entry referred to the interpreter object itself, so put it back in the list of visible objects. We insert it into the chain in symbol search order because gdb uses the chain's order as its symbol search order. */ - i = 1; - while (main_map->l_searchlist.r_list[i] != &GL(dl_rtld_map)) - ++i; + rtld_multiple_ref = true; + GL(dl_rtld_map).l_prev = main_map->l_searchlist.r_list[i - 1]; if (__builtin_expect (mode, normal) == normal) { @@ -1726,7 +1712,7 @@ cannot allocate TLS data structures for } else { - /* If LD_WARN is set warn about undefined symbols. */ + /* If LD_WARN is set, warn about undefined symbols. */ if (GLRO(dl_lazy) >= 0 && GLRO(dl_verbose)) { /* We have to do symbol dependency testing. */ @@ -1736,7 +1722,7 @@ cannot allocate TLS data structures for args.lazy = GLRO(dl_lazy); l = main_map; - while (l->l_next) + while (l->l_next != NULL) l = l->l_next; do { @@ -1747,10 +1733,11 @@ cannot allocate TLS data structures for &args); } l = l->l_prev; - } while (l); + } + while (l != NULL); if ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK) - && GL(dl_rtld_map).l_opencount > 1) + && rtld_multiple_ref) _dl_relocate_object (&GL(dl_rtld_map), main_map->l_scope, 0, 0); } @@ -2020,7 +2007,7 @@ cannot allocate TLS data structures for /* We must prepare the profiling. */ _dl_start_profile (); - if (GL(dl_rtld_map).l_opencount > 1) + if (rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. Re-relocate ourselves with user-controlled symbol definitions. */ --- libc/elf/unload.c.jj 2000-10-24 00:56:50.000000000 +0200 +++ libc/elf/unload.c 2005-03-18 17:07:20.000000000 +0100 @@ -12,8 +12,8 @@ #define OUT \ for (map = _r_debug.r_map; map != NULL; map = map->l_next) \ if (map->l_type == lt_loaded) \ - printf ("name = \"%s\", opencount = %d\n", \ - map->l_name, (int) map->l_opencount); \ + printf ("name = \"%s\", direct_opencount = %d\n", \ + map->l_name, (int) map->l_direct_opencount); \ fflush (stdout) typedef struct --- libc/elf/unload4mod1.c.jj 2005-03-18 17:07:20.000000000 +0100 +++ libc/elf/unload4mod1.c 2005-03-18 17:07:20.000000000 +0100 @@ -0,0 +1,10 @@ +#include + +extern int bar (int); + +int +foo (int x) +{ + puts ("in foo"); + return bar (x / 2) + 2; +} --- libc/elf/dl-close.c.jj 2005-03-03 17:21:28.000000000 +0100 +++ libc/elf/dl-close.c 2005-03-19 19:46:10.574667859 +0100 @@ -102,18 +102,9 @@ void internal_function _dl_close (void *_map) { - struct reldep_list - { - struct link_map **rellist; - unsigned int nrellist; - unsigned int nhandled; - struct reldep_list *next; - bool handled[0]; - } *reldeps = NULL; - struct link_map **list; struct link_map *map = _map; unsigned int i; - unsigned int *new_opencount; + Lmid_t ns = map->l_ns; #ifdef USE_TLS bool any_tls = false; #endif @@ -124,162 +115,134 @@ _dl_close (void *_map) /* Nope. Do nothing. */ return; - if (__builtin_expect (map->l_opencount, 1) == 0) + if (__builtin_expect (map->l_direct_opencount, 1) == 0) GLRO(dl_signal_error) (0, map->l_name, NULL, N_("shared object not open")); /* Acquire the lock. */ __rtld_lock_lock_recursive (GL(dl_load_lock)); /* One less direct use. */ - assert (map->l_direct_opencount > 0); --map->l_direct_opencount; /* Decrement the reference count. */ - if (map->l_opencount > 1 || map->l_type != lt_loaded) + if (map->l_direct_opencount > 1 || map->l_type != lt_loaded) { /* There are still references to this object. Do nothing more. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) - GLRO(dl_debug_printf) ("\nclosing file=%s; opencount == %u\n", - map->l_name, map->l_opencount); - - /* Decrement the object's reference counter, not the dependencies'. */ - --map->l_opencount; - - /* If the direct use counter reaches zero we have to decrement - all the dependencies' usage counter. */ - if (map->l_direct_opencount == 0) - for (i = 1; i < map->l_searchlist.r_nlist; ++i) - --map->l_searchlist.r_list[i]->l_opencount; + GLRO(dl_debug_printf) ("\nclosing file=%s; direct_opencount == %u\n", + map->l_name, map->l_direct_opencount); __rtld_lock_unlock_recursive (GL(dl_load_lock)); return; } - list = map->l_initfini; + const unsigned int nloaded = GL(dl_ns)[ns]._ns_nloaded; + char used[nloaded]; + char done[nloaded]; + struct link_map *maps[nloaded]; + + /* Run over the list and assign indeces to the link maps and enter + them into the MAPS array. */ + int idx = 0; + for (struct link_map *l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) + { + l->l_idx = idx; + maps[idx] = l; + ++idx; + } + assert (idx == nloaded); - /* Compute the new l_opencount values. */ - i = map->l_searchlist.r_nlist; - if (__builtin_expect (i == 0, 0)) - /* This can happen if we handle relocation dependencies for an - object which wasn't loaded directly. */ - for (i = 1; list[i] != NULL; ++i) - ; + /* Prepare the bitmaps. */ + memset (used, '\0', sizeof (used)); + memset (done, '\0', sizeof (done)); + + /* Keep track of the lowest index link map we have covered already. */ + int done_index = -1; + while (++done_index < nloaded) + { + struct link_map *l = maps[done_index]; - unsigned int nopencount = i; - new_opencount = (unsigned int *) alloca (i * sizeof (unsigned int)); + if (done[done_index]) + /* Already handled. */ + continue; + + /* Check whether this object is still used. */ + if (l->l_type == lt_loaded + && l->l_direct_opencount == 0 + && (l->l_flags_1 & DF_1_NODELETE) == 0 + && !used[done_index]) + continue; + + /* We need this object and we handle it now. */ + done[done_index] = 1; + used[done_index] = 1; + /* Signal the object is still needed. */ + l->l_idx = -1; - for (i = 0; list[i] != NULL; ++i) - { - list[i]->l_idx = i; - new_opencount[i] = list[i]->l_opencount; - } - --new_opencount[0]; - for (i = 1; list[i] != NULL; ++i) - if ((list[i]->l_flags_1 & DF_1_NODELETE) == 0 - /* Decrement counter. */ - && (assert (new_opencount[i] > 0), --new_opencount[i] == 0)) - { - void mark_removed (struct link_map *remmap) - { - /* Test whether this object was also loaded directly. */ - if (remmap->l_searchlist.r_list != NULL - && remmap->l_direct_opencount > 0) - { - /* In this case we have to decrement all the dependencies of - this object. They are all in MAP's dependency list. */ - unsigned int j; - struct link_map **dep_list = remmap->l_searchlist.r_list; - - for (j = 1; j < remmap->l_searchlist.r_nlist; ++j) - if (! (dep_list[j]->l_flags_1 & DF_1_NODELETE) - || ! dep_list[j]->l_init_called) + /* Mark all dependencies as used. */ + if (l->l_initfini != NULL) + { + struct link_map **lp = &l->l_initfini[1]; + while (*lp != NULL) + { + if ((*lp)->l_idx != -1) { - assert (dep_list[j]->l_idx < map->l_searchlist.r_nlist); - assert (new_opencount[dep_list[j]->l_idx] > 0); - if (--new_opencount[dep_list[j]->l_idx] == 0) + assert ((*lp)->l_idx >= 0 && (*lp)->l_idx < nloaded); + + if (!used[(*lp)->l_idx]) { - assert (dep_list[j]->l_type == lt_loaded); - mark_removed (dep_list[j]); + used[(*lp)->l_idx] = 1; + if ((*lp)->l_idx - 1 < done_index) + done_index = (*lp)->l_idx - 1; } } - } - if (remmap->l_reldeps != NULL) + ++lp; + } + } + /* And the same for relocation dependencies. */ + if (l->l_reldeps != NULL) + for (unsigned int j = 0; j < l->l_reldepsact; ++j) + { + struct link_map *jmap = l->l_reldeps[j]; + + if (jmap->l_idx != -1) { - unsigned int j; - for (j = 0; j < remmap->l_reldepsact; ++j) - { - struct link_map *depmap = remmap->l_reldeps[j]; + assert (jmap->l_idx >= 0 && jmap->l_idx < nloaded); - /* Find out whether this object is in our list. */ - if (depmap->l_idx < nopencount - && list[depmap->l_idx] == depmap) - { - /* Yes, it is. If is has a search list, make a - recursive call to handle this. */ - if (depmap->l_searchlist.r_list != NULL) - { - assert (new_opencount[depmap->l_idx] > 0); - if (--new_opencount[depmap->l_idx] == 0) - { - /* This one is now gone, too. */ - assert (depmap->l_type == lt_loaded); - mark_removed (depmap); - } - } - else - { - /* Otherwise we have to handle the dependency - deallocation here. */ - unsigned int k; - for (k = 0; depmap->l_initfini[k] != NULL; ++k) - { - struct link_map *rl = depmap->l_initfini[k]; - - if (rl->l_idx < nopencount - && list[rl->l_idx] == rl) - { - assert (new_opencount[rl->l_idx] > 0); - if (--new_opencount[rl->l_idx] == 0) - { - /* Another module to remove. */ - assert (rl->l_type == lt_loaded); - mark_removed (rl); - } - } - else - { - assert (rl->l_opencount > 0); - if (--rl->l_opencount == 0) - mark_removed (rl); - } - } - } - } - } + if (!used[jmap->l_idx]) + { + used[jmap->l_idx] = 1; + if (jmap->l_idx - 1 < done_index) + done_index = jmap->l_idx - 1; + } } } + } - mark_removed (list[i]); - } - assert (new_opencount[0] == 0); + /* Sort the entries. */ + _dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nloaded, used, ns); - /* Call all termination functions at once. */ - for (i = 0; list[i] != NULL; ++i) + bool unload_any = false; + unsigned int first_loaded = ~0; + for (i = 0; i < nloaded; ++i) { - struct link_map *imap = list[i]; - if (new_opencount[i] == 0 && imap->l_type == lt_loaded - && (imap->l_flags_1 & DF_1_NODELETE) == 0) - { - /* When debugging print a message first. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0)) - GLRO(dl_debug_printf) ("\ncalling fini: %s [%lu]\n\n", - imap->l_name, imap->l_ns); + struct link_map *imap = maps[i]; + + if (!used[i]) + { + assert (imap->l_type == lt_loaded + && (imap->l_flags_1 & DF_1_NODELETE) == 0); /* Call its termination function. Do not do it for half-cooked objects. */ if (imap->l_init_called) { + /* When debugging print a message first. */ + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0)) + GLRO(dl_debug_printf) ("\ncalling fini: %s [%lu]\n\n", + imap->l_name, ns); + if (imap->l_info[DT_FINI_ARRAY] != NULL) { ElfW(Addr) *array = @@ -299,42 +262,60 @@ _dl_close (void *_map) + imap->l_info[DT_FINI]->d_un.d_ptr))) (); } - /* This object must not be used anymore. We must remove the - reference from the scope. */ - unsigned int j; - struct link_map **searchlist = map->l_searchlist.r_list; - unsigned int nsearchlist = map->l_searchlist.r_nlist; - -#ifndef NDEBUG - bool found = false; -#endif - for (j = 0; j < nsearchlist; ++j) - if (imap == searchlist[j]) - { - /* This is the object to remove. Copy all the - following ones. */ - while (++j < nsearchlist) - searchlist[j - 1] = searchlist[j]; - - searchlist[j - 1] = NULL; + /* This object must not be used anymore. */ + imap->l_removed = 1; - --map->l_searchlist.r_nlist; + /* We indeed have an object to remove. */ + unload_any = true; -#ifndef NDEBUG - found = true; -#endif - break; - } - assert (found); + /* Remember where the first dynamically loaded object is. */ + if (i < first_loaded) + first_loaded = i; } + /* Else used[i]. */ + else if (imap->l_type == lt_loaded) + { + if (imap->l_searchlist.r_list == NULL + && imap->l_initfini != NULL) + { + /* The object is still used. But the object we are + unloading right now is responsible for loading it. If + the current object does not have it's own scope yet we + have to create one. This has to be done before running + the finalizers. + + To do this count the number of dependencies. */ + unsigned int cnt; + for (cnt = 1; imap->l_initfini[cnt] != NULL; ++cnt) + ; + + /* We simply reuse the l_initfini list. */ + imap->l_searchlist.r_list = &imap->l_initfini[cnt + 1]; + imap->l_searchlist.r_nlist = cnt; - /* Store the new l_opencount value. */ - imap->l_opencount = new_opencount[i]; + for (cnt = 0; imap->l_scope[cnt] != NULL; ++cnt) + if (imap->l_scope[cnt] == &map->l_searchlist) + { + imap->l_scope[cnt] = &imap->l_searchlist; + break; + } + } - /* Just a sanity check. */ - assert (imap->l_type == lt_loaded || imap->l_opencount > 0); + /* The loader is gone, so mark the object as not having one. + Note: l_idx == -1 -> object will be removed. */ + if (imap->l_loader != NULL && imap->l_loader->l_idx != -1) + imap->l_loader = NULL; + + /* Remember where the first dynamically loaded object is. */ + if (i < first_loaded) + first_loaded = i; + } } + /* If there are no objects to unload, do nothing further. */ + if (!unload_any) + goto out; + /* Notify the debugger we are about to remove some loaded objects. */ _r_debug.r_state = RT_DELETE; GLRO(dl_debug_state) (); @@ -347,12 +328,12 @@ _dl_close (void *_map) /* Check each element of the search list to see if all references to it are gone. */ - for (i = 0; list[i] != NULL; ++i) + for (i = first_loaded; i < nloaded; ++i) { - struct link_map *imap = list[i]; - if (imap->l_opencount == 0 && imap->l_type == lt_loaded) + struct link_map *imap = maps[i]; + if (!used[i]) { - struct libname_list *lnp; + assert (imap->l_type == lt_loaded); /* That was the last reference, and this was a dlopen-loaded object. We can unmap it. */ @@ -482,39 +463,13 @@ _dl_close (void *_map) if (imap->l_origin != (char *) -1) free ((char *) imap->l_origin); - /* If the object has relocation dependencies save this - information for latter. */ - if (__builtin_expect (imap->l_reldeps != NULL, 0)) - { - struct reldep_list *newrel; - - newrel = (struct reldep_list *) alloca (sizeof (*reldeps) - + (imap->l_reldepsact - * sizeof (bool))); - newrel->rellist = imap->l_reldeps; - newrel->nrellist = imap->l_reldepsact; - newrel->next = reldeps; - - newrel->nhandled = imap->l_reldepsact; - unsigned int j; - for (j = 0; j < imap->l_reldepsact; ++j) - { - /* Find out whether this object is in our list. */ - if (imap->l_reldeps[j]->l_idx < nopencount - && list[imap->l_reldeps[j]->l_idx] == imap->l_reldeps[j]) - /* Yes, it is. */ - newrel->handled[j] = true; - else - newrel->handled[j] = false; - } - - reldeps = newrel; - } + free (imap->l_reldeps); /* This name always is allocated. */ free (imap->l_name); /* Remove the list with all the names of the shared object. */ - lnp = imap->l_libname; + + struct libname_list *lnp = imap->l_libname; do { struct libname_list *this = lnp; @@ -525,8 +480,7 @@ _dl_close (void *_map) while (lnp != NULL); /* Remove the searchlists. */ - if (imap != map) - free (imap->l_initfini); + free (imap->l_initfini); /* Remove the scope array if we allocated it. */ if (imap->l_scope != imap->l_scope_mem) @@ -560,26 +514,8 @@ _dl_close (void *_map) _r_debug.r_state = RT_CONSISTENT; GLRO(dl_debug_state) (); - /* Now we can perhaps also remove the modules for which we had - dependencies because of symbol lookup. */ - while (__builtin_expect (reldeps != NULL, 0)) - { - while (reldeps->nrellist-- > 0) - /* Some of the relocation dependencies might be on the - dependency list of the object we are closing right now. - They were already handled. Do not close them again. */ - if (reldeps->nrellist < reldeps->nhandled - && ! reldeps->handled[reldeps->nrellist]) - _dl_close (reldeps->rellist[reldeps->nrellist]); - - free (reldeps->rellist); - - reldeps = reldeps->next; - } - - free (list); - /* Release the lock. */ + out: __rtld_lock_unlock_recursive (GL(dl_load_lock)); } libc_hidden_def (_dl_close) @@ -657,3 +593,7 @@ libc_freeres_fn (free_mem) } #endif } + +#ifdef SHARED +#include "dl-fini.c" +#endif --- libc/elf/unload4mod4.c.jj 2005-03-18 17:07:20.000000000 +0100 +++ libc/elf/unload4mod4.c 2005-03-18 17:07:20.000000000 +0100 @@ -0,0 +1,16 @@ +#include +#include + +int +__attribute__((noinline)) +baz (int x) +{ + abort (); +} + +int +bar (int x) +{ + puts ("in bar"); + return baz (x + 1) + 2; +} --- libc/elf/order2.c.jj 2005-03-19 18:50:18.493699624 +0100 +++ libc/elf/order2.c 2005-03-19 18:50:18.492699802 +0100 @@ -0,0 +1,46 @@ +#include +#include + + +int call_puts; + +static int +do_test (void) +{ + call_puts = 1; + + void *h1 = dlopen ("$ORIGIN/order2mod1.so", RTLD_LAZY | RTLD_GLOBAL); + if (h1 == NULL) + { + puts ("cannot load order2mod1"); + return 1; + } + void *h2 = dlopen ("$ORIGIN/order2mod2.so", RTLD_LAZY); + if (h2 == NULL) + { + puts ("cannot load order2mod2"); + return 1; + } + if (dlclose (h1) != 0) + { + puts ("dlclose order2mod1 failed"); + return 1; + } + if (dlclose (h2) != 0) + { + puts ("dlclose order2mod2 failed"); + return 1; + } + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" + +static void +__attribute__ ((destructor)) +fini (void) +{ + if (call_puts) + puts ("5"); +} --- libc/elf/dl-load.c.jj 2005-02-23 16:31:49.000000000 +0100 +++ libc/elf/dl-load.c 2005-03-18 17:07:20.000000000 +0100 @@ -839,7 +839,7 @@ _dl_map_object_from_fd (const char *name /* Look again to see if the real name matched another already loaded. */ for (l = GL(dl_ns)[nsid]._ns_loaded; l; l = l->l_next) - if (l->l_ino == st.st_ino && l->l_dev == st.st_dev) + if (l->l_removed == 0 && l->l_ino == st.st_ino && l->l_dev == st.st_dev) { /* The object is already loaded. Just bump its reference count and return it. */ @@ -1824,7 +1824,8 @@ _dl_map_object (struct link_map *loader, /* If the requested name matches the soname of a loaded object, use that object. Elide this check for names that have not yet been opened. */ - if (__builtin_expect (l->l_faked, 0) != 0) + if (__builtin_expect (l->l_faked, 0) != 0 + || __builtin_expect (l->l_removed, 0) != 0) continue; if (!_dl_name_match_p (name, l)) { --- libc/elf/testobj2.c.jj 2005-03-03 17:21:28.000000000 +0100 +++ libc/elf/testobj2.c 2005-03-19 18:45:06.814011684 +0100 @@ -1,5 +1,6 @@ #include #include +#include #include "testobj.h" --- libc/elf/unload4mod2.c.jj 2005-03-18 17:07:20.000000000 +0100 +++ libc/elf/unload4mod2.c 2005-03-18 17:07:20.000000000 +0100 @@ -0,0 +1,8 @@ +#include + +int +baz (int x) +{ + puts ("in baz"); + return x * 4; +} --- libc/elf/circleload1.c.jj 2002-07-17 02:31:32.000000000 +0200 +++ libc/elf/circleload1.c 2005-03-18 17:07:20.000000000 +0100 @@ -27,7 +27,7 @@ check_loaded_objects (const char **loade for (lm = _r_debug.r_map; lm; lm = lm->l_next) { if (lm->l_name && lm->l_name[0]) - printf(" %s, count = %d\n", lm->l_name, (int) lm->l_opencount); + printf(" %s, count = %d\n", lm->l_name, (int) lm->l_direct_opencount); if (lm->l_type == lt_loaded && lm->l_name) { int match = 0; --- libc/elf/unload4.c.jj 2005-03-18 17:07:20.000000000 +0100 +++ libc/elf/unload4.c 2005-03-18 17:07:20.000000000 +0100 @@ -0,0 +1,48 @@ +#include +#include +#include + +int +main (void) +{ +#ifdef M_PERTURB + mallopt (M_PERTURB, 0xaa); +#endif + + void *h; + int (*fn) (int); + h = dlopen ("unload4mod1.so", RTLD_LAZY); + if (h == NULL) + { + puts ("1st dlopen failed"); + return 1; + } + fn = dlsym (h, "foo"); + if (fn == NULL) + { + puts ("dlsym failed"); + return 1; + } + int n = fn (10); + if (n != 28) + { + printf ("foo (10) returned %d != 28\n", n); + return 1; + } + dlclose (h); + h = dlopen ("unload4mod3.so", RTLD_LAZY); + fn = dlsym (h, "mod3fn2"); + if (fn == NULL) + { + puts ("second dlsym failed"); + return 1; + } + n = fn (10); + if (n != 22) + { + printf ("mod3fn2 (10) returned %d != 22\n", n); + return 1; + } + dlclose (h); + return 0; +} --- libc/elf/unload5.c.jj 2005-03-18 17:07:20.000000000 +0100 +++ libc/elf/unload5.c 2005-03-18 17:07:20.000000000 +0100 @@ -0,0 +1,42 @@ +#include +#include + +int +main (void) +{ + void *g = dlopen ("unload3mod1.so", RTLD_GLOBAL | RTLD_NOW); + void *h = dlopen ("unload3mod2.so", RTLD_GLOBAL | RTLD_NOW); + if (g == NULL || h == NULL) + { + printf ("dlopen unload3mod{1,2}.so failed: %p %p\n", g, h); + return 1; + } + dlopen ("unload3mod4.so", RTLD_GLOBAL | RTLD_NOW); + dlclose (h); + dlclose (g); + + g = dlopen ("unload3mod3.so", RTLD_GLOBAL | RTLD_NOW); + h = dlopen ("unload3mod4.so", RTLD_GLOBAL | RTLD_NOW); + if (g == NULL || h == NULL) + { + printf ("dlopen unload3mod{3,4}.so failed: %p %p\n", g, h); + return 1; + } + + int (*fn) (int); + fn = dlsym (h, "bar"); + if (fn == NULL) + { + puts ("dlsym failed"); + return 1; + } + + int val = fn (16); + if (val != 24) + { + printf ("bar returned %d != 24\n", val); + return 1; + } + + return 0; +} --- libc/elf/order2mod1.c.jj 2005-03-19 18:50:18.493699624 +0100 +++ libc/elf/order2mod1.c 2005-03-19 18:50:18.493699624 +0100 @@ -0,0 +1,8 @@ +#include + +static void +__attribute__ ((destructor)) +fini (void) +{ + putchar ('1'); +} --- libc/elf/do-lookup.h.jj 2004-10-14 07:55:32.000000000 +0200 +++ libc/elf/do-lookup.h 2005-03-18 17:07:20.000000000 +0100 @@ -52,6 +52,10 @@ do_lookup_x (const char *undef_name, uns if ((type_class & ELF_RTYPE_CLASS_COPY) && map->l_type == lt_executable) continue; + /* Do not look into objects which are going to be removed. */ + if (map->l_removed) + continue; + /* Print some debugging info if wanted. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0)) _dl_debug_printf ("symbol=%s; lookup in file=%s\n", --- libc/elf/loadtest.c.jj 2001-09-08 18:21:22.000000000 +0200 +++ libc/elf/loadtest.c 2005-03-18 17:07:20.000000000 +0100 @@ -73,8 +73,8 @@ static const struct #define OUT \ for (map = _r_debug.r_map; map != NULL; map = map->l_next) \ if (map->l_type == lt_loaded) \ - printf ("name = \"%s\", opencount = %d\n", \ - map->l_name, (int) map->l_opencount); \ + printf ("name = \"%s\", direct_opencount = %d\n", \ + map->l_name, (int) map->l_direct_opencount); \ fflush (stdout) @@ -183,8 +183,8 @@ main (int argc, char *argv[]) for (map = _r_debug.r_map; map != NULL; map = map->l_next) if (map->l_type == lt_loaded) { - printf ("name = \"%s\", opencount = %d\n", - map->l_name, (int) map->l_opencount); + printf ("name = \"%s\", direct_opencount = %d\n", + map->l_name, (int) map->l_direct_opencount); result = 1; } --- libc/elf/neededtest4.c.jj 2000-12-31 07:07:57.000000000 +0100 +++ libc/elf/neededtest4.c 2005-03-18 17:07:20.000000000 +0100 @@ -27,7 +27,7 @@ check_loaded_objects (const char **loade for (lm = _r_debug.r_map; lm; lm = lm->l_next) { if (lm->l_name && lm->l_name[0]) - printf(" %s, count = %d\n", lm->l_name, (int) lm->l_opencount); + printf(" %s, count = %d\n", lm->l_name, (int) lm->l_direct_opencount); if (lm->l_type == lt_loaded && lm->l_name) { int match = 0; --- libc/elf/neededtest3.c.jj 2000-10-24 18:59:29.000000000 +0200 +++ libc/elf/neededtest3.c 2005-03-18 17:07:20.000000000 +0100 @@ -27,7 +27,7 @@ check_loaded_objects (const char **loade for (lm = _r_debug.r_map; lm; lm = lm->l_next) { if (lm->l_name && lm->l_name[0]) - printf(" %s, count = %d\n", lm->l_name, (int) lm->l_opencount); + printf(" %s, count = %d\n", lm->l_name, (int) lm->l_direct_opencount); if (lm->l_type == lt_loaded && lm->l_name) { int match = 0; --- libc/elf/unload3mod4.c.jj 2005-03-03 17:21:28.000000000 +0100 +++ libc/elf/unload3mod4.c 2005-03-19 18:45:06.816011329 +0100 @@ -1,5 +1,7 @@ #include +extern int foo (int x); + int bar (int x) { --- libc/elf/unload4mod3.c.jj 2005-03-18 17:07:20.000000000 +0100 +++ libc/elf/unload4mod3.c 2005-03-18 17:07:20.000000000 +0100 @@ -0,0 +1,16 @@ +#include + +int +__attribute__((noinline)) +mod3fn1 (int x) +{ + puts ("in mod3fn1"); + return x + 6; +} + +int +mod3fn2 (int x) +{ + puts ("in mod3fn2"); + return mod3fn1 (x / 2) * 2; +} --- libc/elf/neededtest.c.jj 2000-10-24 17:25:53.000000000 +0200 +++ libc/elf/neededtest.c 2005-03-18 17:07:20.000000000 +0100 @@ -27,7 +27,7 @@ check_loaded_objects (const char **loade for (lm = _r_debug.r_map; lm; lm = lm->l_next) { if (lm->l_name && lm->l_name[0]) - printf(" %s, count = %d\n", lm->l_name, (int) lm->l_opencount); + printf(" %s, count = %d\n", lm->l_name, (int) lm->l_direct_opencount); if (lm->l_type == lt_loaded && lm->l_name) { int match = 0; --- libc/elf/unload2.c.jj 2000-10-21 07:55:09.000000000 +0200 +++ libc/elf/unload2.c 2005-03-18 17:07:20.000000000 +0100 @@ -9,8 +9,8 @@ #define OUT \ for (map = _r_debug.r_map; map != NULL; map = map->l_next) \ if (map->l_type == lt_loaded) \ - printf ("name = \"%s\", opencount = %d\n", \ - map->l_name, (int) map->l_opencount); \ + printf ("name = \"%s\", direct_opencount = %d\n", \ + map->l_name, (int) map->l_direct_opencount); \ fflush (stdout) int --- libc/elf/dl-fini.c.jj 2005-02-23 16:31:49.000000000 +0100 +++ libc/elf/dl-fini.c 2005-03-19 19:46:58.587159986 +0100 @@ -23,10 +23,97 @@ #include +void +internal_function +_dl_sort_fini (struct link_map *l, struct link_map **maps, size_t nmaps, + char *used, Lmid_t ns) +{ + if (ns == LM_ID_BASE) + /* The main executable always comes first. */ + l = l->l_next; + + for (; l != NULL; l = l->l_next) + /* Do not handle ld.so in secondary namespaces and object which + are not removed. */ + if (l == l->l_real && l->l_idx != -1) + { + /* Find the place in the 'maps' array. */ + unsigned int j; + for (j = ns == LM_ID_BASE ? 1 : 0; maps[j] != l; ++j) + assert (j < nmaps); + + /* Find all object for which the current one is a dependency + and move the found object (if necessary) in front. */ + for (unsigned int k = j + 1; k < nmaps; ++k) + { + struct link_map **runp = maps[k]->l_initfini; + if (runp != NULL) + { + while (*runp != NULL) + if (*runp == l) + { + struct link_map *here = maps[k]; + + /* Move it now. */ + memmove (&maps[j] + 1, + &maps[j], (k - j) * sizeof (struct link_map *)); + maps[j] = here; + + if (used != NULL) + { + char here_used = used[k]; + + memmove (&used[j] + 1, + &used[j], (k - j) * sizeof (char)); + used[j] = here_used; + } + + ++j; + + break; + } + else + ++runp; + } + + if (__builtin_expect (maps[k]->l_reldeps != NULL, 0)) + { + unsigned int m = maps[k]->l_reldepsact; + struct link_map **relmaps = maps[k]->l_reldeps; + + while (m-- > 0) + { + if (relmaps[m] == l) + { + struct link_map *here = maps[k]; + + /* Move it now. */ + memmove (&maps[j] + 1, + &maps[j], + (k - j) * sizeof (struct link_map *)); + maps[j] = here; + + if (used != NULL) + { + char here_used = used[k]; + + memmove (&used[j] + 1, + &used[j], (k - j) * sizeof (char)); + used[j] = here_used; + } + + break; + } + } + } + } + } +} + +#if !defined SHARED || defined IS_IN_rtld /* Type of the constructor functions. */ typedef void (*fini_t) (void); - void internal_function _dl_fini (void) @@ -48,16 +135,16 @@ _dl_fini (void) /* We run the destructors of the main namespaces last. As for the other namespaces, we pick run the destructors in them in reverse order of the namespace ID. */ - for (Lmid_t cnt = DL_NNS - 1; cnt >= 0; --cnt) + for (Lmid_t ns = DL_NNS - 1; ns >= 0; --ns) { /* Protect against concurrent loads and unloads. */ __rtld_lock_lock_recursive (GL(dl_load_lock)); - unsigned int nloaded = GL(dl_ns)[cnt]._ns_nloaded; + unsigned int nloaded = GL(dl_ns)[ns]._ns_nloaded; /* XXX Could it be (in static binaries) that there is no object loaded? */ - assert (cnt != LM_ID_BASE || nloaded > 0); + assert (ns != LM_ID_BASE || nloaded > 0); /* Now we can allocate an array to hold all the pointers and copy the pointers in. */ @@ -76,86 +163,27 @@ _dl_fini (void) unsigned int i; struct link_map *l; - for (l = GL(dl_ns)[cnt]._ns_loaded, i = 0; l != NULL; l = l->l_next) + for (l = GL(dl_ns)[ns]._ns_loaded, i = 0; l != NULL; l = l->l_next) /* Do not handle ld.so in secondary namespaces. */ if (l == l->l_real) { assert (i < nloaded); - maps[i++] = l; - - /* Bump l_opencount of all objects so that they are not - dlclose()ed from underneath us. */ - ++l->l_opencount; + maps[i] = l; + l->l_idx = i; + ++i; + + /* Bump l_direct_opencount of all objects so that they are + not dlclose()ed from underneath us. */ + ++l->l_direct_opencount; } - assert (cnt != LM_ID_BASE || i == nloaded); - assert (cnt == LM_ID_BASE || i == nloaded || i == nloaded - 1); + assert (ns != LM_ID_BASE || i == nloaded); + assert (ns == LM_ID_BASE || i == nloaded || i == nloaded - 1); unsigned int nmaps = i; if (nmaps != 0) - { - /* Now we have to do the sorting. */ - l = GL(dl_ns)[cnt]._ns_loaded; - if (cnt == LM_ID_BASE) - /* The main executable always comes first. */ - l = l->l_next; - for (; l != NULL; l = l->l_next) - /* Do not handle ld.so in secondary namespaces. */ - if (l == l->l_real) - { - /* Find the place in the 'maps' array. */ - unsigned int j; - for (j = cnt == LM_ID_BASE ? 1 : 0; maps[j] != l; ++j) - assert (j < nmaps); - - /* Find all object for which the current one is a dependency - and move the found object (if necessary) in front. */ - for (unsigned int k = j + 1; k < nmaps; ++k) - { - struct link_map **runp = maps[k]->l_initfini; - if (runp != NULL) - { - while (*runp != NULL) - if (*runp == l) - { - struct link_map *here = maps[k]; - - /* Move it now. */ - memmove (&maps[j] + 1, - &maps[j], - (k - j) * sizeof (struct link_map *)); - maps[j++] = here; - - break; - } - else - ++runp; - } - - if (__builtin_expect (maps[k]->l_reldeps != NULL, 0)) - { - unsigned int m = maps[k]->l_reldepsact; - struct link_map **relmaps = maps[k]->l_reldeps; - - while (m-- > 0) - { - if (relmaps[m] == l) - { - struct link_map *here = maps[k]; - - /* Move it now. */ - memmove (&maps[j] + 1, - &maps[j], - (k - j) * sizeof (struct link_map *)); - maps[j] = here; - - break; - } - } - } - } - } - } + /* Now we have to do the sorting. */ + _dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nmaps, NULL, ns); /* We do not rely on the linked list of loaded object anymore from this point on. We have our own list here (maps). The various @@ -191,7 +219,7 @@ _dl_fini (void) 0)) _dl_debug_printf ("\ncalling fini: %s [%lu]\n\n", l->l_name[0] ? l->l_name : rtld_progname, - cnt); + ns); /* First see whether an array is given. */ if (l->l_info[DT_FINI_ARRAY] != NULL) @@ -211,14 +239,17 @@ _dl_fini (void) } /* Correct the previous increment. */ - --l->l_opencount; + --l->l_direct_opencount; } } +#ifdef SHARED if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_STATISTICS, 0)) _dl_debug_printf ("\nruntime linker statistics:\n" " final number of relocations: %lu\n" "final number of relocations from cache: %lu\n", GL(dl_num_relocations), GL(dl_num_cache_relocations)); +#endif } +#endif --- libc/elf/Makefile.jj 2005-03-03 17:21:28.000000000 +0100 +++ libc/elf/Makefile 2005-03-19 18:51:29.155161033 +0100 @@ -84,7 +84,9 @@ distribute := rtld-Rules \ tst-execstack-mod.c tst-dlmodcount.c \ check-textrel.c dl-sysdep.h test-dlopenrpathmod.c \ tst-deep1mod1.c tst-deep1mod2.c tst-deep1mod3.c \ - unload3mod1.c unload3mod2.c unload3mod3.c unload3mod4.c + unload3mod1.c unload3mod2.c unload3mod3.c unload3mod4.c \ + unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ + order2mod1.c order2mod2.c order2mod3.c order2mod4.c CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables @@ -156,7 +158,7 @@ tests += loadtest restest1 preloadtest l tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 tst-align \ tst-align2 $(tests-execstack-$(have-z-execstack)) tst-dlmodcount \ tst-dlopenrpath tst-deep1 tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ - unload3 tst-global1 + unload3 unload4 unload5 tst-global1 order2 # reldep9 test-srcs = tst-pathopt tests-vis-yes = vismain @@ -192,7 +194,9 @@ modules-names = testobj1 testobj2 testob $(modules-execstack-$(have-z-execstack)) \ tst-dlopenrpathmod tst-deep1mod1 tst-deep1mod2 tst-deep1mod3 \ tst-dlmopen1mod \ - unload3mod1 unload3mod2 unload3mod3 unload3mod4 + unload3mod1 unload3mod2 unload3mod3 unload3mod4 \ + unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ + order2mod1 order2mod2 order2mod3 order2mod4 ifeq (yes,$(have-initfini-array)) modules-names += tst-array2dep endif @@ -427,6 +431,8 @@ $(objpfx)reldep9mod3.so: $(objpfx)reldep $(objpfx)unload3mod1.so: $(objpfx)unload3mod3.so $(objpfx)unload3mod2.so: $(objpfx)unload3mod3.so $(objpfx)unload3mod3.so: $(objpfx)unload3mod4.so +$(objpfx)unload4mod1.so: $(objpfx)unload4mod2.so $(objpfx)unload4mod3.so +$(objpfx)unload4mod2.so: $(objpfx)unload4mod4.so $(objpfx)unload4mod3.so LDFLAGS-tst-tlsmod5.so = -nostdlib LDFLAGS-tst-tlsmod6.so = -nostdlib @@ -467,6 +473,7 @@ circlemod3a.so-no-z-defs = yes reldep8mod2.so-no-z-defs = yes reldep9mod1.so-no-z-defs = yes unload3mod4.so-no-z-defs = yes +unload4mod1.so-no-z-defs = yes # filtmod1.so has a special rule $(filter-out $(objpfx)filtmod1.so, $(test-modules)): $(objpfx)%.so: $(objpfx)%.os @@ -687,6 +694,13 @@ $(objpfx)unload3: $(libdl) $(objpfx)unload3.out: $(objpfx)unload3mod1.so $(objpfx)unload3mod2.so \ $(objpfx)unload3mod3.so $(objpfx)unload3mod4.so +$(objpfx)unload4: $(libdl) +$(objpfx)unload4.out: $(objpfx)unload4mod1.so $(objpfx)unload4mod3.so + +$(objpfx)unload5: $(libdl) +$(objpfx)unload5.out: $(objpfx)unload3mod1.so $(objpfx)unload3mod2.so \ + $(objpfx)unload3mod3.so $(objpfx)unload3mod4.so + ifdef libdl $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so @@ -793,3 +807,15 @@ $(objpfx)tst-dlmopen3.out: $(objpfx)tst- $(objpfx)tst-global1: $(libdl) $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so + +$(objpfx)order2: $(libdl) +$(objpfx)order2.out: $(objpfx)order2 $(objpfx)order2mod1.so \ + $(objpfx)order2mod2.so + $(elf-objpfx)$(rtld-installed-name) \ + --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ + $(objpfx)order2 > $@ + (echo "12345" | cmp $@ -) > /dev/null +$(objpfx)order2mod1.so: $(objpfx)order2mod4.so +$(objpfx)order2mod4.so: $(objpfx)order2mod3.so +$(objpfx)order2mod2.so: $(objpfx)order2mod3.so +order2mod2.so-no-z-defs = yes --- libc/elf/order2mod3.c.jj 2005-03-19 18:50:18.494699447 +0100 +++ libc/elf/order2mod3.c 2005-03-19 18:50:18.494699447 +0100 @@ -0,0 +1,14 @@ +#include + +int +bar (void) +{ + return 1; +} + +static void +__attribute__ ((destructor)) +fini (void) +{ + putchar ('4'); +} --- libc/elf/dl-open.c.jj 2005-02-23 16:31:49.000000000 +0100 +++ libc/elf/dl-open.c 2005-03-18 18:46:08.000000000 +0100 @@ -279,23 +279,14 @@ dl_open_worker (void *a) { /* Let the user know about the opencount. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) - GLRO(dl_debug_printf) ("opening file=%s [%lu]; opencount=%u\n\n", - new->l_name, new->l_ns, new->l_opencount); + GLRO(dl_debug_printf) ("opening file=%s [%lu]; direct_opencount=%u\n\n", + new->l_name, new->l_ns, new->l_direct_opencount); /* If the user requested the object to be in the global namespace but it is not so far, add it now. */ if ((mode & RTLD_GLOBAL) && new->l_global == 0) (void) add_to_global (new); - if (new->l_direct_opencount == 1) - /* This is the only direct reference. Increment all the - dependencies' reference counter. */ - for (i = 0; i < new->l_searchlist.r_nlist; ++i) - ++new->l_searchlist.r_list[i]->l_opencount; - else - /* Increment just the reference counter of the object. */ - ++new->l_opencount; - return; } @@ -373,135 +364,133 @@ dl_open_worker (void *a) any_tls = false; #endif - /* Increment the open count for all dependencies. If the file is - not loaded as a dependency here add the search list of the newly - loaded object to the scope. */ + /* If the file is not loaded now as a dependency, add the search + list of the newly loaded object to the scope. */ for (i = 0; i < new->l_searchlist.r_nlist; ++i) - if (++new->l_searchlist.r_list[i]->l_opencount > 1 - && new->l_real->l_searchlist.r_list[i]->l_type == lt_loaded) - { - struct link_map *imap = new->l_searchlist.r_list[i]; - struct r_scope_elem **runp = imap->l_scope; - size_t cnt = 0; - - while (*runp != NULL) - { - /* This can happen if imap was just loaded, but during - relocation had l_opencount bumped because of relocation - dependency. Avoid duplicates in l_scope. */ - if (__builtin_expect (*runp == &new->l_searchlist, 0)) - break; - - ++cnt; - ++runp; - } - - if (*runp != NULL) - /* Avoid duplicates. */ - continue; - - if (__builtin_expect (cnt + 1 >= imap->l_scope_max, 0)) - { - /* The 'r_scope' array is too small. Allocate a new one - dynamically. */ - struct r_scope_elem **newp; - size_t new_size = imap->l_scope_max * 2; - - if (imap->l_scope == imap->l_scope_mem) - { - newp = (struct r_scope_elem **) - malloc (new_size * sizeof (struct r_scope_elem *)); - if (newp == NULL) - GLRO(dl_signal_error) (ENOMEM, "dlopen", NULL, - N_("cannot create scope list")); - imap->l_scope = memcpy (newp, imap->l_scope, - cnt * sizeof (imap->l_scope[0])); - } - else - { - newp = (struct r_scope_elem **) - realloc (imap->l_scope, - new_size * sizeof (struct r_scope_elem *)); - if (newp == NULL) - GLRO(dl_signal_error) (ENOMEM, "dlopen", NULL, - N_("cannot create scope list")); - imap->l_scope = newp; - } + { + struct link_map *imap = new->l_searchlist.r_list[i]; + + /* If the initializer has been called already, the object has + not been loaded here and now. */ + if (imap->l_init_called && imap->l_type == lt_loaded) + { + struct r_scope_elem **runp = imap->l_scope; + size_t cnt = 0; - imap->l_scope_max = new_size; - } + while (*runp != NULL) + { + ++cnt; + ++runp; + } - imap->l_scope[cnt++] = &new->l_searchlist; - imap->l_scope[cnt] = NULL; - } + if (*runp != NULL) + /* Avoid duplicates. */ + continue; + + if (__builtin_expect (cnt + 1 >= imap->l_scope_max, 0)) + { + /* The 'r_scope' array is too small. Allocate a new one + dynamically. */ + struct r_scope_elem **newp; + size_t new_size = imap->l_scope_max * 2; + + if (imap->l_scope == imap->l_scope_mem) + { + newp = (struct r_scope_elem **) + malloc (new_size * sizeof (struct r_scope_elem *)); + if (newp == NULL) + GLRO(dl_signal_error) (ENOMEM, "dlopen", NULL, + N_("cannot create scope list")); + imap->l_scope = memcpy (newp, imap->l_scope, + cnt * sizeof (imap->l_scope[0])); + } + else + { + newp = (struct r_scope_elem **) + realloc (imap->l_scope, + new_size * sizeof (struct r_scope_elem *)); + if (newp == NULL) + GLRO(dl_signal_error) (ENOMEM, "dlopen", NULL, + N_("cannot create scope list")); + imap->l_scope = newp; + } + + imap->l_scope_max = new_size; + } + + imap->l_scope[cnt++] = &new->l_searchlist; + imap->l_scope[cnt] = NULL; + } #if USE_TLS - else if (new->l_searchlist.r_list[i]->l_opencount == 1 - /* Only if the module defines thread local data. */ - && __builtin_expect (new->l_searchlist.r_list[i]->l_tls_blocksize - > 0, 0)) - { - /* Now that we know the object is loaded successfully add - modules containing TLS data to the dtv info table. We - might have to increase its size. */ - struct dtv_slotinfo_list *listp; - struct dtv_slotinfo_list *prevp; - size_t idx = new->l_searchlist.r_list[i]->l_tls_modid; - - assert (new->l_searchlist.r_list[i]->l_type == lt_loaded); - - /* Find the place in the dtv slotinfo list. */ - listp = GL(dl_tls_dtv_slotinfo_list); - prevp = NULL; /* Needed to shut up gcc. */ - do - { - /* Does it fit in the array of this list element? */ - if (idx < listp->len) - break; - idx -= listp->len; - prevp = listp; - listp = listp->next; - } - while (listp != NULL); - - if (listp == NULL) - { - /* When we come here it means we have to add a new element - to the slotinfo list. And the new module must be in - the first slot. */ - assert (idx == 0); - - listp = prevp->next = (struct dtv_slotinfo_list *) - malloc (sizeof (struct dtv_slotinfo_list) - + TLS_SLOTINFO_SURPLUS * sizeof (struct dtv_slotinfo)); - if (listp == NULL) - { - /* We ran out of memory. We will simply fail this - call but don't undo anything we did so far. The - application will crash or be terminated anyway very - soon. */ - - /* We have to do this since some entries in the dtv - slotinfo array might already point to this - generation. */ - ++GL(dl_tls_generation); - - GLRO(dl_signal_error) (ENOMEM, "dlopen", NULL, N_("\ -cannot create TLS data structures")); - } - - listp->len = TLS_SLOTINFO_SURPLUS; - listp->next = NULL; - memset (listp->slotinfo, '\0', - TLS_SLOTINFO_SURPLUS * sizeof (struct dtv_slotinfo)); - } - - /* Add the information into the slotinfo data structure. */ - listp->slotinfo[idx].map = new->l_searchlist.r_list[i]; - listp->slotinfo[idx].gen = GL(dl_tls_generation) + 1; + /* Only add TLS memory if this object is loaded now and + therefore is not yet initialized. */ + else if (! imap->l_init_called + /* Only if the module defines thread local data. */ + && __builtin_expect (imap->l_tls_blocksize > 0, 0)) + { + /* Now that we know the object is loaded successfully add + modules containing TLS data to the dtv info table. We + might have to increase its size. */ + struct dtv_slotinfo_list *listp; + struct dtv_slotinfo_list *prevp; + size_t idx = imap->l_tls_modid; + + assert (imap->l_type == lt_loaded); + + /* Find the place in the dtv slotinfo list. */ + listp = GL(dl_tls_dtv_slotinfo_list); + prevp = NULL; /* Needed to shut up gcc. */ + do + { + /* Does it fit in the array of this list element? */ + if (idx < listp->len) + break; + idx -= listp->len; + prevp = listp; + listp = listp->next; + } + while (listp != NULL); - /* We have to bump the generation counter. */ - any_tls = true; - } + if (listp == NULL) + { + /* When we come here it means we have to add a new element + to the slotinfo list. And the new module must be in + the first slot. */ + assert (idx == 0); + + listp = prevp->next = (struct dtv_slotinfo_list *) + malloc (sizeof (struct dtv_slotinfo_list) + + TLS_SLOTINFO_SURPLUS * sizeof (struct dtv_slotinfo)); + if (listp == NULL) + { + /* We ran out of memory. We will simply fail this + call but don't undo anything we did so far. The + application will crash or be terminated anyway very + soon. */ + + /* We have to do this since some entries in the dtv + slotinfo array might already point to this + generation. */ + ++GL(dl_tls_generation); + + GLRO(dl_signal_error) (ENOMEM, "dlopen", NULL, N_("\ + cannot create TLS data structures")); + } + + listp->len = TLS_SLOTINFO_SURPLUS; + listp->next = NULL; + memset (listp->slotinfo, '\0', + TLS_SLOTINFO_SURPLUS * sizeof (struct dtv_slotinfo)); + } + + /* Add the information into the slotinfo data structure. */ + listp->slotinfo[idx].map = imap; + listp->slotinfo[idx].gen = GL(dl_tls_generation) + 1; + + /* We have to bump the generation counter. */ + any_tls = true; + } + } /* Bump the generation number if necessary. */ if (any_tls) @@ -532,8 +521,8 @@ cannot create TLS data structures")); /* Let the user know about the opencount. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) - GLRO(dl_debug_printf) ("opening file=%s [%lu]; opencount=%u\n\n", - new->l_name, new->l_ns, new->l_opencount); + GLRO(dl_debug_printf) ("opening file=%s [%lu]; direct_opencount=%u\n\n", + new->l_name, new->l_ns, new->l_direct_opencount); } @@ -603,14 +592,6 @@ no more namespaces available for dlmopen state if relocation failed, for example. */ if (args.map) { - unsigned int i; - - /* Increment open counters for all objects since this - sometimes has not happened yet. */ - if (args.map->l_searchlist.r_list[0]->l_opencount == 0) - for (i = 0; i < args.map->l_searchlist.r_nlist; ++i) - ++args.map->l_searchlist.r_list[i]->l_opencount; - #ifdef USE_TLS /* Maybe some of the modules which were loaded uses TLS. Since it will be removed in the following _dl_close call --- libc/elf/neededtest2.c.jj 2000-10-24 00:39:57.000000000 +0200 +++ libc/elf/neededtest2.c 2005-03-18 17:07:20.000000000 +0100 @@ -27,7 +27,7 @@ check_loaded_objects (const char **loade for (lm = _r_debug.r_map; lm; lm = lm->l_next) { if (lm->l_name && lm->l_name[0]) - printf(" %s, count = %d\n", lm->l_name, (int) lm->l_opencount); + printf(" %s, count = %d\n", lm->l_name, (int) lm->l_direct_opencount); if (lm->l_type == lt_loaded && lm->l_name) { int match = 0; --- libc/elf/order2mod4.c.jj 2005-03-19 18:50:18.495699269 +0100 +++ libc/elf/order2mod4.c 2005-03-19 18:50:18.495699269 +0100 @@ -0,0 +1,16 @@ +#include + +extern int bar (void); + +int +foo (void) +{ + return 42 + bar (); +} + +static void +__attribute__ ((destructor)) +fini (void) +{ + putchar ('3'); +} --- libc/elf/order2mod2.c.jj 2005-03-19 18:50:18.494699447 +0100 +++ libc/elf/order2mod2.c 2005-03-19 18:50:18.493699624 +0100 @@ -0,0 +1,18 @@ +#include + +extern int foo (void); +extern int bar (void); + +void +__attribute__ ((constructor)) +init (void) +{ + foo () - bar (); +} + +static void +__attribute__ ((destructor)) +fini (void) +{ + putchar ('2'); +} --- libc/elf/dl-deps.c.jj 2004-10-14 07:55:32.000000000 +0200 +++ libc/elf/dl-deps.c 2005-03-18 17:07:20.000000000 +0100 @@ -566,8 +566,6 @@ Filters not supported with LD_TRACE_PREL { /* A direct or transitive dependency is also on the list of relocation dependencies. Remove the latter. */ - --map->l_reldeps[i]->l_opencount; - for (j = i + 1; j < map->l_reldepsact; ++j) map->l_reldeps[j - 1] = map->l_reldeps[j]; --- libc/elf/dl-lookup.c.jj 2004-10-14 07:55:32.000000000 +0200 +++ libc/elf/dl-lookup.c 2005-03-19 18:50:18.491699979 +0100 @@ -91,11 +91,6 @@ add_dependency (struct link_map *undef_m /* Make sure nobody can unload the object while we are at it. */ __rtld_lock_lock_recursive (GL(dl_load_lock)); - /* Don't create cross-reference between modules which are - dynamically loaded by the same dlopen() call. */ - if (undef_map->l_opencount == 0 && map->l_opencount == 0) - goto out; - /* Avoid references to objects which cannot be unloaded anyway. */ if (map->l_type != lt_loaded || (map->l_flags_1 & DF_1_NODELETE) != 0) @@ -107,14 +102,13 @@ add_dependency (struct link_map *undef_m if (undef_map->l_type != lt_loaded || (undef_map->l_flags_1 & DF_1_NODELETE) != 0) { - ++map->l_opencount; map->l_flags_1 |= DF_1_NODELETE; goto out; } /* Determine whether UNDEF_MAP already has a reference to MAP. First look in the normal dependencies. */ - if (undef_map->l_searchlist.r_list != NULL) + if (undef_map->l_initfini != NULL) { list = undef_map->l_initfini; @@ -172,19 +166,6 @@ add_dependency (struct link_map *undef_m if (__builtin_expect (act < undef_map->l_reldepsmax, 1)) undef_map->l_reldeps[undef_map->l_reldepsact++] = map; - if (map->l_searchlist.r_list != NULL) - /* And increment the counter in the referenced object. */ - ++map->l_opencount; - else - /* We have to bump the counts for all dependencies since so far - this object was only a normal or transitive dependency. - Now it might be closed with _dl_close() directly. */ - for (list = map->l_initfini; *list != NULL; ++list) - ++(*list)->l_opencount; - - /* As if it is opened through _dl_open. */ - ++map->l_direct_opencount; - /* Display information if we are debugging. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) _dl_debug_printf ("\ --- libc/sysdeps/generic/ldsodefs.h.jj 2005-02-23 16:32:30.000000000 +0100 +++ libc/sysdeps/generic/ldsodefs.h 2005-03-19 18:50:18.421712398 +0100 @@ -783,6 +783,11 @@ extern void _dl_init (struct link_map *m initializer functions have completed. */ extern void _dl_fini (void) internal_function; +/* Sort array MAPS according to dependencies of the contained objects. */ +extern void _dl_sort_fini (struct link_map *l, struct link_map **maps, + size_t nmaps, char *used, Lmid_t ns) + internal_function; + /* The dynamic linker calls this function before and having changing any shared object mappings. The `r_state' member of `struct r_debug' says what change is taking place. This function's address is --- libc/include/link.h.jj 2005-02-23 16:31:56.000000000 +0100 +++ libc/include/link.h 2005-03-18 17:08:04.000000000 +0100 @@ -177,7 +177,7 @@ struct link_map Elf_Symndx l_nbuckets; const Elf_Symndx *l_buckets, *l_chain; - unsigned int l_opencount; /* Counter for direct and indirect usage. */ + unsigned int l_dummy_opencount; /* Used to be l_opencount, now unused. */ unsigned int l_direct_opencount; /* Reference count for dlopen/dlclose. */ enum /* Where this object came from. */ { @@ -199,6 +199,8 @@ struct link_map should be called on this link map when relocation finishes. */ unsigned int l_used:1; /* Nonzero if the DSO is used. */ + unsigned int l_removed:1; /* Nozero if the object cannot be used anymore + since it is removed. */ /* Array with version names. */ unsigned int l_nversions; struct r_found_version *l_versions; @@ -255,7 +257,7 @@ struct link_map ElfW(Word) l_flags; /* Temporarily used in `dl_close'. */ - unsigned int l_idx; + int l_idx; struct link_map_machine l_mach; Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/FC-3/glibc.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- glibc.spec 3 Mar 2005 16:59:38 -0000 1.103 +++ glibc.spec 19 Mar 2005 20:37:49 -0000 1.104 @@ -1,7 +1,7 @@ %define glibcdate 20050226T0141 %define glibcname glibc-2.3 %define glibcversion 2.3.4 -%define glibcrelease 2.fc3.4 +%define glibcrelease 2.fc3.5 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -22,6 +22,7 @@ Patch1: %{name}-nptl-check.patch Patch2: %{name}-ppc-assume.patch Patch3: %{name}-ia64-lib64.patch +Patch4: glibc-dlopen-gc.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: linuxthreads, gencat, locale, ldconfig, locale-ja @@ -269,6 +270,7 @@ %patch3 -p1 %endif %endif +%patch4 -p1 # Hack till glibc-kernheaders get updated, argh mkdir asm @@ -1273,6 +1275,9 @@ %endif %changelog +* Sat Mar 19 2005 Jakub Jelinek 2.3.4-2.fc3.5 +- better fix for the dlclose bug (#145810, #150414) + * Thu Mar 3 2005 Jakub Jelinek 2.3.4-2.fc3.4 - fix dlclose (#145810) - clear padding in gconv-modules.cache (#146614, BZ#776) From fedora-cvs-commits at redhat.com Sat Mar 19 20:40:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 15:40:52 -0500 Subject: rpms/glibc/FC-3 glibc.spec,1.104,1.105 Message-ID: <200503192040.j2JKeqFb005842@cvs.devel.redhat.com> Update of /cvs/dist/rpms/glibc/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv5830 Modified Files: glibc.spec Log Message: 2.3.4-2.fc3.5 Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/FC-3/glibc.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- glibc.spec 19 Mar 2005 20:37:49 -0000 1.104 +++ glibc.spec 19 Mar 2005 20:40:50 -0000 1.105 @@ -22,7 +22,7 @@ Patch1: %{name}-nptl-check.patch Patch2: %{name}-ppc-assume.patch Patch3: %{name}-ia64-lib64.patch -Patch4: glibc-dlopen-gc.patch +Patch4: glibc-dlclose-gc.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: linuxthreads, gencat, locale, ldconfig, locale-ja From fedora-cvs-commits at redhat.com Sat Mar 19 21:26:32 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 16:26:32 -0500 Subject: rpms/mysql/FC-3 mysql.spec,1.33,1.34 Message-ID: <200503192126.j2JLQWHS001830@cvs.devel.redhat.com> Update of /cvs/dist/rpms/mysql/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv1817 Modified Files: mysql.spec Log Message: Run 'make test' only on the archs we support for FC-3. Index: mysql.spec =================================================================== RCS file: /cvs/dist/rpms/mysql/FC-3/mysql.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- mysql.spec 19 Mar 2005 03:56:34 -0000 1.33 +++ mysql.spec 19 Mar 2005 21:26:29 -0000 1.34 @@ -142,7 +142,7 @@ make %{?_smp_mflags} make check -%ifnarch ppc64 s390x x86_64 +%ifnarch ppc ppc64 ia64 s390 s390x make test %endif @@ -313,8 +313,9 @@ %{_datadir}/sql-bench %changelog -* Fri Mar 18 2005 Tom Lane 3.23.58-15.FC3.1 +* Sat Mar 19 2005 Tom Lane 3.23.58-15.FC3.1 - Backpatch repair for CAN-2005-0709, CAN-2005-0710, CAN-2005-0711 (bz#151051). +- Run 'make test' only on the archs we support for FC-3. * Wed Jan 5 2005 Tom Lane 3.23.58-14 - work around SELinux restriction that breaks mysql_install_db (bug #141062) From fedora-cvs-commits at redhat.com Sat Mar 19 22:00:32 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 17:00:32 -0500 Subject: rpms/glibc/devel .cvsignore, 1.90, 1.91 glibc-fedora.patch, 1.69, 1.70 glibc.spec, 1.133, 1.134 sources, 1.106, 1.107 Message-ID: <200503192200.j2JM0WOo016163@cvs.devel.redhat.com> Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16142/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.4-15 on branch devel from glibc-2.3.4-15.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- .cvsignore 4 Mar 2005 00:18:49 -0000 1.90 +++ .cvsignore 19 Mar 2005 22:00:26 -0000 1.91 @@ -1,2 +1,2 @@ -glibc-20050303T1335.tar.bz2 -glibc-fedora-20050303T1335.tar.bz2 +glibc-20050319T1907.tar.bz2 +glibc-fedora-20050319T1907.tar.bz2 glibc-fedora.patch: ChangeLog | 12 ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 ++ Versions.def | 1 csu/elf-init.c | 18 debug/Versions | 6 debug/fgets_chk.c | 2 debug/fgets_u_chk.c | 2 debug/getcwd_chk.c | 3 debug/getwd_chk.c | 3 debug/pread64_chk.c | 3 debug/pread_chk.c | 3 debug/read_chk.c | 3 debug/readlink_chk.c | 3 debug/recv_chk.c | 3 debug/recvfrom_chk.c | 3 debug/tst-chk1.c | 9 elf/dl-support.c | 5 elf/ldconfig.c | 25 - elf/rtld.c | 98 ++++ elf/tst-tls10.h | 4 iconv/iconvconfig.c | 55 +- include/features.h | 10 intl/locale.alias | 2 libio/bits/stdio2.h | 34 - libio/stdio.h | 2 linuxthreads/ChangeLog | 34 + linuxthreads/Makefile | 7 linuxthreads/cancel.c | 1 linuxthreads/lockfile.c | 6 linuxthreads/semaphore.h | 1 linuxthreads/sysdeps/alpha/tls.h | 46 +- linuxthreads/sysdeps/i386/tls.h | 9 linuxthreads/sysdeps/ia64/tls.h | 9 linuxthreads/sysdeps/powerpc/tls.h | 12 linuxthreads/sysdeps/pthread/Makefile | 12 linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym | 13 linuxthreads/sysdeps/s390/tls.h | 9 linuxthreads/sysdeps/sh/tls.h | 9 linuxthreads/sysdeps/sparc/tls.h | 9 linuxthreads/sysdeps/x86_64/tls.h | 9 linuxthreads/tst-tls1.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 + localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/en_US | 1 localedata/locales/no_NO | 69 +++ localedata/locales/zh_TW | 6 nptl/ChangeLog | 10 nptl/Makefile | 8 nptl/descr.h | 4 nptl/pthread_cond_destroy.c | 30 + nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nscd/connections.c | 52 ++ nscd/nscd.c | 8 nscd/nscd.conf | 4 nscd/nscd_conf.c | 5 posix/Makefile | 19 posix/bits/unistd.h | 58 -- posix/getconf.speclist.h | 15 socket/bits/socket2.h | 18 sysdeps/generic/dl-cache.h | 8 sysdeps/i386/bits/atomic.h | 410 +++++++++++++++++++ sysdeps/i386/i486/Makefile | 4 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ---------------- sysdeps/ia64/libgcc-compat.c | 84 +++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/alpha/bits/termios.h | 85 ++- sysdeps/unix/sysv/linux/bits/termios.h | 3 sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/powerpc/bits/termios.h | 84 ++- sysdeps/unix/sysv/linux/readonly-area.c | 5 sysdeps/unix/sysv/linux/sparc/bits/termios.h | 88 ++-- sysdeps/unix/sysv/linux/tcsetattr.c | 32 + version.h | 2 85 files changed, 1573 insertions(+), 648 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- glibc-fedora.patch 6 Mar 2005 23:47:00 -0000 1.69 +++ glibc-fedora.patch 19 Mar 2005 22:00:26 -0000 1.70 @@ -1,30 +1,6 @@ ---- glibc-20050303T1335/ChangeLog 3 Mar 2005 08:28:23 -0000 1.9240 -+++ glibc-20050303T1335-fedora/ChangeLog 5 Mar 2005 13:13:04 -0000 1.8782.2.85 -@@ -1,3 +1,15 @@ -+2005-03-05 Jakub Jelinek -+ -+ * Makerules ($(inst_libdir)/libc.so): Use $(slibdir) instead of -+ $(inst_slibdir) in AS_NEEDED directive. -+ -+ * include/bits/unistd.h: New file. -+ * include/bits/socket2.h: New file. -+ -+ * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define -+ unconditionally to (defined RTLD_BOOTSTRAP). -+ * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise. -+ - 2005-03-01 H.J. Lu - - [BZ #776] -@@ -10,6 +22,7 @@ - loader is closed. Fixes unload3. - * elf/tst-global1.c: New file. - * elf/Makefile (tests): Add tst-global1. -+ * elf/testobj2.c (p): New function. - - 2005-03-03 Jakub Jelinek - -@@ -529,6 +542,18 @@ +--- glibc-20050319T1907/ChangeLog 19 Mar 2005 17:45:59 -0000 1.9279 ++++ glibc-20050319T1907-fedora/ChangeLog 19 Mar 2005 20:17:57 -0000 1.8782.2.86 +@@ -887,6 +887,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -43,8 +19,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20050303T1335/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20050303T1335-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050319T1907/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20050319T1907-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -94,8 +70,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20050303T1335/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20050303T1335-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050319T1907/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20050319T1907-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -122,8 +98,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20050303T1335/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20050303T1335-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20050319T1907/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20050319T1907-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -204,19 +180,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20050303T1335/Makerules 24 Feb 2005 02:10:30 -0000 1.429 -+++ glibc-20050303T1335-fedora/Makerules 5 Mar 2005 13:13:06 -0000 1.423.2.5 -@@ -972,7 +972,7 @@ $(inst_libdir)/libc.so: $(common-objpfx) - cat $<; \ - echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \ - '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\ -- ' AS_NEEDED (' $(inst_slibdir)/$(rtld-installed-name) ') )' \ -+ ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \ - ) > $@.new - mv -f $@.new $@ - ---- glibc-20050303T1335/Versions.def 21 Feb 2005 23:06:21 -0000 1.59 -+++ glibc-20050303T1335-fedora/Versions.def 3 Mar 2005 16:52:24 -0000 1.58.2.2 +--- glibc-20050319T1907/Versions.def 21 Feb 2005 23:06:21 -0000 1.59 ++++ glibc-20050319T1907-fedora/Versions.def 3 Mar 2005 16:52:24 -0000 1.58.2.2 @@ -20,7 +20,6 @@ libc { GLIBC_2.3.2 GLIBC_2.3.3 @@ -225,16 +190,16 @@ %ifdef USE_IN_LIBIO HURD_CTHREADS_0.3 %endif ---- glibc-20050303T1335/version.h 20 Dec 2004 23:37:41 -0000 1.67 -+++ glibc-20050303T1335-fedora/version.h 6 Jan 2005 15:21:51 -0000 1.65.2.3 +--- glibc-20050319T1907/version.h 20 Dec 2004 23:37:41 -0000 1.67 ++++ glibc-20050319T1907-fedora/version.h 6 Jan 2005 15:21:51 -0000 1.65.2.3 @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ #define RELEASE "development" -#define VERSION "2.3.90" +#define VERSION "2.3.4" ---- glibc-20050303T1335/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 -+++ glibc-20050303T1335-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 +--- glibc-20050319T1907/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 ++++ glibc-20050319T1907-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 @@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo extern void (*__init_array_end []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden; @@ -260,8 +225,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20050303T1335/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 -+++ glibc-20050303T1335-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 +--- glibc-20050319T1907/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 ++++ glibc-20050319T1907-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 @@ -18,10 +18,4 @@ libc { __printf_chk; __fprintf_chk; __vprintf_chk; __vfprintf_chk; __gets_chk; @@ -273,8 +238,8 @@ - __recv_chk; __recvfrom_chk; - } } ---- glibc-20050303T1335/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050303T1335-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050319T1907/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050319T1907-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -288,8 +253,8 @@ return result; } +#endif ---- glibc-20050303T1335/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050303T1335-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050319T1907/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050319T1907-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -303,8 +268,8 @@ return result; } +#endif ---- glibc-20050303T1335/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 -+++ glibc-20050303T1335-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 +--- glibc-20050319T1907/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 ++++ glibc-20050319T1907-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 @@ -20,7 +20,7 @@ #include #include @@ -319,8 +284,8 @@ return __getcwd (buf, size); } +#endif ---- glibc-20050303T1335/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050303T1335-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050319T1907/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050319T1907-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -20,7 +20,7 @@ #include #include @@ -335,8 +300,8 @@ link_warning (getwd, "the `getwd' function is dangerous and should not be used.") +#endif ---- glibc-20050303T1335/debug/pread64_chk.c 1 Mar 2005 01:00:11 -0000 1.3 -+++ glibc-20050303T1335-fedora/debug/pread64_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 +--- glibc-20050319T1907/debug/pread64_chk.c 19 Mar 2005 00:08:11 -0000 1.4 ++++ glibc-20050319T1907-fedora/debug/pread64_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -348,11 +313,11 @@ { @@ -28,3 +28,4 @@ __pread64_chk (int fd, void *buf, size_t - return __pread64 (fd, buf, offset, nbytes); + return __pread64 (fd, buf, nbytes, offset); } +#endif ---- glibc-20050303T1335/debug/pread_chk.c 1 Mar 2005 00:59:33 -0000 1.3 -+++ glibc-20050303T1335-fedora/debug/pread_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 +--- glibc-20050319T1907/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 ++++ glibc-20050319T1907-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -364,11 +329,11 @@ { @@ -28,3 +28,4 @@ __pread_chk (int fd, void *buf, size_t n - return __pread (fd, buf, offset, nbytes); + return __pread (fd, buf, nbytes, offset); } +#endif ---- glibc-20050303T1335/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 -+++ glibc-20050303T1335-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 +--- glibc-20050319T1907/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 ++++ glibc-20050319T1907-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -383,8 +348,8 @@ #endif } +#endif ---- glibc-20050303T1335/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 -+++ glibc-20050303T1335-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 +--- glibc-20050319T1907/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 ++++ glibc-20050319T1907-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -399,8 +364,8 @@ #endif } +#endif ---- glibc-20050303T1335/debug/recv_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050303T1335-fedora/debug/recv_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050319T1907/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 ++++ glibc-20050319T1907-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -410,13 +375,13 @@ ssize_t __recv_chk (int fd, void *buf, size_t n, size_t buflen, int flags) { -@@ -31,3 +31,4 @@ __recv_chk (int fd, void *buf, size_t n, - __chk_fail (); - return nrecv; +@@ -28,3 +28,4 @@ __recv_chk (int fd, void *buf, size_t n, + + return __recv (fd, buf, n, flags); } +#endif ---- glibc-20050303T1335/debug/recvfrom_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050303T1335-fedora/debug/recvfrom_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050319T1907/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 ++++ glibc-20050319T1907-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -426,14 +391,24 @@ ssize_t __recvfrom_chk (int fd, void *buf, size_t n, size_t buflen, int flags, __SOCKADDR_ARG addr, socklen_t *addr_len) -@@ -33,3 +33,4 @@ __recvfrom_chk (int fd, void *buf, size_ - __chk_fail (); - return nrecv; +@@ -29,3 +29,4 @@ __recvfrom_chk (int fd, void *buf, size_ + + return __recvfrom (fd, buf, n, flags, addr, addr_len); } +#endif ---- glibc-20050303T1335/debug/tst-chk1.c 21 Feb 2005 23:09:07 -0000 1.6 -+++ glibc-20050303T1335-fedora/debug/tst-chk1.c 3 Mar 2005 13:33:53 -0000 1.1.2.8 -@@ -213,7 +213,7 @@ do_test (void) +--- glibc-20050319T1907/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 ++++ glibc-20050319T1907-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 +@@ -17,6 +17,9 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++/* Hack: make sure GCC doesn't know __chk_fail () will not return. */ ++#define __noreturn__ ++ + #include + #include + #include +@@ -215,7 +218,7 @@ do_test (void) if (memcmp (a.buf1, "aabcdabcjj", 10)) FAIL (); @@ -442,7 +417,7 @@ /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2 and sufficient GCC support, as the string operations overflow from a.buf1 into a.buf2. */ -@@ -312,7 +312,7 @@ do_test (void) +@@ -314,7 +317,7 @@ do_test (void) memset (a.buf1 + 9, 'j', l0 + 2); CHK_FAIL_END @@ -451,8 +426,17 @@ # define O 0 #else # define O 1 ---- glibc-20050303T1335/elf/dl-support.c 6 Nov 2004 00:24:49 -0000 1.87 -+++ glibc-20050303T1335-fedora/elf/dl-support.c 10 Nov 2004 09:02:46 -0000 1.84.2.4 +@@ -768,7 +771,7 @@ do_test (void) + || strcmp (getcwdbuf + 1, fname) != 0) + FAIL (); + +-#if __USE_FORTIFY_LEVEL >= 1 ++#if 0 && __USE_FORTIFY_LEVEL >= 1 + CHK_FAIL_START + if (getwd (getcwdbuf + 2) != getcwdbuf + 2) + FAIL (); +--- glibc-20050319T1907/elf/dl-support.c 6 Nov 2004 00:24:49 -0000 1.87 ++++ glibc-20050319T1907-fedora/elf/dl-support.c 10 Nov 2004 09:02:46 -0000 1.84.2.4 @@ -281,6 +281,11 @@ _dl_non_dynamic_init (void) if (_dl_platform != NULL) _dl_platformlen = strlen (_dl_platform); @@ -465,8 +449,8 @@ /* Scan for a program header telling us the stack is nonexecutable. */ if (_dl_phdr != NULL) for (uint_fast16_t i = 0; i < _dl_phnum; ++i) ---- glibc-20050303T1335/elf/ldconfig.c 12 Jan 2005 23:39:52 -0000 1.48 -+++ glibc-20050303T1335-fedora/elf/ldconfig.c 8 Feb 2005 10:04:03 -0000 1.47.2.2 +--- glibc-20050319T1907/elf/ldconfig.c 12 Jan 2005 23:39:52 -0000 1.48 ++++ glibc-20050319T1907-fedora/elf/ldconfig.c 8 Feb 2005 10:04:03 -0000 1.47.2.2 @@ -944,17 +944,19 @@ search_dirs (void) @@ -548,9 +532,9 @@ } search_dirs (); ---- glibc-20050303T1335/elf/rtld.c 12 Feb 2005 23:15:39 -0000 1.348 -+++ glibc-20050303T1335-fedora/elf/rtld.c 12 Feb 2005 10:01:55 -0000 1.330.2.14 -@@ -1223,6 +1223,53 @@ ld.so does not support TLS, but program +--- glibc-20050319T1907/elf/rtld.c 18 Mar 2005 11:10:26 -0000 1.349 ++++ glibc-20050319T1907-fedora/elf/rtld.c 19 Mar 2005 20:18:00 -0000 1.330.2.15 +@@ -1252,6 +1252,53 @@ ld.so does not support TLS, but program ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded; ++GL(dl_load_adds); @@ -604,11 +588,10 @@ /* If LD_USE_LOAD_BIAS env variable has not been seen, default to not using bias for non-prelinked PIEs and libraries and using it for executables or prelinked PIEs or libraries. */ -@@ -1594,6 +1641,67 @@ ERROR: ld.so: object '%s' from %s cannot +@@ -1590,6 +1637,57 @@ ERROR: ld.so: object '%s' cannot be load } } -+ +#if defined(__i386__) || defined(__alpha__) || (defined(__sparc__) && !defined(__arch64__)) + /* + * Modifications by Red Hat Software @@ -650,42 +633,21 @@ + if (test_fd >= 0) /* open did no fail.. */ + __close(test_fd); /* avoid fd leaks */ + -+ if (can_load != 0) { -+ struct link_map *new_map; -+ new_map = _dl_map_object (main_map, LIB_NOVERSION, -+ 1, lt_library, 0, 0, LM_ID_BASE); -+ if (++new_map->l_opencount == 1) { -+ /* It is no duplicate. */ -+ ++npreloads; -+/* _dl_sysdep_message(" DONE\n", NULL); */ -+ } else { -+/* _dl_sysdep_message(" FAILED\n", NULL); */ -+ } -+ } -+ ++ if (can_load != 0) ++ npreloads += do_preload (LIB_NOVERSION, main_map, ++ "nonversioned binary"); ++ + HP_TIMING_NOW (stop); + HP_TIMING_DIFF (diff, start, stop); + HP_TIMING_ACCUM_NT (load_time, diff); + } +#endif + - if (__builtin_expect (npreloads, 0) != 0) + if (__builtin_expect (GL(dl_rtld_map).l_next != NULL, 0)) { /* Set up PRELOADS with a vector of the preloaded libraries. */ ---- glibc-20050303T1335/elf/testobj2.c 15 Dec 2000 16:02:24 -0000 1.5 -+++ glibc-20050303T1335-fedora/elf/testobj2.c 3 Mar 2005 17:48:04 -0000 1.5.4.1 -@@ -23,3 +23,9 @@ preload (int a) - return fp (a) + 10; - return 10; - } -+ -+void -+p (void) -+{ -+ puts ("hello world"); -+} ---- glibc-20050303T1335/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 -+++ glibc-20050303T1335-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 +--- glibc-20050319T1907/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 ++++ glibc-20050319T1907-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 @@ -1,8 +1,8 @@ #include #include @@ -697,8 +659,8 @@ # define USE_TLS__THREAD struct A ---- glibc-20050303T1335/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 -+++ glibc-20050303T1335-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 +--- glibc-20050319T1907/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 ++++ glibc-20050319T1907-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -775,8 +737,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20050303T1335/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 -+++ glibc-20050303T1335-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 +--- glibc-20050319T1907/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 ++++ glibc-20050319T1907-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 @@ -262,7 +262,13 @@ # define __USE_REENTRANT 1 #endif @@ -801,16 +763,8 @@ #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) ---- glibc-20050303T1335/include/bits/socket2.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/include/bits/socket2.h 5 Mar 2005 13:04:47 -0000 1.1.2.1 -@@ -0,0 +1 @@ -+#include ---- glibc-20050303T1335/include/bits/unistd.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/include/bits/unistd.h 5 Mar 2005 13:04:47 -0000 1.1.2.1 -@@ -0,0 +1 @@ -+#include ---- glibc-20050303T1335/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20050303T1335-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20050319T1907/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20050319T1907-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -820,8 +774,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20050303T1335/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 -+++ glibc-20050303T1335-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 +--- glibc-20050319T1907/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 ++++ glibc-20050319T1907-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -835,8 +789,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20050303T1335/libio/bits/stdio2.h 21 Feb 2005 23:09:53 -0000 1.2 -+++ glibc-20050303T1335-fedora/libio/bits/stdio2.h 3 Mar 2005 16:52:27 -0000 1.1.2.4 +--- glibc-20050319T1907/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20050319T1907-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -867,42 +821,49 @@ #endif -@@ -77,13 +88,17 @@ extern char *__gets_chk (char *__str, si - ((__bos (__str) == (size_t) -1) \ - ? gets (__str) : __gets_chk (__str, __bos (__str))) - --extern char *__fgets_chk (char *s, size_t size, int n, FILE *stream); -+extern void __chk_fail (void) __attribute__((noreturn)); - #define fgets(__str, __n, __fp) \ -- ((__bos (__str) == (size_t) -1) \ -- ? fgets (__str, __n, __fp) : __fgets_chk (__str, __bos (__str), __n, __fp)) -+ (__extension__ \ -+ ({ size_t __n_val = (__n); \ -+ if (__bos (__str) != (size_t) -1 && __bos (__str) < __n_val) \ -+ __chk_fail (); \ -+ fgets (__str, __n_val, __fp); })) - --extern char *__fgets_unlocked_chk (char *s, size_t size, int n, FILE *stream); - #define fgets_unlocked(__str, __n, __fp) \ -- ((__bos (__str) == (size_t) -1) \ -- ? fgets_unlocked (__str, __n, __fp) \ -- : __fgets_unlocked_chk (__str, __bos (__str), __n, __fp)) -+ (__extension__ \ -+ ({ size_t __n_val = (__n); \ -+ if (__bos (__str) != (size_t) -1 && __bos (__str) < __n_val) \ -+ __chk_fail (); \ -+ fgets_unlocked (__str, __n_val, __fp); })) ---- glibc-20050303T1335/linuxthreads/ChangeLog 10 Feb 2005 07:16:22 -0000 1.837 -+++ glibc-20050303T1335-fedora/linuxthreads/ChangeLog 5 Mar 2005 13:03:34 -0000 1.817.2.18 -@@ -1,3 +1,7 @@ -+2005-03-05 Jakub Jelinek -+ -+ * sysdeps/powerpc/tcb-offsets.sym (thread_offsetof): Rework for GCC 4. -+ - 2005-02-09 Daniel Jacobowitz +@@ -83,8 +94,7 @@ gets (char *__str) + return __gets_alias (__str); + } + +-extern char *__fgets_chk (char *__restrict __s, size_t __size, int __n, +- FILE *__restrict __stream) __wur; ++extern void __chk_fail (void) __attribute__((__noreturn__)); + extern char *__REDIRECT (__fgets_alias, + (char *__restrict __s, int __n, + FILE *__restrict __stream), fgets) __wur; +@@ -92,15 +102,12 @@ extern char *__REDIRECT (__fgets_alias, + extern __always_inline __wur char * + fgets (char *__restrict __s, int __n, FILE *__restrict __stream) + { +- if (__bos (__s) != (size_t) -1 +- && (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s))) +- return __fgets_chk (__s, __bos (__s), __n, __stream); ++ if (__bos (__s) != (size_t) -1 && (size_t) __n > __bos (__s)) ++ __chk_fail (); + return __fgets_alias (__s, __n, __stream); + } - * descr.h (__pthread_find_self, thread_self): Mark as pure -@@ -766,6 +770,12 @@ + #ifdef __USE_GNU +-extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size, +- int __n, FILE *__restrict __stream) __wur; + extern char *__REDIRECT (__fgets_unlocked_alias, + (char *__restrict __s, int __n, + FILE *__restrict __stream), fgets_unlocked) __wur; +@@ -108,9 +115,8 @@ extern char *__REDIRECT (__fgets_unlocke + extern __always_inline __wur char * + fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream) + { +- if (__bos (__s) != (size_t) -1 +- && (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s))) +- return __fgets_unlocked_chk (__s, __bos (__s), __n, __stream); ++ if (__bos (__s) != (size_t) -1 && (size_t) __n > __bos (__s)) ++ __chk_fail (); + return __fgets_unlocked_alias (__s, __n, __stream); + } + #endif +--- glibc-20050319T1907/linuxthreads/ChangeLog 6 Mar 2005 00:16:10 -0000 1.840 ++++ glibc-20050319T1907-fedora/linuxthreads/ChangeLog 19 Mar 2005 20:18:03 -0000 1.817.2.19 +@@ -781,6 +781,12 @@ (pthread_barrierattr_setpshared): Return EINVAL if pshared is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. @@ -915,7 +876,7 @@ 2003-09-02 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/dl-sysdep.h -@@ -898,6 +908,34 @@ +@@ -913,6 +919,34 @@ 2003-07-22 Jakub Jelinek @@ -950,8 +911,8 @@ * descr.h (struct _pthread_descr_struct): Provide p_res member even if USE_TLS && HAVE___THREAD. * sysdeps/pthread/res-state.c (__res_state): Return __resp ---- glibc-20050303T1335/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 -+++ glibc-20050303T1335-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 +--- glibc-20050319T1907/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 ++++ glibc-20050319T1907-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 @@ -245,15 +245,18 @@ $(addprefix $(objpfx), \ $(filter-out $(tests-static) $(tests-reverse) unload, \ $(tests) $(test-srcs))): $(objpfx)libpthread.so \ @@ -973,8 +934,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20050303T1335/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20050303T1335-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +--- glibc-20050319T1907/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 ++++ glibc-20050319T1907-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 @@ -230,5 +230,6 @@ void __pthread_perform_cleanup(char *cur } @@ -982,8 +943,8 @@ + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); __libc_thread_freeres (); } ---- glibc-20050303T1335/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20050303T1335-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +--- glibc-20050319T1907/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 ++++ glibc-20050319T1907-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 @@ -74,7 +74,11 @@ __fresetlockfiles (void) __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); @@ -997,8 +958,8 @@ __pthread_mutexattr_destroy (&attr); ---- glibc-20050303T1335/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20050303T1335-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +--- glibc-20050319T1907/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 ++++ glibc-20050319T1907-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 @@ -21,6 +21,7 @@ # define __need_timespec # include @@ -1007,8 +968,8 @@ #ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20050303T1335/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20050303T1335-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +--- glibc-20050319T1907/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 ++++ glibc-20050319T1907-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 @@ -2,7 +2,7 @@ #include #include @@ -1018,8 +979,8 @@ struct tls_obj { ---- glibc-20050303T1335/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 +--- glibc-20050319T1907/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 @@ -58,54 +58,76 @@ typedef struct # include @@ -1109,8 +1070,8 @@ /* Get the thread descriptor definition. */ # include ---- glibc-20050303T1335/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 +--- glibc-20050319T1907/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 @@ -86,7 +86,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1127,8 +1088,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050303T1335/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 +--- glibc-20050319T1907/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 @@ -65,7 +65,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1145,19 +1106,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050303T1335/linuxthreads/sysdeps/powerpc/tcb-offsets.sym 13 Jan 2004 21:30:17 -0000 1.7 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/powerpc/tcb-offsets.sym 5 Mar 2005 13:03:35 -0000 1.7.2.1 -@@ -8,7 +8,7 @@ - -- Abuse tls.h macros to derive offsets relative to the thread register. - # undef __thread_register - # define __thread_register ((void *) 0) --# define thread_offsetof(mem) ((void *) &THREAD_SELF->p_##mem - (void *) 0) -+# define thread_offsetof(mem) ((ptrdiff_t) THREAD_SELF + offsetof (struct _pthread_descr_struct, p_##mem)) - - # else - ---- glibc-20050303T1335/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 +--- glibc-20050319T1907/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 @@ -69,11 +69,19 @@ typedef struct # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) @@ -1180,8 +1130,8 @@ TCB + 0x7000 (per the ABI). This implies that TCB address is TP - 0x7000. As we define TLS_DTV_AT_TP we can assume that the pthread_descr is allocated immediately ahead of the ---- glibc-20050303T1335/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +--- glibc-20050319T1907/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 @@ -12,3 +12,15 @@ endif ifeq ($(subdir),posix) CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../linuxthreads/Banner)\"" @@ -1198,8 +1148,8 @@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ +endif +endif ---- glibc-20050303T1335/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +--- glibc-20050319T1907/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 @@ -0,0 +1,13 @@ +#ifdef HAVE_TLS_SUPPORT +# ifndef HAVE_FORCED_UNWIND @@ -1214,8 +1164,8 @@ +#ifdef HAVE_TLS_SUPPORT +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +#endif ---- glibc-20050303T1335/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 +--- glibc-20050319T1907/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 @@ -77,7 +77,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1232,8 +1182,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050303T1335/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 +--- glibc-20050319T1907/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1250,8 +1200,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050303T1335/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 +--- glibc-20050319T1907/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1268,8 +1218,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050303T1335/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 -+++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 +--- glibc-20050319T1907/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 ++++ glibc-20050319T1907-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 @@ -71,7 +71,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1286,8 +1236,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050303T1335/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15 -+++ glibc-20050303T1335-fedora/locale/iso-4217.def 22 Sep 2004 21:20:57 -0000 1.15.2.1 +--- glibc-20050319T1907/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15 ++++ glibc-20050319T1907-fedora/locale/iso-4217.def 22 Sep 2004 21:20:57 -0000 1.15.2.1 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1379,8 +1329,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20050303T1335/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20050303T1335-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20050319T1907/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20050319T1907-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -1424,8 +1374,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20050303T1335/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20050303T1335-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20050319T1907/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20050319T1907-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1434,9 +1384,9 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20050303T1335/localedata/SUPPORTED 31 Oct 2004 20:49:54 -0000 1.72 -+++ glibc-20050303T1335-fedora/localedata/SUPPORTED 2 Nov 2004 12:25:45 -0000 1.71.2.2 -@@ -63,6 +63,7 @@ cy_GB.UTF-8/UTF-8 \ +--- glibc-20050319T1907/localedata/SUPPORTED 18 Mar 2005 19:14:44 -0000 1.73 ++++ glibc-20050319T1907-fedora/localedata/SUPPORTED 19 Mar 2005 20:18:04 -0000 1.71.2.3 +@@ -64,6 +64,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ da_DK/ISO-8859-1 \ @@ -1444,7 +1394,7 @@ de_AT.UTF-8/UTF-8 \ de_AT/ISO-8859-1 \ de_AT at euro/ISO-8859-15 \ -@@ -89,6 +90,7 @@ en_DK.UTF-8/UTF-8 \ +@@ -90,6 +91,7 @@ en_DK.UTF-8/UTF-8 \ en_DK/ISO-8859-1 \ en_GB.UTF-8/UTF-8 \ en_GB/ISO-8859-1 \ @@ -1452,7 +1402,7 @@ en_HK.UTF-8/UTF-8 \ en_HK/ISO-8859-1 \ en_IE.UTF-8/UTF-8 \ -@@ -103,6 +105,7 @@ en_SG.UTF-8/UTF-8 \ +@@ -104,6 +106,7 @@ en_SG.UTF-8/UTF-8 \ en_SG/ISO-8859-1 \ en_US.UTF-8/UTF-8 \ en_US/ISO-8859-1 \ @@ -1460,7 +1410,7 @@ en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ en_ZW.UTF-8/UTF-8 \ -@@ -243,6 +246,8 @@ nl_NL/ISO-8859-1 \ +@@ -244,6 +247,8 @@ nl_NL/ISO-8859-1 \ nl_NL at euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ @@ -1469,7 +1419,7 @@ oc_FR/ISO-8859-1 \ om_ET/UTF-8 \ om_KE/ISO-8859-1 \ -@@ -280,6 +285,7 @@ sv_FI/ISO-8859-1 \ +@@ -281,6 +286,7 @@ sv_FI/ISO-8859-1 \ sv_FI at euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -1477,8 +1427,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ/KOI8-T \ ---- glibc-20050303T1335/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20050303T1335-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20050319T1907/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20050319T1907-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1493,8 +1443,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20050303T1335/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20050303T1335-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20050319T1907/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20050319T1907-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1506,8 +1456,8 @@ date_fmt "/ / " ---- glibc-20050303T1335/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 -+++ glibc-20050303T1335-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 +--- glibc-20050319T1907/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 ++++ glibc-20050319T1907-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 @@ -100,7 +100,6 @@ mon " "";/ "";/ @@ -1516,8 +1466,8 @@ % Appropriate date and time representation (%c) % "%a %d %b %Y %r %Z" d_t_fmt "" ---- glibc-20050303T1335/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20050319T1907/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1588,8 +1538,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20050303T1335/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20050303T1335-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20050319T1907/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20050319T1907-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1617,9 +1567,9 @@ revision "0.2" date "2000-08-02" % ---- glibc-20050303T1335/nptl/ChangeLog 26 Feb 2005 01:34:15 -0000 1.765 -+++ glibc-20050303T1335-fedora/nptl/ChangeLog 3 Mar 2005 13:34:05 -0000 1.706.2.36 -@@ -529,6 +529,11 @@ +--- glibc-20050319T1907/nptl/ChangeLog 13 Mar 2005 03:28:56 -0000 1.766 ++++ glibc-20050319T1907-fedora/nptl/ChangeLog 19 Mar 2005 20:18:06 -0000 1.706.2.37 +@@ -533,6 +533,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1631,7 +1581,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2603,6 +2608,11 @@ +@@ -2607,6 +2612,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1643,8 +1593,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20050303T1335/nptl/Makefile 22 Dec 2004 20:07:09 -0000 1.166 -+++ glibc-20050303T1335-fedora/nptl/Makefile 6 Jan 2005 14:57:04 -0000 1.157.2.9 +--- glibc-20050319T1907/nptl/Makefile 22 Dec 2004 20:07:09 -0000 1.166 ++++ glibc-20050319T1907-fedora/nptl/Makefile 6 Jan 2005 14:57:04 -0000 1.157.2.9 @@ -499,15 +499,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1667,8 +1617,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20050303T1335/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 -+++ glibc-20050303T1335-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 +--- glibc-20050319T1907/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 ++++ glibc-20050319T1907-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 @@ -27,9 +27,13 @@ #include #include @@ -1683,8 +1633,8 @@ #include "../nptl_db/thread_db.h" #include #ifdef HAVE_FORCED_UNWIND ---- glibc-20050303T1335/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20050303T1335-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20050319T1907/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20050319T1907-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 @@ -44,15 +44,35 @@ __pthread_cond_destroy (cond) broadcasted, but still are using the pthread_cond_t structure, pthread_cond_destroy needs to wait for them. */ @@ -1726,8 +1676,8 @@ } return 0; ---- glibc-20050303T1335/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20050319T1907/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1735,8 +1685,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20050303T1335/nscd/connections.c 22 Feb 2005 22:52:32 -0000 1.66 -+++ glibc-20050303T1335-fedora/nscd/connections.c 3 Mar 2005 13:34:09 -0000 1.55.2.7 +--- glibc-20050319T1907/nscd/connections.c 22 Feb 2005 22:52:32 -0000 1.66 ++++ glibc-20050319T1907-fedora/nscd/connections.c 3 Mar 2005 13:34:09 -0000 1.55.2.7 @@ -21,6 +21,7 @@ #include #include @@ -1827,8 +1777,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20050303T1335/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 -+++ glibc-20050303T1335-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 +--- glibc-20050319T1907/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 ++++ glibc-20050319T1907-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 @@ -122,9 +122,16 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1854,8 +1804,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20050303T1335/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20050303T1335-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20050319T1907/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20050319T1907-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 @@ -31,8 +31,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1867,8 +1817,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20050303T1335/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 -+++ glibc-20050303T1335-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 +--- glibc-20050319T1907/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 ++++ glibc-20050319T1907-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 @@ -230,7 +230,10 @@ nscd_parse_file (const char *fname, stru if (strcmp (arg2, "no") == 0) dbs[cnt].shared = 0; @@ -1881,8 +1831,8 @@ break; } if (cnt == lastdb) ---- glibc-20050303T1335/posix/Makefile 23 Feb 2005 02:45:27 -0000 1.183 -+++ glibc-20050303T1335-fedora/posix/Makefile 3 Mar 2005 13:34:10 -0000 1.171.2.11 +--- glibc-20050319T1907/posix/Makefile 23 Feb 2005 02:45:27 -0000 1.183 ++++ glibc-20050319T1907-fedora/posix/Makefile 3 Mar 2005 13:34:10 -0000 1.171.2.11 @@ -105,7 +105,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1916,8 +1866,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20050303T1335/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20050319T1907/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1934,62 +1884,71 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20050303T1335/posix/bits/unistd.h 1 Mar 2005 21:33:42 -0000 1.3 -+++ glibc-20050303T1335-fedora/posix/bits/unistd.h 3 Mar 2005 16:52:27 -0000 1.3.2.2 -@@ -21,64 +21,44 @@ +--- glibc-20050319T1907/posix/bits/unistd.h 19 Mar 2005 00:13:23 -0000 1.7 ++++ glibc-20050319T1907-fedora/posix/bits/unistd.h 19 Mar 2005 20:18:07 -0000 1.3.2.3 +@@ -21,25 +21,19 @@ # error "Never include directly; use instead." #endif -extern ssize_t __read_chk (int __fd, void *__buf, size_t __nbytes, - size_t __buflen) __wur; -+extern void __chk_fail (void) __attribute__((noreturn)); - #define read(fd, buf, nbytes) \ -- (__bos0 (buf) != (size_t) -1 \ -- && (!__builtin_constant_p (nbytes) || (nbytes) > __bos0 (buf)) \ -- ? __read_chk (fd, buf, nbytes, __bos0 (buf)) \ -- : read (fd, buf, nbytes)) -+ (__extension__ \ -+ ({ size_t __nbytes_val = (nbytes); \ -+ if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __nbytes_val) \ -+ __chk_fail (); \ -+ read (fd, buf, __nbytes_val); })) ++extern void __chk_fail (void) __attribute__((__noreturn__)); + extern ssize_t __REDIRECT (__read_alias, (int __fd, void *__buf, + size_t __nbytes), read) __wur; + + extern __always_inline __wur ssize_t + read (int __fd, void *__buf, size_t __nbytes) + { +- if (__bos0 (__buf) != (size_t) -1 +- && (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf))) +- return __read_chk (__fd, __buf, __nbytes, __bos0 (__buf)); ++ if (__bos0 (__buf) != (size_t) -1 && __nbytes > __bos0 (__buf)) ++ __chk_fail (); + return __read_alias (__fd, __buf, __nbytes); + } #ifdef __USE_UNIX98 -extern ssize_t __pread_chk (int __fd, void *__buf, size_t __nbytes, - __off_t __offset, size_t __bufsize) __wur; -extern ssize_t __pread64_chk (int __fd, void *__buf, size_t __nbytes, - __off64_t __offset, size_t __bufsize) __wur; --# ifndef __USE_FILE_OFFSET64 --# define pread(fd, buf, nbytes, offset) \ -- (__bos0 (buf) != (size_t) -1 \ -- && (!__builtin_constant_p (nbytes) || (nbytes) > __bos0 (buf)) \ -- ? __pread64_chk (fd, buf, nbytes, offset, __bos0 (buf)) \ -- : pread (fd, buf, offset, nbytes)) --# else --# define pread(fd, buf, nbytes, offset) \ -- (__bos0 (buf) != (size_t) -1 \ -- && (!__builtin_constant_p (nbytes) || (nbytes) > __bos0 (buf)) \ -- ? __pread_chk (fd, buf, nbytes, offset, __bos0 (buf)) \ -- : pread (fd, buf, offset, nbytes)) --# endif -+# define pread(fd, buf, nbytes, offset) \ -+ (__extension__ \ -+ ({ size_t __nbytes_val = (nbytes); \ -+ if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __nbytes_val) \ -+ __chk_fail (); \ -+ pread (fd, buf, __nbytes_val, offset); })) - - # ifdef __USE_LARGEFILE64 - # define pread64(fd, buf, nbytes, offset) \ -- (__bos0 (buf) != (size_t) -1 \ -- && (!__builtin_constant_p (nbytes) || (nbytes) > __bos0 (buf)) \ -- ? __pread64_chk (fd, buf, nbytes, offset, __bos0 (buf)) \ -- : pread64 (fd, buf, offset, nbytes)) -+ (__extension__ \ -+ ({ size_t __nbytes_val = (nbytes); \ -+ if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __nbytes_val) \ -+ __chk_fail (); \ -+ pread64 (fd, buf, __nbytes_val, offset); })) + extern ssize_t __REDIRECT (__pread_alias, + (int __fd, void *__buf, size_t __nbytes, + __off_t __offset), pread) __wur; +@@ -51,18 +45,16 @@ extern ssize_t __REDIRECT (__pread64_ali + extern __always_inline __wur ssize_t + pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset) + { +- if (__bos0 (__buf) != (size_t) -1 +- && (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf))) +- return __pread_chk (__fd, __buf, __nbytes, __offset, __bos0 (__buf)); ++ if (__bos0 (__buf) != (size_t) -1 && __nbytes > __bos0 (__buf)) ++ __chk_fail (); + return __pread_alias (__fd, __buf, __nbytes, __offset); + } + # else + extern __always_inline __wur ssize_t + pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset) + { +- if (__bos0 (__buf) != (size_t) -1 +- && (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf))) +- return __pread64_chk (__fd, __buf, __nbytes, __offset, __bos0 (__buf)); ++ if (__bos0 (__buf) != (size_t) -1 && __nbytes > __bos0 (__buf)) ++ __chk_fail (); + return __pread64_alias (__fd, __buf, __nbytes, __offset); + } + # endif +@@ -71,19 +63,14 @@ pread (int __fd, void *__buf, size_t __n + extern __always_inline __wur ssize_t + pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) + { +- if (__bos0 (__buf) != (size_t) -1 +- && (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf))) +- return __pread64_chk (__fd, __buf, __nbytes, __offset, __bos0 (__buf)); ++ if (__bos0 (__buf) != (size_t) -1 && __nbytes > __bos0 (__buf)) ++ __chk_fail (); + return __pread64_alias (__fd, __buf, __nbytes, __offset); + } # endif #endif @@ -1998,83 +1957,96 @@ - char *__restrict __buf, size_t __len, - size_t __buflen) - __THROW __nonnull ((1, 2)) __wur; - # define readlink(path, buf, len) \ -- (__bos (buf) != (size_t) -1 \ -- && (!__builtin_constant_p (len) || (len) > __bos (buf)) \ -- ? __readlink_chk (path, buf, len, __bos (buf)) \ -- : readlink (path, buf, len)) -+ (__extension__ \ -+ ({ size_t __len_val = (len); \ -+ if (__bos (buf) != (size_t) -1 && __bos (buf) < __len_val) \ -+ __chk_fail (); \ -+ readlink (path, buf, __len_val); })) + extern int __REDIRECT_NTH (__readlink_alias, + (__const char *__restrict __path, + char *__restrict __buf, size_t __len), readlink) +@@ -93,38 +80,19 @@ extern __always_inline __nonnull ((1, 2) + __NTH (readlink (__const char *__restrict __path, char *__restrict __buf, + size_t __len)) + { +- if (__bos (__buf) != (size_t) -1 +- && (!__builtin_constant_p (__len) || __len > __bos (__buf))) +- return __readlink_chk (__path, __buf, __len, __bos (__buf)); ++ if (__bos (__buf) != (size_t) -1 && __len > __bos (__buf)) ++ __chk_fail (); + return __readlink_alias (__path, __buf, __len); + } #endif -extern char *__getcwd_chk (char *__buf, size_t __size, size_t __buflen) - __THROW __wur; - #define getcwd(buf, size) \ -- (__bos (buf) != (size_t) -1 \ -- && (!__builtin_constant_p (size) || (size) > __bos (buf)) \ -- ? __getcwd_chk (buf, size, buflen) : getcwd (buf, size)) + extern char *__REDIRECT_NTH (__getcwd_alias, + (char *__buf, size_t __size), getcwd) __wur; + + extern __always_inline __wur char * + __NTH (getcwd (char *__buf, size_t __size)) + { +- if (__bos (__buf) != (size_t) -1 +- && (!__builtin_constant_p (__size) || __size > __bos (__buf))) +- return __getcwd_chk (__buf, __size, __bos (__buf)); ++ if (__bos (__buf) != (size_t) -1 && __size > __bos (__buf)) ++ __chk_fail (); + return __getcwd_alias (__buf, __size); + } - -#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED -extern char *__getwd_chk (char *__buf, size_t buflen) -- __THROW __nonnull ((1)) __attribute_deprecated__ __wur; --#define getwd(buf) \ -- (__bos (buf) != (size_t) -1 ? __getwd_chk (buf, buflen) : getwd (buf)) +- __THROW __nonnull ((1)) __wur; +-extern char *__REDIRECT_NTH (__getwd_alias, (char *__buf), getwd) +- __nonnull ((1)) __wur; +- +-extern __always_inline __nonnull ((1)) __attribute_deprecated__ __wur char * +-__NTH (getwd (char *__buf)) +-{ +- if (__bos (__buf) != (size_t) -1) +- return __getwd_chk (__buf, __bos (__buf)); +- return __getwd_alias (__buf); +-} -#endif -+ (__extension__ \ -+ ({ size_t __size_val = (size); \ -+ if (__bos (buf) != (size_t) -1 && __bos (buf) < __size_val) \ -+ __chk_fail (); \ -+ getcwd (buf, __size_val); })) ---- glibc-20050303T1335/socket/bits/socket2.h 1 Mar 2005 21:33:39 -0000 1.2 -+++ glibc-20050303T1335-fedora/socket/bits/socket2.h 6 Mar 2005 23:34:29 -0000 1.2.2.4 -@@ -21,18 +21,17 @@ +--- glibc-20050319T1907/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 ++++ glibc-20050319T1907-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 +@@ -21,24 +21,18 @@ # error "Never include directly; use instead." #endif -extern ssize_t __recv_chk (int __fd, void *__buf, size_t __n, size_t __buflen, - int __flags); -+extern void __chk_fail (void) __attribute__((noreturn)); - #define recv(fd, buf, n, flags) \ -- (__bos0 (buf) != (size_t) -1 \ -- ? __recv_chk (fd, buf, n, __bos0 (buf), flags) \ -- : recv (fd, buf, n, flags)) -+ (__extension__ \ -+ ({ size_t __n_val = (n); \ -+ if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __n_val) \ -+ __chk_fail (); \ -+ recv ((fd), (buf), __n_val, (flags)); })) ++extern void __chk_fail (void) __attribute__((__noreturn__)); + extern ssize_t __REDIRECT (__recv_alias, (int __fd, void *__buf, size_t __n, + int __flags), recv); + + extern __always_inline ssize_t + recv (int __fd, void *__buf, size_t __n, int __flags) + { +- if (__bos0 (__buf) != (size_t) -1 +- && (!__builtin_constant_p (__n) || __n > __bos0 (__buf))) +- return __recv_chk (__fd, __buf, __n, __bos0 (__buf), __flags); ++ if (__bos0 (__buf) != (size_t) -1 && __n > __bos0 (__buf)) ++ __chk_fail (); + return __recv_alias (__fd, __buf, __n, __flags); + } -extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n, - size_t __buflen, int __flags, - __SOCKADDR_ARG __addr, - socklen_t *__restrict __addr_len); - #define recvfrom(fd, buf, n, flags, addr, addr_len) \ -- (__bos0 (buf) != (size_t) -1 \ -- ? __recvfrom_chk (fd, buf, n, __bos0 (buf), flags, addr, addr_len) \ -- : recvfrom (fd, buf, n, flags, addr, addr_len)) -+ (__extension__ \ -+ ({ size_t __n_val = (n); \ -+ if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __n_val) \ -+ __chk_fail (); \ -+ recvfrom ((fd), (buf), __n_val, (flags), (addr), (addr_len)); })) ---- glibc-20050303T1335/sysdeps/arm/dl-machine.h 1 Mar 2005 20:34:40 -0000 1.50 -+++ glibc-20050303T1335-fedora/sysdeps/arm/dl-machine.h 5 Mar 2005 13:03:35 -0000 1.48.2.3 -@@ -353,9 +353,7 @@ elf_machine_plt_value (struct link_map * - - /* ARM never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ --#ifdef RTLD_BOOTSTRAP --# define ELF_MACHINE_NO_RELA 1 --#endif -+#define ELF_MACHINE_NO_RELA (defined RTLD_BOOTSTRAP) - - #ifdef RESOLVE - ---- glibc-20050303T1335/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20050303T1335-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 + extern ssize_t __REDIRECT (__recvfrom_alias, + (int __fd, void *__restrict __buf, size_t __n, + int __flags, __SOCKADDR_ARG __addr, +@@ -48,9 +42,7 @@ extern __always_inline ssize_t + recvfrom (int __fd, void *__buf, size_t __n, int __flags, + __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len) + { +- if (__bos0 (__buf) != (size_t) -1 +- && (!__builtin_constant_p (__n) || __n > __bos0 (__buf))) +- return __recvfrom_chk (__fd, __buf, __n, __bos0 (__buf), __flags, +- __addr, __addr_len); ++ if (__bos0 (__buf) != (size_t) -1 && __n > __bos0 (__buf)) ++ __chk_fail (); + return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); + } +--- glibc-20050319T1907/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20050319T1907-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -2090,21 +2062,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20050303T1335/sysdeps/i386/dl-machine.h 17 Feb 2005 01:16:33 -0000 1.133 -+++ glibc-20050303T1335-fedora/sysdeps/i386/dl-machine.h 5 Mar 2005 13:03:35 -0000 1.127.2.4 -@@ -301,9 +301,7 @@ elf_machine_plt_value (struct link_map * - - /* The i386 never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ --#ifdef RTLD_BOOTSTRAP --# define ELF_MACHINE_NO_RELA 1 --#endif -+#define ELF_MACHINE_NO_RELA (defined RTLD_BOOTSTRAP) - - #ifdef RESOLVE_MAP - ---- glibc-20050303T1335/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 +--- glibc-20050319T1907/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 @@ -0,0 +1,410 @@ +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -2516,15 +2475,15 @@ + + +#define atomic_delay() asm ("rep; nop") ---- glibc-20050303T1335/sysdeps/i386/i486/Makefile 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/sysdeps/i386/i486/Makefile 5 Mar 2005 13:03:35 -0000 1.1.2.1 +--- glibc-20050319T1907/sysdeps/i386/i486/Makefile 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/sysdeps/i386/i486/Makefile 5 Mar 2005 13:03:35 -0000 1.1.2.1 @@ -0,0 +1,4 @@ +# Temporary workaround for GCC4 PR debug/19345 +ifeq ($(subdir),string) +CFLAGS-string-inlines.c += -g0 +endif ---- glibc-20050303T1335/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20050303T1335-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20050319T1907/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20050319T1907-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -2536,8 +2495,8 @@ endif endif ---- glibc-20050303T1335/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20050303T1335-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20050319T1907/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20050319T1907-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2889,8 +2848,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20050303T1335/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050319T1907/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -2976,8 +2935,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20050303T1335/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20050303T1335-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20050319T1907/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20050319T1907-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -2992,8 +2951,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -3003,8 +2962,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t FILE *fp = fopen ("/proc/self/maps", "rc"); @@ -3017,8 +2976,8 @@ /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -3064,8 +3023,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/alpha/bits/termios.h 31 Mar 2004 08:53:28 -0000 1.7 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/alpha/bits/termios.h 11 Feb 2005 09:07:59 -0000 1.7.2.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/alpha/bits/termios.h 31 Mar 2004 08:53:28 -0000 1.7 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/alpha/bits/termios.h 11 Feb 2005 09:07:59 -0000 1.7.2.1 @@ -1,5 +1,5 @@ /* termios type and macro definitions. Linux version. - Copyright (C) 1993,1994,1995,1996,1997,1999,2003 @@ -3192,8 +3151,8 @@ #define IEXTEN 0x00000400 /* Values for the ACTION argument to `tcflow'. */ ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/bits/termios.h 31 Mar 2004 08:53:29 -0000 1.10 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/bits/termios.h 11 Feb 2005 09:08:00 -0000 1.10.2.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/bits/termios.h 31 Mar 2004 08:53:29 -0000 1.10 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/bits/termios.h 11 Feb 2005 09:08:00 -0000 1.10.2.1 @@ -1,5 +1,5 @@ /* termios type and macro definitions. Linux version. - Copyright (C) 1993,1994,1995,1996,1997,1998,1999,2003 @@ -3209,8 +3168,8 @@ # define CRTSCTS 020000000000 /* flow control */ #endif ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -3271,8 +3230,8 @@ + } while (0) + +#include_next ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -3305,29 +3264,29 @@ + } while (0) + #include_next ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/powerpc/bits/termios.h 13 May 2004 02:17:03 -0000 1.12 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/powerpc/bits/termios.h 11 Feb 2005 09:08:01 -0000 1.12.2.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/powerpc/bits/termios.h 13 May 2004 02:17:03 -0000 1.12 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/powerpc/bits/termios.h 11 Feb 2005 09:08:01 -0000 1.12.2.1 @@ -1,4 +1,4 @@ -/* Copyright (C) 1997,1999,2001,2003,2004 Free Software Foundation, Inc. +/* Copyright (C) 1997,1999,2001,2003,2004,2005 Free Software Foundation, Inc. @@ -3452,8 +3411,8 @@ #define IEXTEN 0x00000400 /* Values for the ACTION argument to `tcflow'. */ ---- glibc-20050303T1335/sysdeps/unix/sysv/linux/sparc/bits/termios.h 31 Mar 2004 08:53:30 -0000 1.10 -+++ glibc-20050303T1335-fedora/sysdeps/unix/sysv/linux/sparc/bits/termios.h 11 Feb 2005 09:08:01 -0000 1.10.2.1 +--- glibc-20050319T1907/sysdeps/unix/sysv/linux/sparc/bits/termios.h 31 Mar 2004 08:53:30 -0000 1.10 ++++ glibc-20050319T1907-fedora/sysdeps/unix/sysv/linux/sparc/bits/termios.h 11 Feb 2005 09:08:01 -0000 1.10.2.1 @@ -1,5 +1,6 @@ /* termios type and macro definitions. Linux/SPARC version. - Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc. Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- glibc.spec 6 Mar 2005 23:47:00 -0000 1.133 +++ glibc.spec 19 Mar 2005 22:00:27 -0000 1.134 @@ -1,7 +1,7 @@ -%define glibcdate 20050303T1335 +%define glibcdate 20050319T1907 %define glibcname glibc %define glibcversion 2.3.4 -%define glibcrelease 14 +%define glibcrelease 15 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -1206,6 +1206,7 @@ %verify(not md5 size mtime) %config(noreplace) /etc/ld.so.conf %dir /etc/ld.so.conf.d %dir %{_prefix}/libexec/getconf +%dir %{_prefix}/%{_lib}/gconv %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache %doc README NEWS INSTALL FAQ BUGS NOTES PROJECTS CONFORMANCE %doc COPYING COPYING.LIB README.libm LICENSES @@ -1277,6 +1278,17 @@ %endif %changelog +* Sat Mar 19 2005 Jakub Jelinek 2.3.4-15 +- update from CVS + - better fix for the dlclose bug (#145810, #150414) + - fix regex crash on case insensitive search in zh_CN locale + (#151215) + - fix malloc_trim (BZ#779) + - with -D_FORTIFY_SOURCE=*, avoid defining read and a bunch of others + as function-like macros, there are too many broken programs + out there +- add %%dir %{_prefix}/%{_lib}/gconv to glibc's file list (#151372) + * Sun Mar 6 2005 Roland McGrath 2.3.4-14 - fix bits/socket2.h macro typos Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- sources 6 Mar 2005 21:04:43 -0000 1.106 +++ sources 19 Mar 2005 22:00:27 -0000 1.107 @@ -1,2 +1,2 @@ -a3e26707cc2584b7a8974e4bdc7a772e glibc-20050303T1335.tar.bz2 -2d0a9067c060944223ed613e7b3aa1a8 glibc-fedora-20050303T1335.tar.bz2 +09c648964f43a63a6e3529a05bc7503a glibc-20050319T1907.tar.bz2 +570672bceb3133fbcda0a21e595a0a83 glibc-fedora-20050319T1907.tar.bz2 From fedora-cvs-commits at redhat.com Sat Mar 19 22:38:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 17:38:47 -0500 Subject: rpms/perl-XML-LibXML/devel perl-XML-LibXML.spec,1.6,1.7 Message-ID: <200503192238.j2JMclrV030550@cvs.devel.redhat.com> Update of /cvs/dist/rpms/perl-XML-LibXML/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30538 Modified Files: perl-XML-LibXML.spec Log Message: * Sat Mar 19 2005 Joe Orton 1.58-2 - rebuild Index: perl-XML-LibXML.spec =================================================================== RCS file: /cvs/dist/rpms/perl-XML-LibXML/devel/perl-XML-LibXML.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-XML-LibXML.spec 24 Sep 2004 22:53:54 -0000 1.6 +++ perl-XML-LibXML.spec 19 Mar 2005 22:38:44 -0000 1.7 @@ -3,7 +3,7 @@ Summary: XML-LibXML Perl module Name: perl-XML-LibXML Version: 1.58 -Release: 1 +Release: 2 License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/XML-LibXML/ @@ -65,6 +65,9 @@ %{_mandir}/man3/*.3* %changelog +* Sat Mar 19 2005 Joe Orton 1.58-2 +- rebuild + * Sun Apr 18 2004 Ville Skytt?? - 1.58-1 - #121168 - Update to 1.58. From fedora-cvs-commits at redhat.com Sat Mar 19 22:40:27 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 17:40:27 -0500 Subject: rpms/perl-Compress-Zlib/devel perl-Compress-Zlib.spec,1.10,1.11 Message-ID: <200503192240.j2JMeRF2030630@cvs.devel.redhat.com> Update of /cvs/dist/rpms/perl-Compress-Zlib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30621 Modified Files: perl-Compress-Zlib.spec Log Message: * Sat Mar 19 2005 Joe Orton 1.33-7 - rebuild Index: perl-Compress-Zlib.spec =================================================================== RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/perl-Compress-Zlib.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Compress-Zlib.spec 9 Sep 2004 10:04:44 -0000 1.10 +++ perl-Compress-Zlib.spec 19 Mar 2005 22:40:23 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-Compress-Zlib Version: 1.33 -Release: 6 +Release: 7 Summary: A module providing Perl interfaces to the zlib compression library. License: distributable Group: Development/Libraries @@ -57,6 +57,9 @@ %defattr(-,root,root) %changelog +* Sat Mar 19 2005 Joe Orton 1.33-7 +- rebuild + * Tue Jun 15 2004 Elliot Lee - rebuilt From fedora-cvs-commits at redhat.com Sat Mar 19 23:49:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 18:49:28 -0500 Subject: rpms/4Suite/devel 4Suite-1.0a4-root.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 4Suite.spec, 1.16, 1.17 sources, 1.5, 1.6 4Suite-1.0a3-python24.patch, 1.1, NONE Message-ID: <200503192349.j2JNnSYM029834@cvs.devel.redhat.com> Update of /cvs/dist/rpms/4Suite/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29814 Modified Files: .cvsignore 4Suite.spec sources Added Files: 4Suite-1.0a4-root.patch Removed Files: 4Suite-1.0a3-python24.patch Log Message: * Sat Mar 19 2005 Miloslav Trmac - 1.0-6.a4 - Update to 4Suite-1.0a4 4Suite-1.0a4-root.patch: Install.py | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE 4Suite-1.0a4-root.patch --- --- 4Suite-1.0a4/Ft/Lib/DistExt/Install.py.root 2005-03-19 23:53:08.217728736 +0100 +++ 4Suite-1.0a4/Ft/Lib/DistExt/Install.py 2005-03-19 23:53:38.227166608 +0100 @@ -8,6 +8,8 @@ command_name = 'install' user_options = [ + ('root=', None, + "install everything relative to this alternate root directory"), # Byte-compilation options -- see install_lib.py for details, as # these are duplicated from there (but only install_lib does # anything with them). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/4Suite/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Sep 2004 02:31:31 -0000 1.5 +++ .cvsignore 19 Mar 2005 23:49:26 -0000 1.6 @@ -1 +1 @@ -4Suite-1.0a3.tar.bz2 +4Suite-1.0a4.tar.bz2 Index: 4Suite.spec =================================================================== RCS file: /cvs/dist/rpms/4Suite/devel/4Suite.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- 4Suite.spec 16 Mar 2005 21:38:11 -0000 1.16 +++ 4Suite.spec 19 Mar 2005 23:49:26 -0000 1.17 @@ -3,9 +3,9 @@ Summary: A collections of XML-related technologies for python Name: 4Suite Version: 1.0 -Release: 6 -Source: ftp://ftp.fourthought.com/pub/4Suite/%{name}-%{version}a3.tar.bz2 -Patch0: 4Suite-1.0a3-python24.patch +Release: 6.a4 +Source: ftp://ftp.fourthought.com/pub/4Suite/4Suite-1.0a4.tar.bz2 +Patch0: 4Suite-1.0a4-root.patch License: Apacheish Group: Development/Libraries Requires: python, PyXML >= 0.7, Distutils @@ -38,41 +38,34 @@ specification for the XPointer 1.0 Candidate Recommendation. %prep -%setup -q -n %{name} -%patch0 -p1 -b .python24 +%setup -q -n 4Suite-1.0a4 +%patch0 -p1 %build -export PYTHONPATH=/usr/%{_lib}/python%pyver/site-packages/:/usr/%{_lib}/python%pyver/:/usr/lib/python%pyver/site-packages/:/usr/lib/python%pyver/ -CFLAGS="$RPM_OPT_FLAGS" python setup.py build +export CFLAGS="$RPM_OPT_FLAGS" +python setup.py config --system +python setup.py build %install rm -fr $RPM_BUILD_ROOT -export PYTHONPATH=/usr/%{_lib}/python%pyver/site-packages/:/usr/%{_lib}/python%pyver/:/usr/lib/python%pyver/site-packages/:/usr/lib/python%pyver/ -python setup.py install --root=$RPM_BUILD_ROOT --record=installed_files - -# Generate optimized bytecode -python -O /usr/%{_lib}/python%pyver/compileall.py $RPM_BUILD_ROOT/usr/%{_lib}/python%pyver/site-packages - -find $RPM_BUILD_ROOT/usr/%{_lib}/python%pyver -name "*pyo" | grep -v _xmlplus/__init__.pyo | sed "s|$RPM_BUILD_ROOT||" >> installed_files -find $RPM_BUILD_ROOT/usr/%{_lib}/python%pyver/site-packages/Ft -type d \ - | sed "s|^$RPM_BUILD_ROOT|%%dir |" >> installed_files - -mkdir -p $RPM_BUILD_ROOT%{_bindir} -find $RPM_BUILD_ROOT/usr/%{_lib}/python%pyver/site-packages/Ft/Share/Bin \ - -name '4*' | sed "s|$RPM_BUILD_ROOT||" \ - | while read file; do ln -s "$file" $RPM_BUILD_ROOT%{_bindir}; done - -# Remove unwanted .mo files in site-packages dir... -find $RPM_BUILD_ROOT/usr/%{_lib}/python%{pyver}/site-packages -name "*.mo" | xargs rm -f +python setup.py install -O1 --root=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -%files -f installed_files +%files %defattr(-,root,root) -%{_bindir}/4* +%config /etc/4Suite +/usr/bin/4* +/usr/lib/4Suite +%{_libdir}/python%pyver/site-packages/Ft +/usr/share/4Suite +/var/lib/4Suite %changelog +* Sat Mar 19 2005 Miloslav Trmac - 1.0-6.a4 +- Update to 4Suite-1.0a4 + * Wed Mar 16 2005 Elliot Lee - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/4Suite/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Sep 2004 02:31:31 -0000 1.5 +++ sources 19 Mar 2005 23:49:26 -0000 1.6 @@ -1 +1 @@ -272ba618ff69042b1513ccf0d70f956d 4Suite-1.0a3.tar.bz2 +7a5de1ac3d336b7198b741be83d0722e 4Suite-1.0a4.tar.bz2 --- 4Suite-1.0a3-python24.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 20 00:02:13 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 19:02:13 -0500 Subject: rpms/4Suite/devel 4Suite-1.0a4-gcc.patch, NONE, 1.1 4Suite.spec, 1.17, 1.18 Message-ID: <200503200002.j2K02DMH008518@cvs.devel.redhat.com> Update of /cvs/dist/rpms/4Suite/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8499 Modified Files: 4Suite.spec Added Files: 4Suite-1.0a4-gcc.patch Log Message: * Sat Mar 19 2005 Miloslav Trmac - 1.0-6.a4 - Fix build with gcc 4 4Suite-1.0a4-gcc.patch: _conversions.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE 4Suite-1.0a4-gcc.patch --- --- 4Suite-1.0a4/Ft/Xml/XPath/_conversions.c.gcc 2004-08-23 20:20:28.000000000 +0200 +++ 4Suite-1.0a4/Ft/Xml/XPath/_conversions.c 2005-03-20 00:59:27.997710216 +0100 @@ -5,6 +5,7 @@ static PyObject *PyBoolean_Type; static PyCFunction PyBoolean_New; +#define PyNumber_NaN PyNumber_NaN_ static PyObject *PyNumber_NaN; #define PyBoolean_Check(op) ((op)->ob_type == (PyTypeObject*)PyBoolean_Type) Index: 4Suite.spec =================================================================== RCS file: /cvs/dist/rpms/4Suite/devel/4Suite.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- 4Suite.spec 19 Mar 2005 23:49:26 -0000 1.17 +++ 4Suite.spec 20 Mar 2005 00:02:00 -0000 1.18 @@ -6,6 +6,7 @@ Release: 6.a4 Source: ftp://ftp.fourthought.com/pub/4Suite/4Suite-1.0a4.tar.bz2 Patch0: 4Suite-1.0a4-root.patch +Patch1: 4Suite-1.0a4-gcc.patch License: Apacheish Group: Development/Libraries Requires: python, PyXML >= 0.7, Distutils @@ -64,6 +65,7 @@ %changelog * Sat Mar 19 2005 Miloslav Trmac - 1.0-6.a4 +- Fix build with gcc 4 - Update to 4Suite-1.0a4 * Wed Mar 16 2005 Elliot Lee From fedora-cvs-commits at redhat.com Sun Mar 20 00:10:53 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 19:10:53 -0500 Subject: rpms/4Suite/devel 4Suite.spec,1.18,1.19 Message-ID: <200503200010.j2K0ArBW008630@cvs.devel.redhat.com> Update of /cvs/dist/rpms/4Suite/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8617 Modified Files: 4Suite.spec Log Message: Doh, actually apply the patch Index: 4Suite.spec =================================================================== RCS file: /cvs/dist/rpms/4Suite/devel/4Suite.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- 4Suite.spec 20 Mar 2005 00:02:00 -0000 1.18 +++ 4Suite.spec 20 Mar 2005 00:10:51 -0000 1.19 @@ -41,6 +41,7 @@ %prep %setup -q -n 4Suite-1.0a4 %patch0 -p1 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" From fedora-cvs-commits at redhat.com Sun Mar 20 00:55:14 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 19:55:14 -0500 Subject: rpms/kernel/FC-3 .cvsignore, 1.115, 1.116 kernel-2.6.spec, 1.790, 1.791 sources, 1.118, 1.119 upstream, 1.22, 1.23 Message-ID: <200503200055.j2K0tETh004559@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv4542 Modified Files: .cvsignore kernel-2.6.spec sources upstream Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/.cvsignore,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- .cvsignore 16 Mar 2005 01:11:40 -0000 1.115 +++ .cvsignore 20 Mar 2005 00:55:12 -0000 1.116 @@ -5,4 +5,4 @@ temp-* kernel-2.6.11 linux-2.6.11.tar.bz2 -patch-2.6.11.4.bz2 +patch-2.6.11.5.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v retrieving revision 1.790 retrieving revision 1.791 diff -u -r1.790 -r1.791 --- kernel-2.6.spec 18 Mar 2005 18:25:40 -0000 1.790 +++ kernel-2.6.spec 20 Mar 2005 00:55:12 -0000 1.791 @@ -194,7 +194,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.11.4.bz2 +Patch1: patch-2.6.11.5.bz2 # Patches 100 through 500 are meant for architecture patches @@ -900,6 +900,9 @@ %endif %changelog +* Sat Mar 19 2005 Dave Jones +- Update to 2.6.11.5 + * Fri Mar 18 2005 Dave Jones - Kjournald oops race. (#146344) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/sources,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- sources 16 Mar 2005 01:11:40 -0000 1.118 +++ sources 20 Mar 2005 00:55:12 -0000 1.119 @@ -1,3 +1,2 @@ -cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 -6a8a4957764d17e3c8222c4d59952c29 patch-2.6.11.4.bz2 +56d332713ed409fff624c7382afbb315 patch-2.6.11.5.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/upstream,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- upstream 16 Mar 2005 01:11:40 -0000 1.22 +++ upstream 20 Mar 2005 00:55:12 -0000 1.23 @@ -1,2 +1,3 @@ linux-2.6.11.tar.bz2 -patch-2.6.11.4.bz2 +patch-2.6.11.5.bz2 + From fedora-cvs-commits at redhat.com Sun Mar 20 00:55:42 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 19:55:42 -0500 Subject: rpms/kernel/FC-3 patch-2.6.11.5.bz2.sign,NONE,1.1 Message-ID: <200503200055.j2K0tgaH004583@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv4573 Added Files: patch-2.6.11.5.bz2.sign Log Message: sign --- NEW FILE patch-2.6.11.5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBCO9LpyGugalF9Dw4RApnOAJoDXGSkZ1zfZtL8VDHI6eSP/FGWPwCeOFFg +zeMXuipE5GSbPRUrKUNdG8= =choF -----END PGP SIGNATURE----- From fedora-cvs-commits at redhat.com Sun Mar 20 04:10:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 19 Mar 2005 23:10:36 -0500 Subject: rpms/kernel/devel/configs config-generic,1.9,1.10 Message-ID: <200503200410.j2K4Aagp025323@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv25311/configs Modified Files: config-generic Log Message: extra module. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- config-generic 18 Mar 2005 21:54:20 -0000 1.9 +++ config-generic 20 Mar 2005 04:10:34 -0000 1.10 @@ -1705,7 +1705,7 @@ CONFIG_DVB_VES1X93=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_BT8XX=m -# CONFIG_DVB_TDA1004X is not set +CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m # From fedora-cvs-commits at redhat.com Sun Mar 20 07:06:15 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 02:06:15 -0500 Subject: rpms/glibc/devel glibc-pread.patch,NONE,1.1 glibc.spec,1.134,1.135 Message-ID: <200503200706.j2K76FVi013835@cvs.devel.redhat.com> Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13821 Modified Files: glibc.spec Added Files: glibc-pread.patch Log Message: 2.3.4-16 glibc-pread.patch: debug/Makefile | 2 +- debug/tst-lfschk1.c | 2 ++ debug/tst-lfschk2.c | 2 ++ debug/tst-lfschk3.c | 2 ++ posix/bits/unistd.h | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) --- NEW FILE glibc-pread.patch --- 2005-03-20 Jakub Jelinek * posix/bits/unistd.h (pread) [__USE_FILE_OFFSET64]: Use __off64_t instead of __off_t for last argument. * debug/Makefile (tests): Add tst-lfschk{1,2,3}. * debug/tst-lfschk1.c: New test. * debug/tst-lfschk2.c: New test. * debug/tst-lfschk3.c: New test. --- libc/posix/bits/unistd.h.jj 2005-03-19 08:36:13.000000000 +0100 +++ libc/posix/bits/unistd.h 2005-03-20 08:00:07.000000000 +0100 @@ -58,7 +58,7 @@ pread (int __fd, void *__buf, size_t __n } # else extern __always_inline __wur ssize_t -pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset) +pread (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) { if (__bos0 (__buf) != (size_t) -1 && (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf))) --- libc/debug/tst-lfschk1.c.jj 2005-03-20 07:51:34.000000000 +0100 +++ libc/debug/tst-lfschk1.c 2005-03-20 07:51:17.000000000 +0100 @@ -0,0 +1,2 @@ +#define _FILE_OFFSET_BITS 64 +#include "tst-chk1.c" --- libc/debug/tst-lfschk2.c.jj 2005-03-20 07:51:34.000000000 +0100 +++ libc/debug/tst-lfschk2.c 2005-03-20 07:51:41.000000000 +0100 @@ -0,0 +1,2 @@ +#define _FILE_OFFSET_BITS 64 +#include "tst-chk2.c" --- libc/debug/tst-lfschk3.c.jj 2005-03-20 07:51:34.000000000 +0100 +++ libc/debug/tst-lfschk3.c 2005-03-20 07:51:45.000000000 +0100 @@ -0,0 +1,2 @@ +#define _FILE_OFFSET_BITS 64 +#include "tst-chk3.c" --- libc/debug/Makefile.jj 2005-03-01 10:34:26.000000000 +0100 +++ libc/debug/Makefile 2005-03-20 07:52:18.000000000 +0100 @@ -54,7 +54,7 @@ CFLAGS-recv_chk.c = -fexceptions -fasync CFLAGS-recvfrom_chk.c = -fexceptions -fasynchronous-unwind-tables tests = backtrace-tst tst-chk1 tst-chk2 tst-chk3 \ - test-strcpy_chk test-stpcpy_chk + tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk extra-libs = libSegFault libpcprofile extra-libs-others = $(extra-libs) Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- glibc.spec 19 Mar 2005 22:00:27 -0000 1.134 +++ glibc.spec 20 Mar 2005 07:06:13 -0000 1.135 @@ -1,7 +1,7 @@ %define glibcdate 20050319T1907 %define glibcname glibc %define glibcversion 2.3.4 -%define glibcrelease 15 +%define glibcrelease 16 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -22,6 +22,7 @@ Patch1: %{name}-nptl-check.patch Patch2: %{name}-ppc-assume.patch Patch3: %{name}-ia64-lib64.patch +Patch4: glibc-pread.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: linuxthreads, gencat, locale, ldconfig, locale-ja @@ -271,6 +272,7 @@ %patch3 -p1 %endif %endif +%patch4 -p1 # Hack till glibc-kernheaders get updated, argh mkdir asm @@ -1278,6 +1280,9 @@ %endif %changelog +* Sun Mar 20 2005 Jakub Jelinek 2.3.4-16 +- fix pread with -D_FILE_OFFSET_BITS=64 (#151573) + * Sat Mar 19 2005 Jakub Jelinek 2.3.4-15 - update from CVS - better fix for the dlclose bug (#145810, #150414) From fedora-cvs-commits at redhat.com Sun Mar 20 07:58:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 02:58:51 -0500 Subject: rpms/dbh/FC-3 dbh-1.0.22-rpath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 dbh.spec, 1.6, 1.7 sources, 1.3, 1.4 dbh-1.0.18-rpath.patch, 1.1, NONE Message-ID: <200503200758.j2K7wpPo009896@cvs.devel.redhat.com> Update of /cvs/dist/rpms/dbh/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv9872/FC-3 Modified Files: .cvsignore dbh.spec sources Added Files: dbh-1.0.22-rpath.patch Removed Files: dbh-1.0.18-rpath.patch Log Message: auto-import dbh-1.0.22-2.FC3 on branch FC-3 from dbh-1.0.22-2.FC3.src.rpm dbh-1.0.22-rpath.patch: dbh-1.0.pc.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE dbh-1.0.22-rpath.patch --- diff -Nur dbh-1.0.22.orig/src/dbh-1.0.pc.in dbh-1.0.22/src/dbh-1.0.pc.in --- dbh-1.0.22.orig/src/dbh-1.0.pc.in 2005-01-28 13:26:35.000000000 -0700 +++ dbh-1.0.22/src/dbh-1.0.pc.in 2005-03-15 19:10:10.705246122 -0700 @@ -7,5 +7,5 @@ Description: Diskbased Hashtables Requires: Version: @DBH_VERSION@ -Libs: -Wl,-R${libdir} -L${libdir} -ldbh -lm +Libs: -L${libdir} -ldbh -lm Cflags: -I${includedir} Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dbh/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Sep 2004 04:05:44 -0000 1.3 +++ .cvsignore 20 Mar 2005 07:58:49 -0000 1.4 @@ -1 +1 @@ -dbh-1.0.18.tar.gz +dbh-1.0.22.tar.gz Index: dbh.spec =================================================================== RCS file: /cvs/dist/rpms/dbh/FC-3/dbh.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dbh.spec 28 Sep 2004 11:51:26 -0000 1.6 +++ dbh.spec 20 Mar 2005 07:58:49 -0000 1.7 @@ -1,14 +1,14 @@ Summary: Disk based hash library Name: dbh -Version: 1.0.18 -Release: 5 +Version: 1.0.22 +Release: 2.FC3 URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.5/src/%{name}-%{version}.tar.gz -Patch: dbh-1.0.18-rpath.patch +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src/dbh-1.0.22.tar.gz +Patch: dbh-1.0.22-rpath.patch Epoch: 1 -License: QPL +License: LGPL Group: System Environment/Libraries -Buildroot: %{_tmppath}/%{name}-root +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root %description Disk based hashes is a method to create multidimensional binary trees on disk. @@ -49,7 +49,7 @@ %postun -p /sbin/ldconfig -%files +%files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_libdir}/*.so.* @@ -63,6 +63,22 @@ %{_includedir}/* %changelog +* Sat Mar 19 2005 Warren Togami - 1:1.0.22-2 +- remove stuff + +* Tue Mar 15 2005 Kevin Fenzi - 1:1.0.22-1 +- Updated to 4.2.1 version +- Rediffed rpath patch for new version + +* Tue Mar 8 2005 Kevin Fenzi - 1:1.0.20-3 +- Removed generic INSTALL doc + +* Sun Mar 6 2005 Kevin Fenzi - 1:1.0.20-2 +- Changed license to LGPL + +* Wed Dec 08 2004 Than Ngo 1:1.0.20-1 +- update to 1.0.20 + * Tue Sep 28 2004 Than Ngo 1:1.0.18-5 - fix file conflicts Index: sources =================================================================== RCS file: /cvs/dist/rpms/dbh/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Sep 2004 04:05:44 -0000 1.3 +++ sources 20 Mar 2005 07:58:49 -0000 1.4 @@ -1 +1 @@ -669ecb83a4909822a057373eb512a5a5 dbh-1.0.18.tar.gz +2dfd35a284068ed0e5a545d18f9bf0f2 dbh-1.0.22.tar.gz --- dbh-1.0.18-rpath.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 20 08:05:18 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 03:05:18 -0500 Subject: rpms/libxfce4util/FC-3 .cvsignore, 1.4, 1.5 libxfce4util.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200503200805.j2K85Ibk010104@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libxfce4util/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv10080/FC-3 Modified Files: .cvsignore libxfce4util.spec sources Log Message: auto-import libxfce4util-4.2.1-2.FC3 on branch FC-3 from libxfce4util-4.2.1-2.FC3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libxfce4util/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 07:52:07 -0000 1.4 +++ .cvsignore 20 Mar 2005 08:05:15 -0000 1.5 @@ -1 +1 @@ -libxfce4util-4.0.6.tar.gz +libxfce4util-4.2.1.tar.bz2 Index: libxfce4util.spec =================================================================== RCS file: /cvs/dist/rpms/libxfce4util/FC-3/libxfce4util.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libxfce4util.spec 9 Sep 2004 07:52:07 -0000 1.5 +++ libxfce4util.spec 20 Mar 2005 08:05:15 -0000 1.6 @@ -1,24 +1,25 @@ -Summary: Utility library for the XFce4 desktop environment +Summary: Utility library for the Xfce4 desktop environment Name: libxfce4util -Version: 4.0.6 -Release: 1 -License: BSD +Version: 4.2.1 +Release: 2.FC3 +License: BSD and LGPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.5/src/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4util-4.2.1.tar.bz2 Group: Development/Libraries Requires: glib2 >= 2.0.0 Prereq: /sbin/ldconfig BuildRequires: glib2-devel >= 2.0.0 -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description -This package includes basic utility non-GUI functions for XFce4. +This package includes basic utility non-GUI functions for Xfce4. %package devel -Summary: developpment tools for libxfce4util library +Summary: Developpment tools for libxfce4util library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glib2-devel +Requires: gtk2-devel %description devel This package includes static libraries and header files for the @@ -45,6 +46,7 @@ %files %defattr(-,root,root) %{_libdir}/lib*.so.* +%{_sbindir}/xfce4-kiosk-query %files devel %defattr(-, root, root) @@ -52,10 +54,31 @@ %{_libdir}/*a %{_libdir}/pkgconfig/*.pc %{_includedir}/xfce4/libxfce4util -%{_datadir}/xfce4/i18n/nls.alias %{_datadir}/xfce4/m4/ +%doc %{_datadir}/gtk-doc/html/libxfce4util %changelog +* Sat Mar 19 2005 Warren Togami - 4.2.1-2 +- remove stuff + +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-3 +- Fixed License to be BSD and LGPL +- Fixed case on Xfce + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 +- Inital Fedora Extras version +- Capitalized first letter of Summary in devel section to quiet rpmlint +- Added LGPL to License as 2 files are under LGPL, the rest BSD + +* Sun Jan 23 2005 Than Ngo 4.2.0-1 +- update to 4.2.0 release + +* Wed Dec 08 2004 Than Ngo 4.1.99.1-1 +- update to 4.2 rc1 + * Mon Jul 19 2004 Than Ngo 4.0.6-1 - update to 4.0.6 - add requires on glib2-devel, bug #124200 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libxfce4util/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 07:52:07 -0000 1.4 +++ sources 20 Mar 2005 08:05:15 -0000 1.5 @@ -1 +1 @@ -4945103c0bd36f53d108bc49b4994f80 libxfce4util-4.0.6.tar.gz +7fac21585a72c3f4fadf3b0d9807875f libxfce4util-4.2.1.tar.bz2 From fedora-cvs-commits at redhat.com Sun Mar 20 08:10:21 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 03:10:21 -0500 Subject: rpms/libxfcegui4/FC-3 .cvsignore, 1.4, 1.5 libxfcegui4.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200503200810.j2K8ALER010248@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libxfcegui4/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv10225/FC-3 Modified Files: .cvsignore libxfcegui4.spec sources Log Message: auto-import libxfcegui4-4.2.1-3.FC3 on branch FC-3 from libxfcegui4-4.2.1-3.FC3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libxfcegui4/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 07:53:33 -0000 1.4 +++ .cvsignore 20 Mar 2005 08:10:18 -0000 1.5 @@ -1 +1 @@ -libxfcegui4-4.0.6.tar.gz +libxfcegui4-4.2.1.tar.bz2 Index: libxfcegui4.spec =================================================================== RCS file: /cvs/dist/rpms/libxfcegui4/FC-3/libxfcegui4.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libxfcegui4.spec 9 Sep 2004 07:53:33 -0000 1.5 +++ libxfcegui4.spec 20 Mar 2005 08:10:18 -0000 1.6 @@ -1,31 +1,33 @@ -Summary: gtk widgets for xfce +Summary: GTK widgets for Xfce Name: libxfcegui4 -Version: 4.0.6 -Release: 1 +Version: 4.2.1 +Release: 3.FC3 License: LGPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfcegui4-4.2.1.tar.bz2 Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Prereq: /sbin/ldconfig Requires: gtk2 >= 2.0.6 -Requires: libxfce4util >= 4.0.5 +Requires: libxfce4util >= %{version} BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: libxfce4util-devel >= 4.0.5 +BuildRequires: libxfce4util-devel >= %{version} +BuildRequires: dbh-devel %description -The package includes various gtk widgets for XFce. +The package includes various gtk widgets for Xfce. %package devel -Summary: developpment tools for libxfcegui4 library +Summary: Developpment tools for libxfcegui4 library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtk2-devel Requires: libxfce4util-devel +Provides: libxfcegui4-devel %description devel This package includes the static libraries and header files you will need -to compile applications for XFce. +to compile applications for Xfce. %prep %setup -q @@ -39,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -46,18 +50,48 @@ %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root) -%{_libdir}/lib*.so.* +%{_libdir}/lib*.so* +%{_libdir}/xfce4/modules/*.so* +%{_datadir}/xfce4/* %files devel %defattr(-, root, root) %{_libdir}/lib*.so %{_libdir}/*a +%{_libdir}/xfce4/modules/*.a +%{_libdir}/xfce4/modules/*.la %{_libdir}/pkgconfig/*.pc -%{_includedir}/xfce4/libxfcegui4 +%{_includedir}/xfce4/* +%{_datadir}/gtk-doc/html/libxfcegui4 %changelog +* Sat Mar 19 2005 Warren Togami - 4.2.1-3 +- remove stuff, remove version from dbh-devel buildreq + +* Wed Mar 16 2005 Kevin Fenzi - 4.2.1-2 +- Fixed %files bug that wasn't packaging .so files + +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-3 +- Fixed Xfce case + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 +- Capitalized first letter of Summary in devel section to quiet rpmlint +- Added dbh-devel to BuildRequires +- Capitalized the GTK in the Summary to queit rpmlint +- Moved all the module *.a and *.la libraries to the devel package +- Added Provides: libxfcegui4-devel to devel package + +* Sun Jan 23 2005 Than Ngo 4.2.0-1 +- update to 4.2.0 + +* Wed Dec 08 2004 Than Ngo 4.1.99.1-1 +- update to 4.2 rc1 + * Mon Jul 19 2004 Than Ngo 4.0.6-1 - update to 4.0.6 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libxfcegui4/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 07:53:33 -0000 1.4 +++ sources 20 Mar 2005 08:10:18 -0000 1.5 @@ -1 +1 @@ -e6b5ebef17fc990e6f7af0684c70d00d libxfcegui4-4.0.6.tar.gz +020c057cfe25a8aca99af9f39fe2015a libxfcegui4-4.2.1.tar.bz2 From fedora-cvs-commits at redhat.com Sun Mar 20 08:13:32 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 03:13:32 -0500 Subject: rpms/libxfce4mcs/FC-3 .cvsignore, 1.4, 1.5 libxfce4mcs.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200503200813.j2K8DWKi010352@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libxfce4mcs/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv10330/FC-3 Modified Files: .cvsignore libxfce4mcs.spec sources Log Message: auto-import libxfce4mcs-4.2.1-2.FC3 on branch FC-3 from libxfce4mcs-4.2.1-2.FC3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libxfce4mcs/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 07:52:43 -0000 1.4 +++ .cvsignore 20 Mar 2005 08:13:30 -0000 1.5 @@ -1 +1 @@ -libxfce4mcs-4.0.6.tar.gz +libxfce4mcs-4.2.1.tar.bz2 Index: libxfce4mcs.spec =================================================================== RCS file: /cvs/dist/rpms/libxfce4mcs/FC-3/libxfce4mcs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libxfce4mcs.spec 9 Sep 2004 07:52:43 -0000 1.5 +++ libxfce4mcs.spec 20 Mar 2005 08:13:30 -0000 1.6 @@ -1,25 +1,25 @@ -Summary: multi-channel settings management support for xfce +Summary: Multi-channel settings management support for Xfce Name: libxfce4mcs -Version: 4.0.6 -Release: 1 +Version: 4.2.1 +Release: 2.FC3 License: LGPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.3/src/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/libxfce4mcs-4.2.1.tar.bz2 Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Prereq: /sbin/ldconfig -Requires: libxfce4util >= 4.0.5 -Requires: libxfcegui4 >= 4.0.5 +Requires: libxfce4util >= %{version} +Requires: libxfcegui4 >= %{version} -BuildRequires: libxfce4util-devel >= 4.0.5 -BuildRequires: libxfcegui4-devel >= 4.0.5 +BuildRequires: libxfce4util-devel >= %{version} +BuildRequires: libxfcegui4-devel >= %{version} %description -This package includes multi-channel settings management support for XFce. +This package includes multi-channel settings management support for Xfce. %package devel -Summary: developpment tools for libxfce4mcs library +Summary: Developpment tools for libxfce4mcs library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: xorg-x11-devel @@ -27,7 +27,7 @@ %description devel This package includes the static libraries and header files you will need -to compile applications for XFce. +to compile applications for Xfce. %prep %setup -q @@ -58,8 +58,27 @@ %{_libdir}/*a %{_libdir}/pkgconfig/*.pc %{_includedir}/xfce4/libxfce4mcs +%{_datadir}/gtk-doc/html/libxfce4mcs %changelog +* Sat Mar 19 2005 Warren Togami - 4.2.1-2 +- remove stuff + +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-3 +- Fixed Xfce case + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 +- Capitalized first letter of Summary in devel section to quiet rpmlint + +* Sun Jan 23 2005 Than Ngo 4.2.0-1 +- update to 4.2.0 + +* Wed Dec 08 2004 Than Ngo 4.1.99.1-1 +- update to 4.2 rc1 + * Mon Jul 19 2004 Than Ngo 4.0.6-1 - update to 4.0.6 - add requires on xorg-x11-devel, glib2-devel, bug #124199 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libxfce4mcs/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 07:52:43 -0000 1.4 +++ sources 20 Mar 2005 08:13:30 -0000 1.5 @@ -1 +1 @@ -ebbe2f4934d79c596d2a48c0cbf6ed33 libxfce4mcs-4.0.6.tar.gz +2e29527dcabfb0a2f398d253465c0a12 libxfce4mcs-4.2.1.tar.bz2 From fedora-cvs-commits at redhat.com Sun Mar 20 08:19:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 03:19:25 -0500 Subject: rpms/xfce-mcs-manager/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce-mcs-manager.spec, 1.6, 1.7 Message-ID: <200503200819.j2K8JPja013562@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfce-mcs-manager/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv13539/FC-3 Modified Files: .cvsignore sources xfce-mcs-manager.spec Log Message: auto-import xfce-mcs-manager-4.2.1-2.FC3 on branch FC-3 from xfce-mcs-manager-4.2.1-2.FC3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfce-mcs-manager/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 14:43:16 -0000 1.4 +++ .cvsignore 20 Mar 2005 08:19:23 -0000 1.5 @@ -1 +1 @@ -xfce-mcs-manager-4.0.6.tar.gz +xfce-mcs-manager-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfce-mcs-manager/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 14:43:16 -0000 1.4 +++ sources 20 Mar 2005 08:19:23 -0000 1.5 @@ -1 +1 @@ -1a32c4318b5cce3475a5b016fd6703ad xfce-mcs-manager-4.0.6.tar.gz +d2c8a58115ad60c49760c2079d408c51 xfce-mcs-manager-4.2.1.tar.bz2 Index: xfce-mcs-manager.spec =================================================================== RCS file: /cvs/dist/rpms/xfce-mcs-manager/FC-3/xfce-mcs-manager.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce-mcs-manager.spec 9 Sep 2004 14:43:26 -0000 1.6 +++ xfce-mcs-manager.spec 20 Mar 2005 08:19:23 -0000 1.7 @@ -1,24 +1,24 @@ Summary: Multi channel settings manager Name: xfce-mcs-manager -Version: 4.0.6 -Release: 2 +Version: 4.2.1 +Release: 2.FC3 License: LGPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.6/src/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-manager-4.2.1.tar.bz2 Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root -Requires: libxfce4mcs >= 4.0.5 -Requires: libxfcegui4 >= 4.0.5 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: libxfce4mcs >= %{version} +Requires: libxfcegui4 >= %{version} BuildRequires: pkgconfig BuildRequires: gettext -BuildRequires: libxfce4mcs-devel >= 4.0.5 -BuildRequires: libxfcegui4-devel >= 4.0.5 +BuildRequires: libxfce4mcs-devel >= %{version} +BuildRequires: libxfcegui4-devel >= %{version} %description -This package includes a multi channel settings manager for XFce4 +This package includes a multi channel settings manager for Xfce4 %package devel -Summary: header file to build xfce-mcs-manager plugins +Summary: Header file to build xfce-mcs-manager plugins Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libxfce4mcs-devel @@ -49,8 +49,9 @@ %doc README TODO COPYING AUTHORS %docdir %{_datadir}/xfce4/doc %{_datadir}/xfce4/doc/C -%lang(fr) %{_datadir}/xfce4/doc/fr +%{_datadir}/icons/*/*/apps/*.png %{_bindir}/* +%{_datadir}/applications/* %files devel %defattr(-, root, root,0755) @@ -58,6 +59,24 @@ %{_includedir}/xfce4/xfce-mcs-manager %changelog +* Sat Mar 19 2005 Warren Togami - 4.2.1-2 +- remove stuff + +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-3 +- Fixed case of Xfce + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 +- Capitalized first letter of Summary in devel section to quiet rpmlint + +* Sun Jan 23 2005 Than Ngo 4.2.0-1 +- update to 4.2.0 + +* Wed Dec 08 2004 Than Ngo 4.1.99.1-1 +- update to 4.2 rc1 + * Wed Sep 01 2004 Than Ngo 4.0.6-2 - use find_lang macro From fedora-cvs-commits at redhat.com Sun Mar 20 08:22:07 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 03:22:07 -0500 Subject: rpms/xfce4-panel/FC-3 panel-launchmail.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-panel.spec, 1.7, 1.8 panel-evolution-mail.patch, 1.2, NONE Message-ID: <200503200822.j2K8M70D013687@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfce4-panel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv13664/FC-3 Modified Files: .cvsignore sources xfce4-panel.spec Added Files: panel-launchmail.patch Removed Files: panel-evolution-mail.patch Log Message: auto-import xfce4-panel-4.2.1.1-2.FC3 on branch FC-3 from xfce4-panel-4.2.1.1-2.FC3.src.rpm panel-launchmail.patch: contents.xml | 2 +- contents.xml.ar | 2 +- contents.xml.az | 2 +- contents.xml.ca | 2 +- contents.xml.eu | 2 +- contents.xml.fr | 2 +- contents.xml.he | 2 +- contents.xml.hu | 2 +- contents.xml.it | 2 +- contents.xml.ko | 2 +- contents.xml.lt | 2 +- contents.xml.ms | 2 +- contents.xml.nl | 2 +- contents.xml.ro | 2 +- contents.xml.ru | 2 +- contents.xml.sk | 2 +- contents.xml.tr | 2 +- contents.xml.vi | 2 +- contents.xml.zh_TW | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) --- NEW FILE panel-launchmail.patch --- diff -Naur xfce4-panel-4.2.0.orig/contents.xml xfce4-panel-4.2.0/contents.xml --- xfce4-panel-4.2.0.orig/contents.xml 2004-11-11 13:21:40.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml 2005-03-06 12:30:36.094410428 -0700 @@ -50,7 +50,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ar xfce4-panel-4.2.0/contents.xml.ar --- xfce4-panel-4.2.0.orig/contents.xml.ar 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.ar 2005-03-06 12:32:03.001970353 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.az xfce4-panel-4.2.0/contents.xml.az --- xfce4-panel-4.2.0.orig/contents.xml.az 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.az 2005-03-06 12:32:10.393827217 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ca xfce4-panel-4.2.0/contents.xml.ca --- xfce4-panel-4.2.0.orig/contents.xml.ca 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.ca 2005-03-06 12:32:15.329063993 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.eu xfce4-panel-4.2.0/contents.xml.eu --- xfce4-panel-4.2.0.orig/contents.xml.eu 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.eu 2005-03-06 12:32:21.150163772 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.fr xfce4-panel-4.2.0/contents.xml.fr --- xfce4-panel-4.2.0.orig/contents.xml.fr 2004-11-26 10:53:59.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.fr 2005-03-06 12:32:26.080401321 -0700 @@ -50,7 +50,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.he xfce4-panel-4.2.0/contents.xml.he --- xfce4-panel-4.2.0.orig/contents.xml.he 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.he 2005-03-06 12:32:32.065475742 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.hu xfce4-panel-4.2.0/contents.xml.hu --- xfce4-panel-4.2.0.orig/contents.xml.hu 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.hu 2005-03-06 12:32:37.809587427 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.it xfce4-panel-4.2.0/contents.xml.it --- xfce4-panel-4.2.0.orig/contents.xml.it 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.it 2005-03-06 12:32:43.531702513 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ko xfce4-panel-4.2.0/contents.xml.ko --- xfce4-panel-4.2.0.orig/contents.xml.ko 2004-12-05 16:43:32.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.ko 2005-03-06 12:32:49.445787912 -0700 @@ -50,7 +50,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.lt xfce4-panel-4.2.0/contents.xml.lt --- xfce4-panel-4.2.0.orig/contents.xml.lt 2005-01-10 05:23:37.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.lt 2005-03-06 12:32:57.514540097 -0700 @@ -50,7 +50,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ms xfce4-panel-4.2.0/contents.xml.ms --- xfce4-panel-4.2.0.orig/contents.xml.ms 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.ms 2005-03-06 12:33:02.966696932 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.nl xfce4-panel-4.2.0/contents.xml.nl --- xfce4-panel-4.2.0.orig/contents.xml.nl 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.nl 2005-03-06 12:33:07.448003907 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ro xfce4-panel-4.2.0/contents.xml.ro --- xfce4-panel-4.2.0.orig/contents.xml.ro 2005-01-09 05:03:42.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.ro 2005-03-06 12:33:11.880318459 -0700 @@ -50,7 +50,7 @@ - mozilla -mail -splash + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.ru xfce4-panel-4.2.0/contents.xml.ru --- xfce4-panel-4.2.0.orig/contents.xml.ru 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.ru 2005-03-06 12:33:22.203721965 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.sk xfce4-panel-4.2.0/contents.xml.sk --- xfce4-panel-4.2.0.orig/contents.xml.sk 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.sk 2005-03-06 12:33:27.477906324 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.tr xfce4-panel-4.2.0/contents.xml.tr --- xfce4-panel-4.2.0.orig/contents.xml.tr 2004-11-29 02:47:38.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.tr 2005-03-06 12:33:33.747936677 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.vi xfce4-panel-4.2.0/contents.xml.vi --- xfce4-panel-4.2.0.orig/contents.xml.vi 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.vi 2005-03-06 12:33:38.300232673 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail diff -Naur xfce4-panel-4.2.0.orig/contents.xml.zh_TW xfce4-panel-4.2.0/contents.xml.zh_TW --- xfce4-panel-4.2.0.orig/contents.xml.zh_TW 2004-11-09 13:44:44.000000000 -0700 +++ xfce4-panel-4.2.0/contents.xml.zh_TW 2005-03-06 12:33:43.195475634 -0700 @@ -44,7 +44,7 @@ - mozilla -mail + launchmail Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfce4-panel/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 14:44:39 -0000 1.4 +++ .cvsignore 20 Mar 2005 08:22:05 -0000 1.5 @@ -1 +1 @@ -xfce4-panel-4.0.6.tar.gz +xfce4-panel-4.2.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfce4-panel/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 14:44:39 -0000 1.4 +++ sources 20 Mar 2005 08:22:05 -0000 1.5 @@ -1 +1 @@ -c93c010195a8e5fc04bc1295418acbb4 xfce4-panel-4.0.6.tar.gz +51f77bcd31daf8a62c53a93be263c06a xfce4-panel-4.2.1.1.tar.bz2 Index: xfce4-panel.spec =================================================================== RCS file: /cvs/dist/rpms/xfce4-panel/FC-3/xfce4-panel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xfce4-panel.spec 9 Sep 2004 14:44:39 -0000 1.7 +++ xfce4-panel.spec 20 Mar 2005 08:22:05 -0000 1.8 @@ -1,31 +1,40 @@ -Summary: Next generation panel for xfce +Summary: Next generation panel for Xfce Name: xfce4-panel -Version: 4.0.6 -Release: 1 +Version: 4.2.1.1 +Release: 2.FC3 License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-panel-4.2.1.1.tar.bz2 # Change default for Fedora -Patch: panel-evolution-mail.patch +Patch0: panel-launchmail.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root -Requires: libxfcegui4 >= 4.0.5 -Requires: libxfce4mcs >= 4.0.5 -Requires: xfce-mcs-manager >= 4.0.5 +Requires: libxfcegui4 >= 4.2.1 +Requires: libxfce4mcs >= 4.2.1 +Requires: xfce-mcs-manager >= 4.2.1 Requires: libxml2 >= 2.4.0 -BuildRequires: libxfcegui4-devel >= 4.0.5 -BuildRequires: libxfce4mcs-devel >= 4.0.5 -BuildRequires: xfce-mcs-manager-devel >= 4.0.5 +BuildRequires: libxfcegui4-devel >= 4.2.1 +BuildRequires: libxfce4mcs-devel >= 4.2.1 +BuildRequires: xfce-mcs-manager-devel >= 4.2.1 BuildRequires: libxml2-devel >= 2.4.0 BuildRequires: startup-notification-devel %description -This package includes the panel for the XFce desktop environment +This package includes the panel for the Xfce desktop environment + +%package devel +Summary: developpment headers for xfce4-panel +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +This package includes the header files you will need to build +plugins for xfce4-panel. %prep %setup -q - -%patch -p1 -b .evolution +%patch0 -p1 %build %configure @@ -42,16 +51,46 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc README TODO ChangeLog NEWS NOTES INSTALL COPYING AUTHORS -%{_sysconfdir}/xfce4 +%doc README TODO ChangeLog NEWS NOTES COPYING AUTHORS +/etc/xdg/xfce4 %{_datadir}/xfce4/doc -%{_includedir}/xfce4 %{_libdir}/xfce4 -%{_libdir}/pkgconfig %{_bindir}/* -%{_datadir}/xfce4/themes +%{_datadir}/applications/* +%{_datadir}/icons/hicolor/*/*/*.png + +%files devel +%defattr(-, root, root) +%{_libdir}/pkgconfig/* +%{_includedir}/xfce4 %changelog +* Sat Mar 19 2005 Warren Togami - 4.2.1.1-2 +- remove stuff + +* Thu Mar 17 2005 Kevin Fenzi - 4.2.1.1-1 +- Updated to 4.2.1.1 version +- Changed Requires/Buildrequires to 4.2.1, as xfce4-panel was the only package updated to 4.2.1.1 + +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-4 +- Fixed case of Xfce + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-3 +- Created a new patch to change mozilla -mail to launchmail +- Moved the includes to the devel subpackage + +* Thu Feb 03 2005 Than Ngo 4.2.0-2 +- new sub package xfce4-panel-devel + +* Tue Jan 25 2005 Than Ngo 4.2.0-1 +- 4.2.0 + +* Wed Dec 08 2004 Than Ngo 4.0.6-2 +- add patch to use lauchmail/htmlview #142160 + * Mon Jul 19 2004 Than Ngo 4.0.6-1 - update to 4.0.6 - remove some unneeded patch files --- panel-evolution-mail.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 20 09:41:23 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 04:41:23 -0500 Subject: rpms/libidn/devel libidn-0.5.15.tar.gz.sig, NONE, 1.1 .cvsignore, 1.13, 1.14 libidn.spec, 1.17, 1.18 sources, 1.13, 1.14 upstream, 1.6, 1.7 Message-ID: <200503200941.j2K9fNBU023057@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libidn/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23047 Modified Files: .cvsignore libidn.spec sources upstream Added Files: libidn-0.5.15.tar.gz.sig Log Message: * Sun Mar 20 2005 Joe Orton 0.5.15-1 - update to 0.5.15 --- NEW FILE libidn-0.5.15.tar.gz.sig --- ? Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libidn/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 31 Jan 2005 10:00:18 -0000 1.13 +++ .cvsignore 20 Mar 2005 09:41:19 -0000 1.14 @@ -1 +1 @@ -libidn-0.5.13.tar.gz +libidn-0.5.15.tar.gz Index: libidn.spec =================================================================== RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libidn.spec 4 Mar 2005 10:13:05 -0000 1.17 +++ libidn.spec 20 Mar 2005 09:41:19 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.5.13 -Release: 2 +Version: 0.5.15 +Release: 1 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -83,6 +83,9 @@ %{_mandir}/man3/* %changelog +* Sun Mar 20 2005 Joe Orton 0.5.15-1 +- update to 0.5.15 + * Fri Mar 4 2005 Joe Orton 0.5.13-2 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/libidn/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 31 Jan 2005 10:00:23 -0000 1.13 +++ sources 20 Mar 2005 09:41:19 -0000 1.14 @@ -1 +1 @@ -733cddb52c40a5656053631d31fe3cc7 libidn-0.5.13.tar.gz +03d2c41aa6e74ab627a09b1f9f032280 libidn-0.5.15.tar.gz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/libidn/devel/upstream,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- upstream 31 Jan 2005 10:00:23 -0000 1.6 +++ upstream 20 Mar 2005 09:41:19 -0000 1.7 @@ -1 +1 @@ -libidn-0.5.13.tar.gz +libidn-0.5.15.tar.gz From fedora-cvs-commits at redhat.com Sun Mar 20 09:42:24 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 04:42:24 -0500 Subject: rpms/libidn/devel libidn-0.5.13.tar.gz.sig,1.1,NONE Message-ID: <200503200942.j2K9gOvQ023092@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libidn/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23083 Removed Files: libidn-0.5.13.tar.gz.sig Log Message: Remove old sig file. --- libidn-0.5.13.tar.gz.sig DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 20 13:45:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 08:45:52 -0500 Subject: rpms/ttmkfdir/FC-3 ttmkfdir.spec,1.7,1.8 Message-ID: <200503201345.j2KDjqsH010172@cvs.devel.redhat.com> Update of /cvs/dist/rpms/ttmkfdir/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv10160 Modified Files: ttmkfdir.spec Log Message: gcc4 build Index: ttmkfdir.spec =================================================================== RCS file: /cvs/dist/rpms/ttmkfdir/FC-3/ttmkfdir.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ttmkfdir.spec 10 Sep 2004 02:46:40 -0000 1.7 +++ ttmkfdir.spec 20 Mar 2005 13:45:50 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Utility used to create fonts.scale files for truetype fonts Name: ttmkfdir Version: 3.0.9 -Release: 14 +Release: 15 Source0: %{name}-%{version}.tar.bz2 Patch: ttmkfdir-3.0.9-cpp.patch Patch1: ttmkfdir-3.0.9-zlib.patch @@ -50,6 +50,9 @@ %{_bindir}/ttmkfdir %changelog +* Sun Mar 20 2005 Yu Shao 3.0.9-15 +- rebuild with GCC 4 + * Fri Sep 10 2004 Yu Shao 3.0.9-14 - bug #100560, requires zlib-devel rather than zlib From fedora-cvs-commits at redhat.com Sun Mar 20 13:50:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 08:50:45 -0500 Subject: rpms/ttmkfdir/devel ttmkfdir.spec,1.7,1.8 Message-ID: <200503201350.j2KDojDr010236@cvs.devel.redhat.com> Update of /cvs/dist/rpms/ttmkfdir/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10224 Modified Files: ttmkfdir.spec Log Message: gcc4 build Index: ttmkfdir.spec =================================================================== RCS file: /cvs/dist/rpms/ttmkfdir/devel/ttmkfdir.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ttmkfdir.spec 10 Sep 2004 02:46:40 -0000 1.7 +++ ttmkfdir.spec 20 Mar 2005 13:50:42 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Utility used to create fonts.scale files for truetype fonts Name: ttmkfdir Version: 3.0.9 -Release: 14 +Release: 15 Source0: %{name}-%{version}.tar.bz2 Patch: ttmkfdir-3.0.9-cpp.patch Patch1: ttmkfdir-3.0.9-zlib.patch @@ -50,6 +50,9 @@ %{_bindir}/ttmkfdir %changelog +* Sun Mar 20 2005 Yu Shao 3.0.9-15 +- rebuild with GCC 4 + * Fri Sep 10 2004 Yu Shao 3.0.9-14 - bug #100560, requires zlib-devel rather than zlib From fedora-cvs-commits at redhat.com Sun Mar 20 13:55:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 08:55:43 -0500 Subject: rpms/ttmkfdir/devel ttmkfdir.spec,1.8,1.9 Message-ID: <200503201355.j2KDth4S021300@cvs.devel.redhat.com> Update of /cvs/dist/rpms/ttmkfdir/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21287 Modified Files: ttmkfdir.spec Log Message: bump version for gcc4 Index: ttmkfdir.spec =================================================================== RCS file: /cvs/dist/rpms/ttmkfdir/devel/ttmkfdir.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ttmkfdir.spec 20 Mar 2005 13:50:42 -0000 1.8 +++ ttmkfdir.spec 20 Mar 2005 13:55:39 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Utility used to create fonts.scale files for truetype fonts Name: ttmkfdir Version: 3.0.9 -Release: 15 +Release: 16 Source0: %{name}-%{version}.tar.bz2 Patch: ttmkfdir-3.0.9-cpp.patch Patch1: ttmkfdir-3.0.9-zlib.patch @@ -50,7 +50,7 @@ %{_bindir}/ttmkfdir %changelog -* Sun Mar 20 2005 Yu Shao 3.0.9-15 +* Sun Mar 20 2005 Yu Shao 3.0.9-16 - rebuild with GCC 4 * Fri Sep 10 2004 Yu Shao 3.0.9-14 From fedora-cvs-commits at redhat.com Sun Mar 20 17:24:46 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 12:24:46 -0500 Subject: rpms/4Suite/devel 4Suite.spec,1.19,1.20 Message-ID: <200503201724.j2KHOkA3023340@cvs.devel.redhat.com> Update of /cvs/dist/rpms/4Suite/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14235 Modified Files: 4Suite.spec Log Message: Persuade 4Suite its Python modules are architecture-specific Index: 4Suite.spec =================================================================== RCS file: /cvs/dist/rpms/4Suite/devel/4Suite.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- 4Suite.spec 20 Mar 2005 00:10:51 -0000 1.19 +++ 4Suite.spec 20 Mar 2005 17:24:43 -0000 1.20 @@ -45,7 +45,8 @@ %build export CFLAGS="$RPM_OPT_FLAGS" -python setup.py config --system +python setup.py config --system \ + --pythonlibdir=%{_libdir}/python%pyver/site-packages python setup.py build %install From fedora-cvs-commits at redhat.com Sun Mar 20 17:48:37 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 12:48:37 -0500 Subject: rpms/4Suite/devel 4Suite-1.0a4-format.patch, NONE, 1.1 4Suite.spec, 1.20, 1.21 Message-ID: <200503201748.j2KHmbgx026610@cvs.devel.redhat.com> Update of /cvs/dist/rpms/4Suite/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26595 Modified Files: 4Suite.spec Added Files: 4Suite-1.0a4-format.patch Log Message: * Sun Mar 20 2005 Miloslav Trmac - 1.0-7.a4 - Fix format string on 64-bit platforms 4Suite-1.0a4-format.patch: StreamWriter.c | 11 +---------- 1 files changed, 1 insertion(+), 10 deletions(-) --- NEW FILE 4Suite-1.0a4-format.patch --- --- 4Suite-1.0a4/Ft/Xml/src/StreamWriter.c.format 2005-03-20 18:37:40.597138272 +0100 +++ 4Suite-1.0a4/Ft/Xml/src/StreamWriter.c 2005-03-20 18:38:06.602184904 +0100 @@ -164,15 +164,6 @@ return result; } -/* Note: use decimal form due to some broken browsers. */ -#ifdef Py_UNICODE_WIDE -/* UCS-4 build (wide) */ -#define XML_CHARREF_FMTSTR "&#%ld;" -#else -/* UCS-2 build (narrow) */ -#define XML_CHARREF_FMTSTR "&#%d;" -#endif - static int write_escaped(PyStreamWriterObject *self, PyObject *unicode) { PyObject *data; @@ -195,7 +186,7 @@ if (!data) { /* Found an offending character */ PyErr_Clear(); - sprintf(charref, XML_CHARREF_FMTSTR, *unistr); + sprintf(charref, "&#%ld;", (long)*unistr); data = PyString_FromString(charref); if (!data) { return -1; Index: 4Suite.spec =================================================================== RCS file: /cvs/dist/rpms/4Suite/devel/4Suite.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- 4Suite.spec 20 Mar 2005 17:24:43 -0000 1.20 +++ 4Suite.spec 20 Mar 2005 17:48:35 -0000 1.21 @@ -3,10 +3,11 @@ Summary: A collections of XML-related technologies for python Name: 4Suite Version: 1.0 -Release: 6.a4 +Release: 7.a4 Source: ftp://ftp.fourthought.com/pub/4Suite/4Suite-1.0a4.tar.bz2 Patch0: 4Suite-1.0a4-root.patch Patch1: 4Suite-1.0a4-gcc.patch +Patch2: 4Suite-1.0a4-format.patch License: Apacheish Group: Development/Libraries Requires: python, PyXML >= 0.7, Distutils @@ -42,6 +43,7 @@ %setup -q -n 4Suite-1.0a4 %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -66,6 +68,9 @@ /var/lib/4Suite %changelog +* Sun Mar 20 2005 Miloslav Trmac - 1.0-7.a4 +- Fix format string on 64-bit platforms + * Sat Mar 19 2005 Miloslav Trmac - 1.0-6.a4 - Fix build with gcc 4 - Update to 4Suite-1.0a4 From fedora-cvs-commits at redhat.com Sun Mar 20 21:06:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 16:06:56 -0500 Subject: rpms/xfdesktop/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfdesktop.spec, 1.6, 1.7 Message-ID: <200503202106.j2KL6uCP025784@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfdesktop/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv25761/FC-3 Modified Files: .cvsignore sources xfdesktop.spec Log Message: auto-import xfdesktop-4.2.1-1.FC3 on branch FC-3 from xfdesktop-4.2.1-1.FC3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfdesktop/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 14:44:03 -0000 1.4 +++ .cvsignore 20 Mar 2005 21:06:54 -0000 1.5 @@ -1 +1 @@ -xfdesktop-4.0.6.tar.gz +xfdesktop-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfdesktop/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 14:44:03 -0000 1.4 +++ sources 20 Mar 2005 21:06:54 -0000 1.5 @@ -1 +1 @@ -8f7a87ada82eaa60fb37998553787002 xfdesktop-4.0.6.tar.gz +91f02bb04a14f773f4877f4aa534ce0b xfdesktop-4.2.1.tar.bz2 Index: xfdesktop.spec =================================================================== RCS file: /cvs/dist/rpms/xfdesktop/FC-3/xfdesktop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfdesktop.spec 9 Sep 2004 14:44:05 -0000 1.6 +++ xfdesktop.spec 20 Mar 2005 21:06:54 -0000 1.7 @@ -1,23 +1,23 @@ Summary: Desktop manager for the XFce Desktop Environment Name: xfdesktop -Version: 4.0.6 -Release: 2 +Version: 4.2.1 +Release: 1.FC3 License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.1/src/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2 # Change default for Fedora Patch1: xfdesktop-image.patch Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: xfce-mcs-manager Requires: xfwm4 Requires: xfce4-panel Requires: desktop-backgrounds-basic -BuildRequires: libxfce4mcs-devel >= 4.0.5 -BuildRequires: libxfcegui4-devel >= 4.0.5 +BuildRequires: libxfce4mcs-devel >= %{version} +BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: libxml2-devel BuildRequires: xfce-mcs-manager-devel @@ -27,7 +27,7 @@ %prep %setup -q -%patch1 -p1 -b .fedora +#%patch1 -p1 -b .fedora %build %configure @@ -49,12 +49,24 @@ %files -f %{name}.lang %defattr(-,root,root) %doc README TODO ChangeLog NEWS COPYING AUTHORS -%{_sysconfdir}/xfce4/ +%{_sysconfdir}/xdg/xfce4/* %{_bindir}/* %{_datadir}/xfce4/* %{_libdir}/xfce4/mcs-plugins/* +%{_libdir}/xfce4/modules/* +%{_libdir}/xfce4/panel-plugins/* +%{_datadir}/applications/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/pixmaps/* +%{_mandir}/man1/* %changelog +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Thu Jan 27 2005 Than Ngo 4.2.0-1 +- 4.2.0 + * Wed Sep 01 2004 Than Ngo 4.0.6-2 - get rid useless static library #131485 From fedora-cvs-commits at redhat.com Sun Mar 20 21:09:19 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 16:09:19 -0500 Subject: rpms/xfce4-iconbox/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xfce4-iconbox.spec, 1.2, 1.3 Message-ID: <200503202109.j2KL9JZa025877@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfce4-iconbox/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv25854/FC-3 Modified Files: .cvsignore sources xfce4-iconbox.spec Log Message: auto-import xfce4-iconbox-4.2.1-1.FC3 on branch FC-3 from xfce4-iconbox-4.2.1-1.FC3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfce4-iconbox/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Sep 2004 14:41:43 -0000 1.2 +++ .cvsignore 20 Mar 2005 21:09:17 -0000 1.3 @@ -1 +1 @@ -xfce4-iconbox-4.0.6.tar.gz +xfce4-iconbox-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfce4-iconbox/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 14:41:43 -0000 1.2 +++ sources 20 Mar 2005 21:09:17 -0000 1.3 @@ -1 +1 @@ -595822848a029d50a5e555e30f28efb2 xfce4-iconbox-4.0.6.tar.gz +81919388d17e2d1395bea8d92d99c6f8 xfce4-iconbox-4.2.1.tar.bz2 Index: xfce4-iconbox.spec =================================================================== RCS file: /cvs/dist/rpms/xfce4-iconbox/FC-3/xfce4-iconbox.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xfce4-iconbox.spec 9 Sep 2004 14:42:04 -0000 1.2 +++ xfce4-iconbox.spec 20 Mar 2005 21:09:17 -0000 1.3 @@ -1,19 +1,19 @@ -Summary: Icon box for the XFce4 Desktop Environment +Summary: Icon box for the Xfce4 Desktop Environment Name: xfce4-iconbox -Version: 4.0.6 -Release: 2 +Version: 4.2.1 +Release: 1.FC3 License: GPL URL: http://www.xfce.org/ -Source0: ftp://ftp.berlios.de/pub/xfce-goodies/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-iconbox-4.2.1.tar.bz2 Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: libxfcegui4 >= 4.0.0 -Requires: libxfce4mcs >= 4.0.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: libxfcegui4 >= %{version} +Requires: libxfce4mcs >= %{version} BuildRequires: pkgconfig BuildRequires: gettext -BuildRequires: libxfcegui4-devel >= 4.0.0 -BuildRequires: libxfce4mcs-devel >= 4.0.0 -BuildRequires: xfce-mcs-manager-devel >= 4.0.0 +BuildRequires: libxfcegui4-devel >= %{version} +BuildRequires: libxfce4mcs-devel >= %{version} +BuildRequires: xfce-mcs-manager-devel >= %{version} %description xfce-iconbox shows icons for running programs. @@ -41,8 +41,22 @@ %doc README TODO ChangeLog NEWS COPYING AUTHORS %{_bindir}/* %{_libdir}/xfce4/mcs-plugins +%{_datadir}/applications/* +%{_datadir}/icons/hicolor/*/*/* %changelog +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to version 4.2.1 + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-3 +- Fixed case on Xfce + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 +- Inital Fedora Extras version + +* Fri Jan 28 2005 Than Ngo 4.2.0-1 +- 4.2.0 + * Wed Sep 01 2004 Than Ngo 4.0.6-2 - use find_lang macro - get rid of useless static library From fedora-cvs-commits at redhat.com Sun Mar 20 21:10:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 16:10:31 -0500 Subject: rpms/xfce-mcs-plugins/FC-3 xfce-mcs-plugins-4.2.0-rh.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce-mcs-plugins.spec, 1.6, 1.7 xfce-mcs-plugin-fedora.patch, 1.1, NONE Message-ID: <200503202110.j2KLAV1a025977@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfce-mcs-plugins/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv25953/FC-3 Modified Files: .cvsignore sources xfce-mcs-plugins.spec Added Files: xfce-mcs-plugins-4.2.0-rh.patch Removed Files: xfce-mcs-plugin-fedora.patch Log Message: auto-import xfce-mcs-plugins-4.2.1-2.FC3 on branch FC-3 from xfce-mcs-plugins-4.2.1-2.FC3.src.rpm xfce-mcs-plugins-4.2.0-rh.patch: ui_plugin.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE xfce-mcs-plugins-4.2.0-rh.patch --- --- xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c.orig 2004-12-27 20:05:36.000000000 +0100 +++ xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c 2005-01-24 11:01:02.291654459 +0100 @@ -118,8 +118,8 @@ #define CHANNEL "settings" #define PLUGIN_NAME "ui" #define DEFAULT_THEME "Default" -#define INITIAL_THEME "Xfce" -#define DEFAULT_ICON_THEME "hicolor" +#define INITIAL_THEME "Bluecurve" +#define DEFAULT_ICON_THEME "Bluecurve" #define INITIAL_ICON_THEME "Rodent" #define DEFAULT_TOOLBAR_STYLE "icons" #define DEFAULT_FONT "Sans 9" Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfce-mcs-plugins/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 14:42:19 -0000 1.4 +++ .cvsignore 20 Mar 2005 21:10:29 -0000 1.5 @@ -1 +1 @@ -xfce-mcs-plugins-4.0.6.tar.gz +xfce-mcs-plugins-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfce-mcs-plugins/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 14:42:19 -0000 1.4 +++ sources 20 Mar 2005 21:10:29 -0000 1.5 @@ -1 +1 @@ -e197d3570f444daa175a684e472ea396 xfce-mcs-plugins-4.0.6.tar.gz +f53711b93e28b6751f18f6346d4194e2 xfce-mcs-plugins-4.2.1.tar.bz2 Index: xfce-mcs-plugins.spec =================================================================== RCS file: /cvs/dist/rpms/xfce-mcs-plugins/FC-3/xfce-mcs-plugins.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce-mcs-plugins.spec 9 Sep 2004 14:42:28 -0000 1.6 +++ xfce-mcs-plugins.spec 20 Mar 2005 21:10:29 -0000 1.7 @@ -1,25 +1,20 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.0.6 -Release: 2 +Version: 4.2.1 +Release: 2.FC3 License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.6/src/%{name}-%{version}.tar.gz - -Patch: xfce-mcs-plugin-fedora.patch - +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2 +Patch: xfce-mcs-plugins-4.2.0-rh.patch Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -Requires: gtk2 >= 2.0.6 -Requires: xfce-mcs-manager >= 4.0.5 - +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: xfce-mcs-manager >= %{version} BuildRequires: gettext BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: xfce-mcs-manager-devel >= 4.0.5 -BuildRequires: libxfcegui4-devel >= 4.0.5 -BuildRequires: libxfce4util-devel >= 4.0.5 -BuildRequires: libxfce4mcs-devel >= 4.0.5 +BuildRequires: xfce-mcs-manager-devel >= %{version} +BuildRequires: libxfcegui4-devel >= %{version} +BuildRequires: libxfce4util-devel >= %{version} +BuildRequires: libxfce4mcs-devel >= %{version} %description This package inlcudes a set of plugins for the multi channel @@ -27,7 +22,6 @@ %prep %setup -q - %patch -p1 -b .fedora %build @@ -48,10 +42,26 @@ %doc README TODO COPYING AUTHORS %docdir %{_datadir}/xfce4/doc %{_datadir}/xfce4/doc/C -%lang(fr) %{_datadir}/xfce4/doc/fr/ %{_libdir}/xfce4/mcs-plugins/* +%{_datadir}/applications/* +%{_datadir}/icons/*/*/apps/* %changelog +* Sat Mar 19 2005 Warren Togami - 4.2.1-2 +- remove explicit gtk2 req + +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 +- Capitalized first letter of Summary in devel section to quiet rpmlint + +* Mon Jan 24 2005 Than Ngo 4.2.0-1 +- 4.2.0 + +* Wed Dec 08 2004 Than Ngo 4.1.99.1-1 +- update to 4.2 rc1 + * Thu Sep 02 2004 Than Ngo 4.0.6-2 - use find_lang macro - cleanup specfile --- xfce-mcs-plugin-fedora.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 20 21:11:53 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 16:11:53 -0500 Subject: rpms/xfce4-systray/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xfce4-systray.spec, 1.3, 1.4 Message-ID: <200503202111.j2KLBrv9026073@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfce4-systray/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv26049/FC-3 Modified Files: .cvsignore sources xfce4-systray.spec Log Message: auto-import xfce4-systray-4.2.1-2.FC3 on branch FC-3 from xfce4-systray-4.2.1-2.FC3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfce4-systray/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Sep 2004 14:42:14 -0000 1.2 +++ .cvsignore 20 Mar 2005 21:11:51 -0000 1.3 @@ -1 +1 @@ -xfce4-systray-4.0.6.tar.gz +xfce4-systray-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfce4-systray/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 14:42:14 -0000 1.2 +++ sources 20 Mar 2005 21:11:51 -0000 1.3 @@ -1 +1 @@ -c47e746ad38178c6c7f891ca4b39a616 xfce4-systray-4.0.6.tar.gz +d85ec276685040a857e64aa74cdc4c7f xfce4-systray-4.2.1.tar.bz2 Index: xfce4-systray.spec =================================================================== RCS file: /cvs/dist/rpms/xfce4-systray/FC-3/xfce4-systray.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xfce4-systray.spec 6 Oct 2004 11:16:17 -0000 1.3 +++ xfce4-systray.spec 20 Mar 2005 21:11:51 -0000 1.4 @@ -1,21 +1,21 @@ -Summary: Systray for the XFce4 Desktop Environment +Summary: Systray for the Xfce4 Desktop Environment Name: xfce4-systray -Version: 4.0.6 -Release: 2 +Version: 4.2.1 +Release: 2.FC3 License: BSD URL: http://www.xfce.org/ -Source0: %{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce4-systray-4.2.1.tar.bz2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root -Requires: xfce4-panel >= 4.0.6 -BuildRequires: xfce4-panel >= 4.0.6 +Requires: xfce4-panel >= %{version} +BuildRequires: xfce4-panel >= %{version} BuildRequires: libxml2-devel BuildRequires: libxfcegui4-devel BuildRequires: startup-notification-devel BuildRequires: xfce-mcs-manager-devel %description -This is a systemtray plugin for xfce4. +This is a systemtray plugin for Xfce4. %prep %setup -q @@ -33,12 +33,28 @@ %clean rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root) -%doc README INSTALL COPYING AUTHORS +%doc README COPYING AUTHORS %{_libdir}/xfce4 %changelog +* Sat Mar 19 2005 Warren Togami - 4.2.1-2 +- remove macro from changelog + +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-4 +- Removed generic INSTALL from doc +- Fixed case of Xfce + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-3 +- Inital Fedora Extras version + +* Wed Jan 26 2005 Than Ngo 4.2.0-1 +- 4.2.0 + * Wed Oct 06 2004 Than Ngo 4.0.6-2 - more Buildrequires From fedora-cvs-commits at redhat.com Sun Mar 20 21:12:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 16:12:44 -0500 Subject: rpms/xfce-utils/FC-3 xfce4.desktop, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce-utils.spec, 1.5, 1.6 xfce-utils-misc.patch, 1.1, NONE xfce.desktop, 1.1, NONE Message-ID: <200503202112.j2KLCi5U026180@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfce-utils/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv26157/FC-3 Modified Files: .cvsignore sources xfce-utils.spec Added Files: xfce4.desktop Removed Files: xfce-utils-misc.patch xfce.desktop Log Message: auto-import xfce-utils-4.2.1-1.FC3 on branch FC-3 from xfce-utils-4.2.1-1.FC3.src.rpm --- NEW FILE xfce4.desktop --- [Desktop Entry] Encoding=UTF-8 Type=XSession Exec=startxfce4 TryExec=startxfce4 Name=XFce 4 Name[eo]=Facoj 4 Name[pa]=XFce ??? Name[sv]=Xfce 4 Comment=The Cholesterol Free Desktop Environment, version 4. A desktop environment reminiscent of CDE Comment[bn]=?????? ???????????????????????? ???????????? ????????????????????? ????????????????????????????????????, ???????????? ???????????????????????? CDE-??? ????????? ????????? ??????????????? ????????? ????????? ???????????? ????????????????????? ???????????????????????????????????? Comment[bs]=Cholesterol Free Desktop Environment. Desktop okolina nalik na CDE Comment[ca]=L'entorn d'escriptori sense colesterol, versi?? 4. Un entorn d'escriptori que recorda a CDE Comment[cy]=Yr Amgylchedd Penbwrdd Di-Golesterol, fersiwn 4. Amgylchedd penbwrdd sy'n atgoffaol o CDE Comment[da]=Det kolesterolfrie desktopmilj??, version 4. Et desktopmilj?? der minder om CDE Comment[de]=Cholesterol Free Desktop Environment, Version 4. Benutzerumgebung in der Art von CDE Comment[el]=???? Cholesterol Free Desktop Environment, ???????????? 4. ?????? ???????????????????? ???????????????????? ???????????????? ?????????????????? ?????? CDE Comment[eo]=La libera labortablo ??irka??ajo 4 Comment[es]=El Cholesterol Free Desktop Environment, versi??n 4. Un entorno de escritorio que recuerda a CDE Comment[et]=Kolesteroolivaba t????laua keskkond (versioon 4), mis meenutab mitmeti CDE-d Comment[eu]=Kolesterolik gabeko idazmahai ingurunea, 4 bertsioa. CDE gogorarazten duen mahaigaina Comment[fi]=Cholesterol Free -ty??p??yt??ymp??rist??. CDE:t?? muisteleva ty??p??yt??ymp??rist??. Comment[fr]=The Cholesterol Free Desktop Environment, version 4. Un environnement de bureau rappelant CDE Comment[gl]=O Cholesterol Free Desktop Environment, versi??n 4. Un entorno de escritorio reminiscencia de CDE Comment[he]=The Cholesterol Free Desktop Environment. ???????? 4, ?????????? ?????????? ?????????????? ???? CDE Comment[hu]=The Cholesterol Free Desktop Environment, 4-es verzi??. Egy CDE-szer?? ablakkezel?? Comment[is]=K??lesterol-lausa skj??bor??sumhverfi??, ??tg??fa 4. Skj??bor?? sem l??kist CDE Comment[it]=Il Cholesterol Free Desktop Environment, versione 4. Un desktop environment che ricorda CDE Comment[ja]=Cholesterol Free Desktop Environment version 4 CDE????????????????????????????????????????????????????????? Comment[mt]=Cholesterol Free Desktop Environment (v4). Ambjent grafiku li jixba?? lis-CDE Comment[nb]=Den Kolesterolfrie Brukerflate, versjon 4. Et skrivebordsmilj?? som minner om CDE Comment[nds]=De Cholesterol Free Desktop Environment, Verschoon 4. En Schriefdisch-??mgeven, de wat liek is to CDE Comment[nl]=De Cholesterol Free Desktop Environment, versie 4. Een desktop environment die herinnert aan CDE Comment[nn]=Cholesterol Free Desktop Environment. Eit skrivebordsmilj?? som minner om CDE Comment[pa]=?????????????????????????????? ???????????? ?????????????????????, ???????????? ??? ????????? CDE ???????????? ????????????????????? Comment[pl]=Cholesterol Free Desktop Environment, wersja 4 - ??rodowisko graficzne podobne do CDE. Comment[pt]=O Cholesterol Free Desktop Environment, vers??o 4. Um ambiente de trabalho com vest??gios do CDE Comment[pt_BR]=Acr??nimo para Cholesterol Free Desktop Environment (ou ambiente livre de colesterol), vers??o 4; um ambiente de trabalho remanescente do CDE Comment[ro]=Cholesterol Free Desktop Environment, versiunea 4. Un mediu grafic cu reminescente din CDE Comment[ru]="???? ???????????????????? ??????????????????????" ?????????????? ?????????? xfce ???????????? 4, ???????????????????????? CDE Comment[sk]=The Cholesterol Free Desktop Environment verzia 4. Pracovn?? prostredie pripom??naj??ce CDE Comment[sl]=Cholesterol Free Desktop Environment, razli??ica 4. Namizno okolje, podobno okolju CDE Comment[sr]=???The Cholesterol Free Desktop Environment??? 4. ????????????. ?????????? ???????????????? ???????? ?????????????? ???? CDE Comment[sr at Latn]=???The Cholesterol Free Desktop Environment??? 4. ????????????. ?????????? ???????????????? ???????? ?????????????? ???? CDE Comment[sv]=Den kolesterolfria skrivbordsmilj??n, version 4. En skrivbordsmilj?? som p??minner om CDE Comment[ta]=????????????????????????????????? ?????????????????? ???????????????????????? ???????????????. ????????????????????? 4. CDE ??????????????????????????????????????? ???????????????????????? ??????????????? Comment[tr]=Cholesterol ??cretsiz Masa??st?? Ortam??, s??r??m 4. CDE'nin benzeri olan masa??st?? ortam?? Comment[uk]=The Cholesterol Free Desktop Environment, ???????????? 4. ???????????????? ????????????????????, ???? ?????????????? CDE Comment[zh_CN]=???????????????????????????????????? 4???CDE ???????????????????????? Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfce-utils/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 14:42:43 -0000 1.4 +++ .cvsignore 20 Mar 2005 21:12:42 -0000 1.5 @@ -1 +1 @@ -xfce-utils-4.0.6.tar.gz +xfce-utils-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfce-utils/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 14:42:43 -0000 1.4 +++ sources 20 Mar 2005 21:12:42 -0000 1.5 @@ -1 +1 @@ -d42a01aa03a9eafb9bc2cc546d988b4b xfce-utils-4.0.6.tar.gz +b765cc3144731c2fc1e39a0ed70fc25b xfce-utils-4.2.1.tar.bz2 Index: xfce-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xfce-utils/FC-3/xfce-utils.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xfce-utils.spec 9 Sep 2004 14:42:43 -0000 1.5 +++ xfce-utils.spec 20 Mar 2005 21:12:42 -0000 1.6 @@ -1,32 +1,29 @@ %define xsessiondir %{_datadir}/xsessions -Summary: Utilities for the XFce Desktop Environment +Summary: Utilities for the Xfce Desktop Environment Name: xfce-utils -Version: 4.0.6 -Release: 1 +Version: 4.2.1 +Release: 1.FC3 License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.1/src/%{name}-%{version}.tar.gz -Source1: xfce.desktop -Patch: xfce-utils-misc.patch +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-utils-4.2.1.tar.bz2 +Source1: xfce4.desktop Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager Requires: xfwm4 Requires: xfdesktop Requires: /usr/bin/id -BuildRequires: libxfcegui4-devel >= 4.0.5 -BuildRequires: libxfce4mcs-devel >= 4.0.5 +BuildRequires: libxfcegui4-devel >= %{version} +BuildRequires: libxfce4mcs-devel >= %{version} BuildRequires: xfce-mcs-manager-devel %description -This package includes utilities for the XFce Desktop Environment +This package includes utilities for the Xfce Desktop Environment %prep %setup -q -%patch -p1 -b .misc - %build %configure --enable-gdm @@ -37,8 +34,10 @@ mkdir -p $RPM_BUILD_ROOT%{xsessiondir} -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/ make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop + +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/ %find_lang %{name} @@ -49,15 +48,36 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc README TODO ChangeLog NEWS INSTALL COPYING AUTHORS -%config(noreplace) %{_sysconfdir}/xfce4/xinitrc +%doc README TODO ChangeLog NEWS COPYING AUTHORS +%attr(0755,root,root) %{_sysconfdir}/xdg/xfce4 %{_bindir}/* %{_libdir}/xfce4/mcs-plugins/* %{_datadir}/apps/switchdesk/* %{_datadir}/xfce4 +%{_datadir}/icons/*/*/* +%{_datadir}/applications/* %{xsessiondir}/* %changelog +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-3 +- Fixed case on Xfce + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 +- Removed old misc patch + +* Thu Jan 27 2005 Than Ngo 4.2.0-1 +- 4.2.0 + +* Thu Dec 02 2004 Than Ngo 4.0.6-3 +- permission fix #141597 + +* Mon Nov 22 2004 Than Ngo 4.0.6-2 +- add session desktop file from KDE, better translations +- improve xfterm4 #139183 + * Mon Jul 19 2004 Than Ngo 4.0.6-1 - update to 4.0.6 - use %%find_lang macros, bug #124950 --- xfce-utils-misc.patch DELETED --- --- xfce.desktop DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 20 21:41:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 16:41:38 -0500 Subject: rpms/openoffice.org/devel sources,1.41,1.42 Message-ID: <200503202141.j2KLfc89007991@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7978 Modified Files: sources Log Message: wrong name for german dictionary Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 18 Mar 2005 08:54:42 -0000 1.41 +++ sources 20 Mar 2005 21:41:36 -0000 1.42 @@ -1,3 +1,3 @@ c94a123e4006b410706a5b550f007e93 Archive-Zip-1.13.tar.gz 2828d37e2bf9c6943a991465c542f815 SRC680_m85.tar.bz2 -0ec1ff5be35855e61096ce561cef8422 openoffice.org-myspell-contrib.tar.gz +ba84593fcd9afbf6ddd981cc205ea729 openoffice.org-myspell-contrib.tar.gz From fedora-cvs-commits at redhat.com Sun Mar 20 21:55:16 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 16:55:16 -0500 Subject: rpms/openoffice.org/devel openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch, NONE, 1.1 openoffice.org-1.9.87.NONE.sysui.parallel.patch, NONE, 1.1 openoffice.org-1.9.87.NONE.wizards.broken.patch, NONE, 1.1 openoffice.org-1.9.87.gccXXXXX.bean.patch, NONE, 1.1 openoffice.org-1.9.87.warnnoterroronmissing.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 openoffice.org-1.9.82.NONE.noznow.patch, 1.1, 1.2 openoffice.org.spec, 1.102, 1.103 sources, 1.42, 1.43 workspace-gccfour.patch, 1.2, 1.3 workspace-systemmozilla.patch, 1.2, 1.3 openoffice.org-1.9.69.directinstall.patch, 1.2, NONE openoffice.org-1.9.80.NONE.ignoremissing.patch, 1.2, NONE openoffice.org-1.9.81.NONE.scboost.patch, 1.1, NONE openoffice.org-1.9.82.NONE.qadevOOogcj.patch, 1.1, NONE openoffice.org-1.9.83.ooo44377.icunotusingfpic.patch, 1.2, NONE openoffice.org-1.9.84.NONE.wizards.patch, 1.1, NONE openoffice.org-1.9.85.ooo44853.rpmbuilddir.patch, 1.1, NONE workspace-gcj3.patch, 1.2, NONE Message-ID: <200503202155.j2KLtGYL022234@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22221 Modified Files: .cvsignore openoffice.org-1.9.82.NONE.noznow.patch openoffice.org.spec sources workspace-gccfour.patch workspace-systemmozilla.patch Added Files: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch openoffice.org-1.9.87.NONE.sysui.parallel.patch openoffice.org-1.9.87.NONE.wizards.broken.patch openoffice.org-1.9.87.gccXXXXX.bean.patch openoffice.org-1.9.87.warnnoterroronmissing.patch Removed Files: openoffice.org-1.9.69.directinstall.patch openoffice.org-1.9.80.NONE.ignoremissing.patch openoffice.org-1.9.81.NONE.scboost.patch openoffice.org-1.9.82.NONE.qadevOOogcj.patch openoffice.org-1.9.83.ooo44377.icunotusingfpic.patch openoffice.org-1.9.84.NONE.wizards.patch openoffice.org-1.9.85.ooo44853.rpmbuilddir.patch workspace-gcj3.patch Log Message: bump to next version openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch: scp2/source/ooo/profileitem_ooo.scp | 4 ++-- source/ooo/profileitem_ooo.scp | 0 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch --- Index: source/ooo/profileitem_ooo.scp =================================================================== RCS file: /cvs/installation/scp2/source/ooo/profileitem_ooo.scp,v retrieving revision 1.17 diff -u -p -r1.17 profileitem_ooo.scp --- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 31 Jan 2005 11:01:28 -0000 1.17 +++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 18 Mar 2005 09:47:28 -0000 @@ -161,9 +161,9 @@ ProfileItem gid_Profileitem_Bootstrap_Us Order = 3; Key = "UserInstallation"; #ifdef WNT - Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME%PRODUCTVERSION"; + Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME2.0"; #else - Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME%PRODUCTVERSION"; + Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME2.0"; #endif StandaloneValue = "$ORIGIN/.."; End openoffice.org-1.9.87.NONE.sysui.parallel.patch: desktop/freedesktop/makefile.mk | 0 desktop/share/makefile.mk | 0 i18npool/source/breakiterator/makefile.mk | 2 +- source/breakiterator/makefile.mk | 0 sysui/desktop/freedesktop/makefile.mk | 2 +- sysui/desktop/share/makefile.mk | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE openoffice.org-1.9.87.NONE.sysui.parallel.patch --- Index: desktop/freedesktop/makefile.mk =================================================================== RCS file: /cvs/gsl/sysui/desktop/freedesktop/makefile.mk,v retrieving revision 1.3 diff -u -p -r1.3 makefile.mk --- openoffice.org.orig/sysui/desktop/freedesktop/makefile.mk 15 Mar 2005 08:47:57 -0000 1.3 +++ openoffice.org/sysui/desktop/freedesktop/makefile.mk 20 Mar 2005 14:12:58 -0000 @@ -57,7 +57,7 @@ #************************************************************************* PRJ=..$/.. - +MAXPROCESS=1 PRJNAME=sysui TARGET=freedesktop Index: desktop/share/makefile.mk =================================================================== RCS file: /cvs/gsl/sysui/desktop/share/makefile.mk,v retrieving revision 1.3 diff -u -p -r1.3 makefile.mk --- openoffice.org.orig/sysui/desktop/share/makefile.mk 21 Jan 2005 11:19:32 -0000 1.3 +++ openoffice.org/sysui/desktop/share/makefile.mk 20 Mar 2005 14:12:58 -0000 @@ -61,7 +61,7 @@ #************************************************************************* PRJ=..$/.. - +MAXPROCESS=1 PRJNAME=sysui TARGET=desktopshare Index: source/breakiterator/makefile.mk =================================================================== RCS file: /cvs/l10n/i18npool/source/breakiterator/makefile.mk,v retrieving revision 1.6 diff -u -p -r1.6 makefile.mk --- openoffice.org.orig/i18npool/source/breakiterator/makefile.mk 25 Feb 2005 10:08:26 -0000 1.6 +++ openoffice.org/i18npool/source/breakiterator/makefile.mk 20 Mar 2005 17:02:40 -0000 @@ -61,7 +61,7 @@ PRJ=..$/.. PRJNAME=i18npool TARGET=breakiterator - +MAXPROCESS=1 TARGETTYPE=CUI ENABLE_EXCEPTIONS=TRUE openoffice.org-1.9.87.NONE.wizards.broken.patch: scp2/source/ooo/file_ooo.scp | 2 ++ source/ooo/file_ooo.scp | 0 2 files changed, 2 insertions(+) --- NEW FILE openoffice.org-1.9.87.NONE.wizards.broken.patch --- Index: source/ooo/file_ooo.scp =================================================================== RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v retrieving revision 1.74 diff -u -p -r1.74 file_ooo.scp --- openoffice.org.orig/scp2/source/ooo/file_ooo.scp 15 Mar 2005 09:23:29 -0000 1.74 +++ openoffice.org/scp2/source/ooo/file_ooo.scp 19 Mar 2005 11:10:19 -0000 @@ -725,6 +723,7 @@ End #ifdef SOLAR_JAVA +#ifndef GCJ UNO_JAR_FILE( gid_File_Jar_Report, report ) UNO_JAR_FILE( gid_File_Jar_Table, table ) UNO_JAR_FILE( gid_File_Jar_Letter, letter ) @@ -734,6 +733,7 @@ UNO_JAR_FILE( gid_File_Jar_Agenda, agend UNO_JAR_FILE( gid_File_Jar_Query, query ) UNO_JAR_FILE( gid_File_Jar_Web, web ) #endif +#endif #ifdef SOLAR_JAVA STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb ) openoffice.org-1.9.87.gccXXXXX.bean.patch: bean/native/unix/makefile.mk | 1 + native/unix/makefile.mk | 0 2 files changed, 1 insertion(+) --- NEW FILE openoffice.org-1.9.87.gccXXXXX.bean.patch --- Index: native/unix/makefile.mk =================================================================== RCS file: /cvs/api/bean/native/unix/makefile.mk,v retrieving revision 1.5 diff -u -p -r1.5 makefile.mk --- openoffice.org.orig/bean/native/unix/makefile.mk 15 Mar 2005 09:07:46 -0000 1.5 +++ openoffice.org/bean/native/unix/makefile.mk 18 Mar 2005 19:53:40 -0000 @@ -38,6 +38,7 @@ SHL1STDLIBS+=-lstdc++ .IF "$(JDK)" == "gcj" SHL1STDLIBS+=-lgcj +SHL1NOCHECK="TRUE" .ENDIF NO_SHL1DESCRIPTION=TRUE openoffice.org-1.9.87.warnnoterroronmissing.patch: bin/modules/installer/scriptitems.pm | 0 solenv/bin/modules/installer/scriptitems.pm | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) --- NEW FILE openoffice.org-1.9.87.warnnoterroronmissing.patch --- Index: bin/modules/installer/scriptitems.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v retrieving revision 1.17 diff -u -p -r1.17 scriptitems.pm --- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000 1.17 +++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000 @@ -930,8 +930,7 @@ sub remove_Files_Without_Sourcedirectory $infoline = "ERROR: Removing file $filename from file list.\n"; push( @installer::globals::logfileinfo, $infoline); - push(@missingfiles, "ERROR: File not found: $filename\n"); - $error_occured = 1; + push(@missingfiles, "Warning: File not found: $filename\n"); next; # removing this file from list, if sourcepath is empty } Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 17 Mar 2005 13:49:30 -0000 1.29 +++ .cvsignore 20 Mar 2005 21:55:13 -0000 1.30 @@ -79,3 +79,4 @@ SRC680_m84.tar.bz2 openoffice.org-myspell-contrib.tar.gz SRC680_m85.tar.bz2 +SRC680_m87.tar.bz2 openoffice.org-1.9.82.NONE.noznow.patch: desktop/util/makefile.mk | 0 sysui/desktop/util/makefile.mk | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) Index: openoffice.org-1.9.82.NONE.noznow.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.82.NONE.noznow.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-1.9.82.NONE.noznow.patch 4 Mar 2005 20:18:59 -0000 1.1 +++ openoffice.org-1.9.82.NONE.noznow.patch 20 Mar 2005 21:55:13 -0000 1.2 @@ -1,14 +1,19 @@ ---- SRC680_m83/sysui/desktop/util/makefile.mk.orig 2005-03-04 20:14:35.792442946 +0000 -+++ SRC680_m83/sysui/desktop/util/makefile.mk 2005-03-04 20:14:56.231350155 +0000 -@@ -79,11 +79,6 @@ - LINKFLAGS+=-z nodefs +Index: desktop/util/makefile.mk +=================================================================== +RCS file: /cvs/gsl/sysui/desktop/util/makefile.mk,v +retrieving revision 1.6 +diff -u -p -r1.6 makefile.mk +--- openoffice.org.orig/sysui/desktop/util/makefile.mk 21 Jan 2005 11:26:03 -0000 1.6 ++++ openoffice.org/sysui/desktop/util/makefile.mk 19 Mar 2005 10:04:38 -0000 +@@ -80,7 +80,10 @@ LINKFLAGS+=-z nodefs .ENDIF # "$(OS)" == "SOLARIS" --# Disable lazy binding of symbols + # Disable lazy binding of symbols -.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" --LINKFLAGS+=-z now --.ENDIF -- - .IF "$(OS)" == "LINUX" - # hack for faked SO environment - CFLAGS+=-gdwarf-2 ++.IF "$(OS)" == "LINUX" ++LINKFLAGS+=-Wl,-z,now ++.ENDIF ++.IF "$(OS)" == "SOLARIS" + LINKFLAGS+=-z now + .ENDIF + Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- openoffice.org.spec 18 Mar 2005 08:54:41 -0000 1.102 +++ openoffice.org.spec 20 Mar 2005 21:55:13 -0000 1.103 @@ -1,4 +1,4 @@ -%define ooo2ver 85 +%define ooo2ver 87 %define gccver 3.4.3 %define gcjver 4.0.0 %define _unpackaged_files_terminate_build 0 @@ -29,31 +29,29 @@ BuildRequires: libidn-devel, startup-notification-devel, libwpd-devel >= 0.8.0 BuildRequires: desktop-file-utils >= 0.9 -Patch0: workspace-gcj3.patch +Patch0: openoffice.org-1.9.80.NONE.skipuselessmodules.patch Patch1: workspace-systemmozilla.patch -Patch2: openoffice.org-1.9.69.directinstall.patch -Patch3: openoffice.org-1.9.71s1.noregisterwizard.patch -Patch4: openoffice.org-1.9.74.ArchiveZip.patch -Patch5: openoffice.org-1.9.74.ooo41875.mktemp.patch -Patch6: openoffice.org-1.9.75.ooo41904.singleton.patch -Patch7: openoffice.org-1.9.80.ooo43466.wmclass.patch -Patch8: openoffice.org-1.9.80.NONE.ignoremissing.patch -Patch9: workspace-gccfour.patch -Patch10: openoffice.org-1.9.81.NONE.scboost.patch -Patch11: openoffice.org-1.9.82.NONE.qadevOOogcj.patch -Patch12: openoffice.org-1.9.82.NONE.noznow.patch -Patch13: openoffice.org-1.9.83.ooo43995.wptypedetect.patch -Patch14: openoffice.org-1.9.83.ooo44377.icunotusingfpic.patch -Patch15: openoffice.org-1.9.84.NONE.wizards.patch -Patch16: openoffice.org-1.9.84.ooo44843.sdcasting.patch -Patch17: openoffice.org-1.9.84.ooo44846.svxcasting.patch -Patch18: openoffice.org-1.9.84.gcc20465.brokenparse.patch -Patch19: openoffice.org-1.9.84.NONE.dictionaries.contribdict.patch -Patch20: openoffice.org-1.9.84.NONE.lingucomponent.contribdict.patch -Patch21: openoffice.org-1.9.85.ooo45146.mandrakelicence.patch -Patch22: openoffice.org-1.9.84.ooo45162.svxcasting2.patch -Patch23: openoffice.org-1.9.85.ooo44853.rpmbuilddir.patch -Patch24: workspace-gcj4.patch +Patch2: openoffice.org-1.9.71s1.noregisterwizard.patch +Patch3: openoffice.org-1.9.74.ArchiveZip.patch +Patch4: openoffice.org-1.9.74.ooo41875.mktemp.patch +Patch5: openoffice.org-1.9.75.ooo41904.singleton.patch +Patch6: openoffice.org-1.9.80.ooo43466.wmclass.patch +Patch7: workspace-gccfour.patch +Patch8: openoffice.org-1.9.82.NONE.noznow.patch +Patch9: openoffice.org-1.9.83.ooo43995.wptypedetect.patch +Patch10: openoffice.org-1.9.84.ooo44843.sdcasting.patch +Patch11: openoffice.org-1.9.84.ooo44846.svxcasting.patch +Patch12: openoffice.org-1.9.84.gcc20465.brokenparse.patch +Patch13: openoffice.org-1.9.84.NONE.dictionaries.contribdict.patch +Patch14: openoffice.org-1.9.84.NONE.lingucomponent.contribdict.patch +Patch15: openoffice.org-1.9.85.ooo45146.mandrakelicence.patch +Patch16: openoffice.org-1.9.84.ooo45162.svxcasting2.patch +Patch17: workspace-gcj4.patch +Patch18: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch +Patch19: openoffice.org-1.9.87.gccXXXXX.bean.patch +Patch20: openoffice.org-1.9.87.NONE.wizards.broken.patch +Patch21: openoffice.org-1.9.87.warnnoterroronmissing.patch +Patch22: openoffice.org-1.9.87.NONE.sysui.parallel.patch %define instdir %{_libdir}/openoffice.org%{version} @@ -517,31 +515,29 @@ %prep %setup -q -n SRC680_m%{ooo2ver} -%patch0 -p1 -b .workspace-gcj3 +%patch0 -p1 -b .skipuselessmodules.patch %patch1 -p1 -b .workspace-systemmozilla -%patch2 -p1 -b .directinstall -%patch3 -p1 -b .noregisterwizard -%patch4 -p1 -b .ArchiveZip -%patch5 -p1 -b .mktemp -%patch6 -p1 -b .singleton -%patch7 -p1 -b .wmclass.patch -%patch8 -p1 -b .ignoremissing.patch -%patch9 -p1 -b .workspace-gccfour -%patch10 -p1 -b .scboost.patch -%patch11 -p1 -b .qadevOOogcj.patch -%patch12 -p1 -b .noznow.patch -%patch13 -p1 -b .wptypedetect.patch -%patch14 -p1 -b .icunotusingfpic.patch -%patch15 -p1 -b .wizards.patch -%patch16 -p1 -b .sdcasting.patch -%patch17 -p1 -b .svxcasting.patch -%patch18 -p1 -b .brokenparse.patch -%patch19 -p1 -b .dictionaries.contribdict.patch -%patch20 -p1 -b .lingucomponent.contribdict.patch -%patch21 -p1 -b .mandrakelicence.patch -%patch22 -p1 -b .svxcasting2.patch -%patch23 -p1 -b .rpmbuilddir.patch -%patch24 -p1 -b .workspace-gcj4.patch +%patch2 -p1 -b .noregisterwizard +%patch3 -p1 -b .ArchiveZip +%patch4 -p1 -b .mktemp +%patch5 -p1 -b .singleton +%patch6 -p1 -b .wmclass.patch +%patch7 -p1 -b .workspace-gccfour +%patch8 -p1 -b .noznow.patch +%patch9 -p1 -b .wptypedetect.patch +%patch10 -p1 -b .sdcasting.patch +%patch11 -p1 -b .svxcasting.patch +%patch12 -p1 -b .brokenparse.patch +%patch13 -p1 -b .dictionaries.contribdict.patch +%patch14 -p1 -b .lingucomponent.contribdict.patch +%patch15 -p1 -b .mandrakelicence.patch +%patch16 -p1 -b .svxcasting2.patch +%patch17 -p1 -b .workspace-gcj4.patch +%patch18 -p1 -b .usetwodotzeropath.patch +%patch19 -p1 -b .gccXXXXX.bean.patch +%patch20 -p1 -b .wizards.broken.patch +%patch21 -p1 -b .warnnoterroronmissing.patch +%patch22 -p1 -b .sysui.parallel.patch cd solenv/bin tar xvzf %{SOURCE2} Archive-Zip-1.13/lib cd ../.. @@ -551,15 +547,20 @@ echo build start time is `date` cd config_office autoconf -%configure --with-java=gij --disable-epm --with-simpleinstall=$RPM_BUILD_ROOT/%{instdir} --enable-libart --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-fonts %{withlang} +%configure --with-java=gij --disable-epm --enable-libart --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-system-sndfile --without-system-portaudio --without-fonts %{withlang} cd .. ./bootstrap source Linux*Env.Set.sh +#force linker export LINK=$CXX +#faster build export nodep=true -#export MAXPROCESS=1 -export BUILD_SPECIAL=1 +#export MAXPROCESS=2 +#dance of the seven veils to get unpackaged install +export RPM=rpmbuild export EPM=DUMMY +export PKGFORMAT="rpm -simple $RPM_BUILD_ROOT/%{instdir}" +export BUILD_SPECIAL=1 dmake echo build end time is `date` %if %{langpacks} @@ -2076,6 +2077,19 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Sat Mar 19 2005 Caolan McNamara 1:1.9.87-1 +- bump to latest version +- rh#151356# stick to 2.0 pathname to keep user settings during pre-release cycle +- drop integrated workspace-gcj3.patch +- drop integrated openoffice.org-1.9.83.ooo44377.icunotusingfpic.patch +- add openoffice.org-1.9.87.gccXXXXX.bean.patch to temporariy work around spurious gcj symbol +- drop unnecessary openoffice.org-1.9.82.NONE.qadevOOogcj.patch +- merge patches that skip boring modules +- scboost issue now part of gccfour workspace +- openoffice.org-1.9.87.NONE.wizards.broken.patch wizards build with gcj, but don't register +- reshuffle direct install to a simple warn not error on missing files, and hijack PKGFORMAT to + transport direct install flags + * Tue Mar 15 2005 Caolan McNamara 1:1.9.85-1 - bump to latest version - add the contrib non-core dictionaries, and allow them to be split up Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 20 Mar 2005 21:41:36 -0000 1.42 +++ sources 20 Mar 2005 21:55:13 -0000 1.43 @@ -1,3 +1,3 @@ c94a123e4006b410706a5b550f007e93 Archive-Zip-1.13.tar.gz -2828d37e2bf9c6943a991465c542f815 SRC680_m85.tar.bz2 ba84593fcd9afbf6ddd981cc205ea729 openoffice.org-myspell-contrib.tar.gz +3214ce92e01d5227d33e1e66816fd92a SRC680_m87.tar.bz2 workspace-gccfour.patch: SRC680_m80/config_office/configure.in | 6 autodoc/source/parser_i/idl/tk_keyw.cxx | 10 autodoc/source/parser_i/idl/tk_punct.cxx | 2 autodoc/source/parser_i/idoc/tk_atag2.cxx | 2 autodoc/source/parser_i/idoc/tk_xml.cxx | 6 configmgr/source/api2/apinodeaccess.hxx | 2 connectivity/source/drivers/file/FNumericFunctions.cxx | 1 cppu/inc/uno/lbnames.h | 2 desktop/source/deployment/registry/component/dp_component.cxx | 2 desktop/source/deployment/registry/inc/dp_backend.h | 2 forms/source/component/refvaluecomponent.hxx | 2 hwpfilter/source/drawdef.h | 2 hwpfilter/source/hbox.h | 6 inc/Outliner.hxx | 0 inc/lnkbase.hxx | 0 inc/tabdlg.hxx | 0 inc/uno/lbnames.h | 0 libxmlsec/xmlsec1-1.2.6.patch | 210 +++++----- sc/source/ui/view/makefile.mk | 3 sd/inc/Outliner.hxx | 2 sfx2/inc/lnkbase.hxx | 2 sfx2/inc/tabdlg.hxx | 2 so3/inc/lnkbase.hxx | 2 source/api2/apinodeaccess.hxx | 0 source/component/refvaluecomponent.hxx | 0 source/deployment/registry/component/dp_component.cxx | 0 source/deployment/registry/inc/dp_backend.h | 0 source/drawdef.h | 0 source/drivers/file/FNumericFunctions.cxx | 0 source/filter/basflt/fltini.cxx | 0 source/hbox.h | 0 source/invocation/invocation.cxx | 0 source/parser_i/idl/tk_keyw.cxx | 0 source/parser_i/idl/tk_punct.cxx | 0 source/parser_i/idoc/tk_atag2.cxx | 0 source/parser_i/idoc/tk_xml.cxx | 0 source/security/access_controller.cxx | 0 source/ui/dbui/dbinsdlg.cxx | 0 source/ui/inc/wrtsh.hxx | 0 source/ui/view/makefile.mk | 0 stlport/STLport-4.5.patch | 1 stoc/source/invocation/invocation.cxx | 2 stoc/source/security/access_controller.cxx | 2 sw/source/filter/basflt/fltini.cxx | 5 sw/source/ui/dbui/dbinsdlg.cxx | 2 sw/source/ui/inc/wrtsh.hxx | 2 46 files changed, 140 insertions(+), 140 deletions(-) Index: workspace-gccfour.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace-gccfour.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workspace-gccfour.patch 7 Mar 2005 19:58:16 -0000 1.2 +++ workspace-gccfour.patch 20 Mar 2005 21:55:13 -0000 1.3 @@ -166,14 +166,9 @@ { PICTYPE_FILE, PICTYPE_OLE, PICTYPE_EMBED, PICTYPE_DRAW, PICTYPE_UNKNOWN -Index: xmlsec1-1.2.4.patch -=================================================================== -RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v -retrieving revision 1.11 -diff -u -p -r1.11 xmlsec1-1.2.4.patch ---- openoffice.org.orig/libxmlsec/xmlsec1-1.2.4.patch 16 Nov 2004 10:29:29 -0000 1.11 -+++ openoffice.org/libxmlsec/xmlsec1-1.2.4.patch 15 Feb 2005 11:22:23 -0000 -@@ -7839,111 +7839,6 @@ +--- SRC680_m87.orig/libxmlsec/xmlsec1-1.2.6.patch 2005-03-18 16:07:21.000000000 +0000 ++++ SRC680_m87/libxmlsec/xmlsec1-1.2.6.patch 2005-03-18 16:28:53.000000000 +0000 +@@ -7782,111 +7782,6 @@ ! return(0); ! } ! @@ -285,7 +280,7 @@ ! static int ! xmlSecNssKWDes3BufferReverse(xmlSecByte *buf, xmlSecSize size) { ! xmlSecSize s; -@@ -8398,6 +8293,111 @@ +@@ -8341,6 +8236,111 @@ ! return 0 ; ! } ! @@ -642,3 +637,20 @@ Tok_XmlFormat_Tag::EV_TokenId::Values_() { return G_aTok_XmlFormat_Tag_EV_TokenId_Values; } } // namespace lux +Index: source/ui/view/makefile.mk +=================================================================== +RCS file: /cvs/sc/sc/source/ui/view/makefile.mk,v +retrieving revision 1.12 +diff -u -p -r1.12 makefile.mk +--- openoffice.org.orig/sc/source/ui/view/makefile.mk 15 Mar 2005 11:43:43 -0000 1.12 ++++ openoffice.org/sc/source/ui/view/makefile.mk 18 Mar 2005 13:39:32 -0000 +@@ -187,7 +187,8 @@ EXCEPTIONSFILES= \ + $(SLO)$/tabvwshb.obj \ + $(SLO)$/viewdata.obj \ + $(SLO)$/viewfun5.obj \ +- $(SLO)$/viewfun7.obj ++ $(SLO)$/viewfun7.obj \ ++ $(SLO)$/scextopt.obj + + # goal seek -O2 + workspace-systemmozilla.patch: config_office/configure.in | 66 +++++--------- config_office/set_soenv.in | 19 ++-- connectivity/source/drivers/mozab/bootstrap/makefile.mk | 2 connectivity/source/drivers/mozab/makefile.mk | 4 connectivity/source/drivers/mozab/mozillasrc/makefile.mk | 4 extensions/source/config/ldap/makefile.mk | 12 -- extensions/source/plugin/base/makefile.mk | 5 - extensions/source/plugin/unx/makefile.mk | 5 - extensions/source/plugin/util/makefile.mk | 2 libxmlsec/makefile.mk | 19 +++- libxmlsec/prj/build.lst | 2 moz/zipped/makefile.mk | 2 openoffice.org/xmlsecurity/source/xmlsec/nss/nssrenam.h | 49 ++++++++++ scp2/source/ooo/file_library_ooo.scp | 4 scp2/source/ooo/file_ooo.scp | 4 scp2/source/ooo/makefile.mk | 8 - source/drivers/mozab/bootstrap/makefile.mk | 0 xmlsecurity/source/xmlsec/nss/makefile.mk | 14 ++ xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 3 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx | 3 20 files changed, 144 insertions(+), 83 deletions(-) Index: workspace-systemmozilla.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace-systemmozilla.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workspace-systemmozilla.patch 3 Mar 2005 08:09:11 -0000 1.2 +++ workspace-systemmozilla.patch 20 Mar 2005 21:55:13 -0000 1.3 @@ -236,54 +236,57 @@ Index: makefile.mk =================================================================== RCS file: /cvs/external/libxmlsec/makefile.mk,v -retrieving revision 1.1.1.1 -retrieving revision 1.1.1.1.12.1 -diff -u -p -r1.1.1.1 -r1.1.1.1.12.1 ---- openoffice.org.orig/libxmlsec/makefile.mk 12 Jul 2004 12:05:16 -0000 1.1.1.1 -+++ openoffice.org/libxmlsec/makefile.mk 6 Jan 2005 18:58:34 -0000 1.1.1.1.12.1 -@@ -103,6 +103,7 @@ CRYPTOLIB=nss - - .IF "$(CRYPTOLIB)" == "nss" +retrieving revision 1.2 +retrieving revision 1.1.1.1.12.5 +diff -u -p -r1.2 -r1.1.1.1.12.5 +--- openoffice.org.orig/libxmlsec/makefile.mk 10 Mar 2005 17:48:13 -0000 1.2 ++++ openoffice.org/libxmlsec/makefile.mk 12 Mar 2005 17:58:33 -0000 1.1.1.1.12.5 +@@ -69,6 +69,11 @@ TARGET=so_xmlsec1 + + .INCLUDE : settings.mk + ++.IF "$(WITH_MOZILLA)" == "NO" ++ at all: ++ @echo "Mozilla disabled -> no nss -> no libxmlsec...." ++.ENDIF ++ + # --- Files -------------------------------------------------------- + XMLSEC1VERSION=1.2.6 +@@ -106,7 +111,19 @@ BUILD_DIR=$(CONFIGURE_DIR) + .ELSE + CONFIGURE_DIR= + CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure +-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --enable-pkgconfig=no ++CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no ++# system-mozilla needs pkgconfig to get the information about nss ++# FIXME: This also will enable pkg-config usage for libxml2. It *seems* ++# that the internal headers still are used when they are there but.... ++# (and that pkg-config is allowed to fail...) ++# I have no real good idea how to get mozilla (nss) pkg-config'ed and libxml2 ++# not... We need mozilla-nss pkg-config'ed since we can *not* just use ++# --with-nss or parse -pkg-config --libs / cflags mozilla-nss since ++# the lib may a) be in /usr/lib (Debian) and be not in $with_nss/include ++# $with_nss/lib. +.IF "$(SYSTEM_MOZILLA)" != "YES" - MOZ_INC:=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla - MOZ_LIB:=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) - NSS_INC:=$(MOZ_INC)$/nss -@@ -112,6 +113,12 @@ SOLARINC += \ - -I$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla \ - -I$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla/nspr \ - -I$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla/nss -+.ELSE -+# Rest already defined from environment -+NSS_INC:=$(MOZ_NSS_CFLAGS) -+NSPR_INC:=$(MOZ_INC)/nspr -+SOLARINC += $(MOZ_NSS_CFLAGS) -I$(NSPR_INC) ++CONFIGURE_FLAGS+=--enable-pkgconfig=no +.ENDIF - - .EXPORT : SOLARINC - ---- openoffice.org.orig/libxmlsec/xmlsec1-1.2.4.patch 2005-01-27 11:50:48.142864459 +0000 -+++ openoffice.org/libxmlsec/xmlsec1-1.2.4.patch 2005-01-27 11:50:40.916950528 +0000 -@@ -781,7 +781,7 @@ - *************** - *** 1 **** - ! dummy ----- 1,137 ---- -+--- 1,141 ---- - ! #************************************************************************* - ! # - ! # $RCSfile$ -@@ -866,6 +866,10 @@ - ! CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) - ! .ENDIF - ! -+! .IF "$(SYSTEM_MOZILLA)" == "YES" -+! CFLAGS+=$(MOZ_NSS_CFLAGS) -+! .ENDIF -+! - ! SLOFILES= \ - ! $(SLO)$/app.obj \ - ! $(SLO)$/base64.obj \ + BUILD_ACTION=$(GNUMAKE) + BUILD_DIR=$(CONFIGURE_DIR) + .ENDIF +Index: prj/build.lst +=================================================================== +RCS file: /cvs/external/libxmlsec/prj/build.lst,v +retrieving revision 1.7 +retrieving revision 1.6.2.2 +diff -u -p -r1.7 -r1.6.2.2 +--- openoffice.org.orig/libxmlsec/prj/build.lst 17 Feb 2005 16:07:26 -0000 1.7 ++++ openoffice.org/libxmlsec/prj/build.lst 25 Feb 2005 04:06:09 -0000 1.6.2.2 +@@ -1,3 +1,3 @@ +-ls libxmlsec : LIBXML2:libxml2 MOZ:moz sal NULL ++ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz sal NULL + ls libxmlsec usr1 - all ls_mkout NULL + ls libxmlsec nmake - all ls_xmlsec1 NULL Index: source/config/ldap/makefile.mk =================================================================== RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v --- openoffice.org-1.9.69.directinstall.patch DELETED --- --- openoffice.org-1.9.80.NONE.ignoremissing.patch DELETED --- --- openoffice.org-1.9.81.NONE.scboost.patch DELETED --- --- openoffice.org-1.9.82.NONE.qadevOOogcj.patch DELETED --- --- openoffice.org-1.9.83.ooo44377.icunotusingfpic.patch DELETED --- --- openoffice.org-1.9.84.NONE.wizards.patch DELETED --- --- openoffice.org-1.9.85.ooo44853.rpmbuilddir.patch DELETED --- --- workspace-gcj3.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 20 21:59:13 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 16:59:13 -0500 Subject: rpms/openoffice.org/devel openoffice.org-1.9.80.NONE.skipuselessmodules.patch, NONE, 1.1 Message-ID: <200503202159.j2KLxDGs022369@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22355 Added Files: openoffice.org-1.9.80.NONE.skipuselessmodules.patch Log Message: bump to next version openoffice.org-1.9.80.NONE.skipuselessmodules.patch: SRC680_m84/wizards/prj/build.lst | 2 +- postprocess/prj/build.lst | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE openoffice.org-1.9.80.NONE.skipuselessmodules.patch --- --- SRC680_m85.orig/postprocess/prj/build.lst 2005-03-11 12:06:05.000000000 +0000 +++ SRC680_m85/postprocess/prj/build.lst 2005-03-16 21:40:54.000000000 +0000 @@ -1,5 +1,4 @@ -po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MathMLDTD msfontextract odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml unzip wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL +po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MathMLDTD msfontextract SO:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml unzip wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL po postprocess usr1 - all po_mkout NULL -po postprocess\checkxml nmake - all po_checkxml NULL -po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL +po postprocess\packconfig nmake - all po_packconfig NULL po postprocess\rebase nmake - w po_rebase NULL --- SRC680_m84/wizards/prj/build.lst.orig 2005-03-11 11:21:32.000000000 +0000 +++ SRC680_m84/wizards/prj/build.lst 2005-03-11 11:21:47.000000000 +0000 @@ -1,4 +1,4 @@ -wz wizards : rsc javaunohelper jut unoil qadevOOo xalan transex3 NULL +wz wizards : rsc javaunohelper jut unoil SO:qadevOOo xalan transex3 NULL wz wizards\util nmake - all wz_util NULL wz wizards\source\config nmake - all wz_config NULL wz wizards\source\euro nmake - all wz_eurowiz NULL From fedora-cvs-commits at redhat.com Sun Mar 20 22:29:12 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 17:29:12 -0500 Subject: rpms/xfce4-systray/FC-3 xfce4-systray.spec,1.4,1.5 Message-ID: <200503202229.j2KMTCIJ004243@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfce4-systray/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv4230 Modified Files: xfce4-systray.spec Log Message: needs xfce4-panel-devel Index: xfce4-systray.spec =================================================================== RCS file: /cvs/dist/rpms/xfce4-systray/FC-3/xfce4-systray.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xfce4-systray.spec 20 Mar 2005 21:11:51 -0000 1.4 +++ xfce4-systray.spec 20 Mar 2005 22:29:10 -0000 1.5 @@ -8,7 +8,7 @@ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root Requires: xfce4-panel >= %{version} -BuildRequires: xfce4-panel >= %{version} +BuildRequires: xfce4-panel-devel >= %{version} BuildRequires: libxml2-devel BuildRequires: libxfcegui4-devel BuildRequires: startup-notification-devel From fedora-cvs-commits at redhat.com Sun Mar 20 22:40:19 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 17:40:19 -0500 Subject: rpms/xfdesktop/FC-3 xfdesktop.spec,1.7,1.8 Message-ID: <200503202240.j2KMeJjM004402@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfdesktop/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv4389 Modified Files: xfdesktop.spec Log Message: BuildRequires: xfce4-panel-devel >= %{version} Index: xfdesktop.spec =================================================================== RCS file: /cvs/dist/rpms/xfdesktop/FC-3/xfdesktop.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xfdesktop.spec 20 Mar 2005 21:06:54 -0000 1.7 +++ xfdesktop.spec 20 Mar 2005 22:40:17 -0000 1.8 @@ -18,6 +18,7 @@ Requires: desktop-backgrounds-basic BuildRequires: libxfce4mcs-devel >= %{version} BuildRequires: libxfcegui4-devel >= %{version} +BuildRequires: xfce4-panel-devel >= %{version} BuildRequires: libxml2-devel BuildRequires: xfce-mcs-manager-devel From fedora-cvs-commits at redhat.com Sun Mar 20 22:44:30 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 17:44:30 -0500 Subject: rpms/xffm/FC-3 xffm-4.2.0-menu.patch, NONE, 1.1 xffm-4.2.0-rpath.patch, NONE, 1.1 xffm-4.2.1-static.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xffm.spec, 1.6, 1.7 xffm-4.0.5-gcc34.patch, 1.1, NONE xffm-4.0.5-rpath.patch, 1.1, NONE Message-ID: <200503202244.j2KMiUri004546@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xffm/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv4519/FC-3 Modified Files: .cvsignore sources xffm.spec Added Files: xffm-4.2.0-menu.patch xffm-4.2.0-rpath.patch xffm-4.2.1-static.patch Removed Files: xffm-4.0.5-gcc34.patch xffm-4.0.5-rpath.patch Log Message: auto-import xffm-4.2.1-2.FC3 on branch FC-3 from xffm-4.2.1-2.FC3.src.rpm xffm-4.2.0-menu.patch: Xfdiff.desktop | 1 + Xffstab.desktop | 1 + Xftree.desktop | 1 + 3 files changed, 3 insertions(+) --- NEW FILE xffm-4.2.0-menu.patch --- --- xffm-4.2.0/src/Xffstab.desktop.orig 2005-02-21 12:09:22.065891551 +0100 +++ xffm-4.2.0/src/Xffstab.desktop 2005-02-21 12:09:37.992253979 +0100 @@ -15,3 +15,4 @@ Categories=X-XFCE;Core;Filemanager;Utility;System GenericName=Fstab mount manager GenericName[ko]=Fstab ????????? ????????? +OnlyShowIn=XFCE; --- xffm-4.2.0/src/Xftree.desktop.orig 2005-02-21 12:08:46.142840482 +0100 +++ xffm-4.2.0/src/Xftree.desktop 2005-02-21 12:09:04.912732203 +0100 @@ -117,3 +117,4 @@ Terminal=false Type=Application Categories=Applications;X-XFCE;Core +OnlyShowIn=XFCE; --- xffm-4.2.0/src/Xfdiff.desktop.orig 2005-02-21 12:10:00.011607212 +0100 +++ xffm-4.2.0/src/Xfdiff.desktop 2005-02-21 12:10:17.853652159 +0100 @@ -11,3 +11,4 @@ Terminal=false Type=Application Categories=X-XFCE;Core;Utility +OnlyShowIn=XFCE; xffm-4.2.0-rpath.patch: configure | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xffm-4.2.0-rpath.patch --- --- xffm-4.2.0/configure.orig 2005-01-09 13:54:20.000000000 +0100 +++ xffm-4.2.0/configure 2005-01-28 14:12:56.000000000 +0100 @@ -38678,7 +38678,7 @@ echo "$as_me:$LINENO: checking DBH_LIBS" >&5 echo $ECHO_N "checking DBH_LIBS... $ECHO_C" >&6 - DBH_LIBS=`$PKG_CONFIG --libs "dbh-1.0 >= 1.0"` + DBH_LIBS=`$PKG_CONFIG --libs-only-l "dbh-1.0 >= 1.0"` echo "$as_me:$LINENO: result: $DBH_LIBS" >&5 echo "${ECHO_T}$DBH_LIBS" >&6 else xffm-4.2.1-static.patch: callbacks.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xffm-4.2.1-static.patch --- diff -Nur xffm-4.2.1.orig/libs/callbacks.c xffm-4.2.1/libs/callbacks.c --- xffm-4.2.1.orig/libs/callbacks.c 2004-12-29 14:51:17.000000000 -0700 +++ xffm-4.2.1/libs/callbacks.c 2005-03-20 13:52:51.937643998 -0700 @@ -665,7 +665,7 @@ skip_second_release = FALSE; for (tree_id=0; tree_idtreestuff[tree_id].treeview,treeview);*/ if (treeview != tree_details->treestuff[tree_id].treeview){ /* unselect all in auxiliary treeview */ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xffm/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 14:45:35 -0000 1.4 +++ .cvsignore 20 Mar 2005 22:44:27 -0000 1.5 @@ -1 +1 @@ -xffm-4.0.6.tar.gz +xffm-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xffm/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 14:45:35 -0000 1.4 +++ sources 20 Mar 2005 22:44:27 -0000 1.5 @@ -1 +1 @@ -6a48c74f4bc02033299769badb49182a xffm-4.0.6.tar.gz +543aba5286949b660bd0b9eaa0e0a515 xffm-4.2.1.tar.bz2 Index: xffm.spec =================================================================== RCS file: /cvs/dist/rpms/xffm/FC-3/xffm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xffm.spec 9 Sep 2004 14:45:35 -0000 1.6 +++ xffm.spec 20 Mar 2005 22:44:27 -0000 1.7 @@ -1,43 +1,40 @@ -Summary: Next generation filemanager and SMB network navigator for XFce4 +Summary: Next generation filemanager and SMB network navigator for Xfce4 Name: xffm -Version: 4.0.6 -Release: 1 +Version: 4.2.1 +Release: 2.FC3 License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.1/src/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2 -Patch1: xffm-4.0.5-gcc34.patch -Patch2: xffm-4.0.5-rpath.patch +Patch0: xffm-4.2.0-rpath.patch +Patch1: xffm-4.2.0-menu.patch +Patch2: xffm-4.2.1-static.patch Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Prereq: /sbin/ldconfig -Requires: dbh >= 1.0 -Requires: glib2 >= 2.0.0 -Requires: gtk2 >= 2.0.0 -Requires: libxfce4mcs >= 4.0.5 -Requires: libxfce4util >= 4.0.5 -Requires: libxfcegui4 >= 4.0.5 +Requires: libxfce4mcs >= %{version} +Requires: libxfce4util >= %{version} +Requires: libxfcegui4 >= %{version} Requires: libxml2 >= 2.4.0 -BuildRequires: dbh-devel >= 1.0 -BuildRequires: glib2-devel >= 2.0.0 -BuildRequires: gtk2-devel >= 2.0.0 -BuildRequires: libxfce4mcs-devel >= 4.0.5 -BuildRequires: libxfce4util-devel >= 4.0.5 -BuildRequires: libxfcegui4-devel >= 4.0.5 +BuildRequires: dbh-devel +BuildRequires: gtk2-devel +BuildRequires: libxfce4mcs-devel >= %{version} +BuildRequires: libxfce4util-devel >= %{version} +BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: libxml2-devel >= 2.4.0 -BuildRequires: xfce-mcs-manager-devel >= 4.0.5 +BuildRequires: xfce-mcs-manager-devel >= %{version} %description -This package includes a filemanager and SMB network navigator for XFce4. +This package includes a filemanager and SMB network navigator for Xfce4. %prep %setup -q - -%patch1 -p1 -b .gcc -%patch2 -p1 -b .rpath +%patch0 -p1 -b .rpath +%patch1 -p1 -b .menu +%patch2 -p1 -b .static %build %configure @@ -59,17 +56,32 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc README TODO ChangeLog NEWS INSTALL COPYING AUTHORS +%doc README TODO ChangeLog NEWS COPYING AUTHORS %{_bindir}/* %{_libdir}/lib* %{_libdir}/pkgconfig/* %{_libdir}/xfce4/mcs-plugins/* +%{_libdir}/xfce4/xffm/* %{_datadir}/xffm %{_datadir}/xfce4/* +%{_datadir}/applications/* +%{_datadir}/icons/hicolor/*/*/* %{_mandir}/man?/* %changelog -* Tue Jul 20 2004 Than Ngo 4.0.6-1 +* Sun Mar 20 2005 Warren Togami - 4.2.1-2 +- remove stuff + +* Sun Mar 20 2005 Kevin Fenzi - 4.2.1-1 +- Fixed case of Xfce +- Fixed Source0 line +- Reimported 4.2.0 spec from core cvs +- Added patch to remove static call that was breaking compile on devel. + +* Mon Feb 21 2005 Than Ngo 4.2.0-2 +- cleanup menu + +* Fri Jan 28 2005 Than Ngo 4.2.0-1 - update to 4.0.6 * Thu Jun 17 2004 Than Ngo 4.0.5-4 --- xffm-4.0.5-gcc34.patch DELETED --- --- xffm-4.0.5-rpath.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 20 22:48:42 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 17:48:42 -0500 Subject: rpms/xfprint/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xfprint.spec, 1.2, 1.3 Message-ID: <200503202248.j2KMmgEA007805@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfprint/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv7783/FC-3 Modified Files: .cvsignore sources xfprint.spec Log Message: auto-import xfprint-4.2.1-1.FC3 on branch FC-3 from xfprint-4.2.1-1.FC3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfprint/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Sep 2004 14:44:39 -0000 1.2 +++ .cvsignore 20 Mar 2005 22:48:40 -0000 1.3 @@ -1 +1 @@ -xfprint-4.0.6.tar.gz +xfprint-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfprint/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 14:44:39 -0000 1.2 +++ sources 20 Mar 2005 22:48:40 -0000 1.3 @@ -1 +1 @@ -3ab525472bab3eb87146d808d3c17df1 xfprint-4.0.6.tar.gz +15922d7e3840ad06144d7e210621ffee xfprint-4.2.1.tar.bz2 Index: xfprint.spec =================================================================== RCS file: /cvs/dist/rpms/xfprint/FC-3/xfprint.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xfprint.spec 9 Sep 2004 14:44:58 -0000 1.2 +++ xfprint.spec 20 Mar 2005 22:48:40 -0000 1.3 @@ -1,29 +1,30 @@ -Summary: Print dialog and printer manager for XFce 4 +Summary: Print dialog and printer manager for Xfce 4 Name: xfprint -Version: 4.0.6 -Release: 2 +Version: 4.2.1 +Release: 1.FC3 License: BSD URL: http://www.xfce.org -Source0: http://www.xfce.org/archive/xfce-4.0.6/src/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfprint-4.2.1.tar.bz2 Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Prereq: /sbin/ldconfig -Requires: glib2 >= 2.0.6 -Requires: libxfcegui4 >= 4.0.0 +Requires: libxfcegui4 >= %{version} Requires: a2ps -BuildRequires: glib2-devel >= 2.0.6 -BuildRequires: libxfcegui4-devel >= 4.0.0 +BuildRequires: glib2-devel +BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: a2ps +BuildRequires: cups-devel %description xfprint contains a print dialog and a printer manager for the -XFce 4 Desktop Environment +Xfce 4 Desktop Environment %prep %setup -q %build %configure + make %{?_smp_mflags} %install @@ -46,9 +47,20 @@ %defattr(-,root,root) %doc README ChangeLog NEWS COPYING AUTHORS NOTES %{_bindir}/* -%{_libdir}/libxfprint.* +%{_libdir}/xfce4/mcs-plugins +%{_libdir}/xfce4/xfprint-plugins +%{_datadir}/applications/* +%{_datadir}/xfce4/doc/C +%{_datadir}/icons/hicolor/*/*/* %changelog +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version +- Fixed case of Xfce + +* Fri Jan 28 2005 Than Ngo 4.2.0-1 +- 4.2.0 + * Wed Sep 01 2004 Than Ngo 4.0.6-2 - get rid of useless static library - add missing ldconfig From fedora-cvs-commits at redhat.com Sun Mar 20 22:53:34 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 17:53:34 -0500 Subject: rpms/xfwm4/FC-3 xfwm4-bluecurve-prep.patch, NONE, 1.1 xfwm4-bluecurve.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfwm4.spec, 1.5, 1.6 xfwm4-fedora.patch, 1.2, NONE Message-ID: <200503202253.j2KMrYIS007925@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfwm4/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv7900/FC-3 Modified Files: .cvsignore sources xfwm4.spec Added Files: xfwm4-bluecurve-prep.patch xfwm4-bluecurve.patch Removed Files: xfwm4-fedora.patch Log Message: auto-import xfwm4-4.2.1-2.FC3 on branch FC-3 from xfwm4-4.2.1-2.FC3.src.rpm xfwm4-bluecurve-prep.patch: configure | 3 ++- configure.ac | 1 + mcs-plugin/xfwm4_plugin.h | 2 +- themes/Makefile.am | 3 ++- themes/Makefile.in | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) --- NEW FILE xfwm4-bluecurve-prep.patch --- diff -Nur xfwm4-4.2.1.orig/configure xfwm4-4.2.1/configure --- xfwm4-4.2.1.orig/configure 2005-03-12 07:19:39.000000000 -0700 +++ xfwm4-4.2.1/configure 2005-03-20 15:00:33.492532918 -0700 @@ -25253,7 +25253,7 @@ fi - ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile defaults/Makefile icons/Makefile icons/48x48/Makefile icons/scalable/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/symphony/Makefile themes/tyrex/Makefile themes/therapy/Makefile themes/waza/Makefile themes/wildbush/Makefile" + ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile defaults/Makefile icons/Makefile icons/48x48/Makefile icons/scalable/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/bluecurve/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/symphony/Makefile themes/tyrex/Makefile themes/therapy/Makefile themes/waza/Makefile themes/wildbush/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -25854,6 +25854,7 @@ "themes/therapy/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/therapy/Makefile" ;; "themes/waza/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/waza/Makefile" ;; "themes/wildbush/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/wildbush/Makefile" ;; + "themes/bluecurve/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/bluecurve/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; diff -Nur xfwm4-4.2.1.orig/configure.ac xfwm4-4.2.1/configure.ac --- xfwm4-4.2.1.orig/configure.ac 2005-03-12 07:19:39.000000000 -0700 +++ xfwm4-4.2.1/configure.ac 2005-03-20 15:00:45.731640166 -0700 @@ -125,4 +125,5 @@ themes/therapy/Makefile themes/waza/Makefile themes/wildbush/Makefile +themes/bluecurve/Makefile ]) diff -Nur xfwm4-4.2.1.orig/mcs-plugin/xfwm4_plugin.h xfwm4-4.2.1/mcs-plugin/xfwm4_plugin.h --- xfwm4-4.2.1.orig/mcs-plugin/xfwm4_plugin.h 2004-12-18 16:32:07.000000000 -0700 +++ xfwm4-4.2.1/mcs-plugin/xfwm4_plugin.h 2005-03-20 15:02:32.162180902 -0700 @@ -29,7 +29,7 @@ #define CHANNEL2 "xfwm4_keys" #define PLUGIN_NAME "xfwm4" -#define DEFAULT_THEME "Default" +#define DEFAULT_THEME "Bluecurve" #define DEFAULT_KEY_THEME "Default" #define DEFAULT_LAYOUT "OTS|HMC" #define DEFAULT_ACTION "maximize" diff -Nur xfwm4-4.2.1.orig/themes/Makefile.am xfwm4-4.2.1/themes/Makefile.am --- xfwm4-4.2.1.orig/themes/Makefile.am 2005-01-13 12:56:07.000000000 -0700 +++ xfwm4-4.2.1/themes/Makefile.am 2005-03-20 15:03:03.076400082 -0700 @@ -10,4 +10,5 @@ therapy \ tyrex \ waza \ - wildbush + wildbush \ + bluecurve diff -Nur xfwm4-4.2.1.orig/themes/Makefile.in xfwm4-4.2.1/themes/Makefile.in --- xfwm4-4.2.1.orig/themes/Makefile.in 2005-01-13 12:56:07.000000000 -0700 +++ xfwm4-4.2.1/themes/Makefile.in 2005-03-20 15:04:02.131267369 -0700 @@ -226,7 +226,8 @@ therapy \ tyrex \ waza \ - wildbush + wildbush \ + bluecurve all: all-recursive xfwm4-bluecurve.patch: Makefile.am | 43 ++++ Makefile.in | 424 ++++++++++++++++++++++++++++++++++++++++++ README | 7 bottom-active.xpm | 11 + bottom-inactive.xpm | 11 + bottom-left-active.xpm | 24 ++ bottom-left-inactive.xpm | 24 ++ bottom-right-active.xpm | 24 ++ bottom-right-inactive.xpm | 24 ++ close-active.xpm | 48 ++++ close-inactive.xpm | 28 ++ close-pressed.xpm | 27 ++ hide-active.xpm | 47 ++++ hide-inactive.xpm | 28 ++ hide-pressed.xpm | 26 ++ left-active.xpm | 10 left-inactive.xpm | 10 maximize-active.xpm | 48 ++++ maximize-inactive.xpm | 28 ++ maximize-pressed.xpm | 27 ++ maximize-toggled-active.xpm | 54 +++++ maximize-toggled-inactive.xpm | 29 ++ maximize-toggled-pressed.xpm | 33 +++ menu-active.xpm | 46 ++++ menu-inactive.xpm | 28 ++ menu-pressed.xpm | 25 ++ right-active.xpm | 10 right-inactive.xpm | 10 themerc | 11 + title-1-active.xpm | 33 +++ title-1-inactive.xpm | 35 +++ title-2-active.xpm | 34 +++ title-2-inactive.xpm | 35 +++ title-3-active.xpm | 81 ++++++++ title-3-inactive.xpm | 35 +++ title-4-active.xpm | 34 +++ title-4-inactive.xpm | 35 +++ title-5-active.xpm | 33 +++ title-5-inactive.xpm | 35 +++ top-left-active.xpm | 38 +++ top-left-inactive.xpm | 41 ++++ top-right-active.xpm | 38 +++ top-right-inactive.xpm | 41 ++++ 43 files changed, 1713 insertions(+) --- NEW FILE xfwm4-bluecurve.patch --- diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.am xfwm4-4.0.5/themes/bluecurve/Makefile.am --- xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/Makefile.am 2004-04-19 23:25:30.000000000 +0200 @@ -0,0 +1,43 @@ +themedir = $(pkgdatadir)/themes/Bluecurve +theme_DATA = README \ + bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + maximize-toggled-active.xpm \ + maximize-toggled-inactive.xpm \ + maximize-toggled-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm +EXTRA_DIST = $(theme_DATA) diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.in xfwm4-4.0.5/themes/bluecurve/Makefile.in --- xfwm4-4.0.5.orig2/themes/bluecurve/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/Makefile.in 2004-04-19 23:30:58.000000000 +0200 @@ -0,0 +1,424 @@ +# Makefile.in generated by automake 1.8.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + at SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +subdir = themes/bluecurve +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \ + $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \ + $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(themedir) +themeDATA_INSTALL = $(INSTALL_DATA) +DATA = $(theme_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@ +LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@ +LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@ +LIBTOOL = @LIBTOOL@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ +LIBXFCE4MCS_CLIENT_CFLAGS = @LIBXFCE4MCS_CLIENT_CFLAGS@ +LIBXFCE4MCS_CLIENT_LIBS = @LIBXFCE4MCS_CLIENT_LIBS@ +LIBXFCE4MCS_CLIENT_REQUIRED_VERSION = @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@ +LIBXFCE4MCS_MANAGER_CFLAGS = @LIBXFCE4MCS_MANAGER_CFLAGS@ +LIBXFCE4MCS_MANAGER_LIBS = @LIBXFCE4MCS_MANAGER_LIBS@ +LIBXFCE4MCS_MANAGER_REQUIRED_VERSION = @LIBXFCE4MCS_MANAGER_REQUIRED_VERSION@ +LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ +LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ +LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ +LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@ +LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@ +LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@ +LIBXPM_CFLAGS = @LIBXPM_CFLAGS@ +LIBXPM_LDFLAGS = @LIBXPM_LDFLAGS@ +LIBXPM_LIBS = @LIBXPM_LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANDR_LIBS = @RANDR_LIBS@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XFCE_MCS_MANAGER_CFLAGS = @XFCE_MCS_MANAGER_CFLAGS@ +XFCE_MCS_MANAGER_LIBS = @XFCE_MCS_MANAGER_LIBS@ +XFCE_MCS_MANAGER_PLUGINSDIR = @XFCE_MCS_MANAGER_PLUGINSDIR@ +XFCE_MCS_MANAGER_REQUIRED_VERSION = @XFCE_MCS_MANAGER_REQUIRED_VERSION@ +XGETTEXT = @XGETTEXT@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +themedir = $(pkgdatadir)/themes/Bluecurve +theme_DATA = README \ + bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + maximize-toggled-active.xpm \ + maximize-toggled-inactive.xpm \ + maximize-toggled-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm + +EXTRA_DIST = $(theme_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign themes/bluecurve/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign themes/bluecurve/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-themeDATA: $(theme_DATA) + @$(NORMAL_INSTALL) + $(mkdir_p) $(DESTDIR)$(themedir) + @list='$(theme_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \ + $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \ + done + +uninstall-themeDATA: + @$(NORMAL_UNINSTALL) + @list='$(theme_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(themedir)/$$f"; \ + rm -f $(DESTDIR)$(themedir)/$$f; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + $(mkdir_p) $(DESTDIR)$(themedir) +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-themeDATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-themeDATA + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + install-themeDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-info-am uninstall-themeDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/README xfwm4-4.0.5/themes/bluecurve/README --- xfwm4-4.0.5.orig2/themes/bluecurve/README 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/README 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,7 @@ +Bluecurve +--------- + +Garrett LeSage Havoc Pennington +(c) 2002 Red Hat Inc. +May 29, 2002 +Red Hat Linux default theme diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-active.xpm xfwm4-4.0.5/themes/bluecurve/bottom-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/bottom-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,11 @@ +/* XPM */ +static char * bottom_active_xpm[] = { +"4 5 3 1", +" c None", +"+ c #000000", +". c #e6e6e6 s active_color_2", +"....", +"....", +"....", +"....", +"++++"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-inactive.xpm xfwm4-4.0.5/themes/bluecurve/bottom-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/bottom-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,11 @@ +/* XPM */ +static char * bottom_inactive_xpm[] = { +"4 5 3 1", +" c None", +"+ c #000000", +". c #e6e6e6 s inactive_color_2", +"....", +"....", +"....", +"....", +"++++"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-active.xpm xfwm4-4.0.5/themes/bluecurve/bottom-left-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/bottom-left-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,24 @@ +/* XPM */ +static char * bottom_left_active_xpm[] = { +"16 16 5 1", +" c None", +"+ c #000000", +". c #e6e6e6 s active_color_2", +"@ c #c1c1c1 s active_mid_2", +"# c #a7a7a7 s active_shadow_2", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+ at ... ", +"+#... ", +" +..............", +" + at .............", +" + at ............", +" ++#@.........", +" +++++++++++"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-inactive.xpm xfwm4-4.0.5/themes/bluecurve/bottom-left-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-left-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/bottom-left-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,24 @@ +/* XPM */ +static char * bottom_left_inactive_xpm[] = { +"16 16 5 1", +" c None", +"+ c #000000", +". c #e6e6e6 s inactive_color_2", +"@ c #c1c1c1 s inactive_mid_2", +"# c #a7a7a7 s inactive_shadow_2", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+.... ", +"+ at ... ", +"+#... ", +" +..............", +" + at .............", +" + at ............", +" ++#@.........", +" +++++++++++"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-active.xpm xfwm4-4.0.5/themes/bluecurve/bottom-right-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/bottom-right-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,24 @@ +/* XPM */ +static char * bottom_right_active_xpm[] = { +"16 16 5 1", +" c None", +"+ c #000000", +". c #e6e6e6 s active_color_2", +"@ c #c1c1c1 s active_mid_2", +"# c #a7a7a7 s active_shadow_2", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ... at +", +" ...#+", +"..............+ ", +"............. at + ", +"............ at + ", +".........@#++ ", +"+++++++++++ "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-inactive.xpm xfwm4-4.0.5/themes/bluecurve/bottom-right-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/bottom-right-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/bottom-right-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,24 @@ +/* XPM */ +static char * bottom_right_inactive_xpm[] = { +"16 16 5 1", +" c None", +"+ c #000000", +". c #e6e6e6 s inactive_color_2", +"@ c #c1c1c1 s inactive_mid_2", +"# c #a7a7a7 s inactive_shadow_2", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ....+", +" ... at +", +" ...#+", +"..............+ ", +"............. at + ", +"............ at + ", +".........@#++ ", +"+++++++++++ "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/close-active.xpm xfwm4-4.0.5/themes/bluecurve/close-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/close-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/close-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,48 @@ +/* XPM */ +static char * close_active_xpm[] = { +"18 16 29 1", +" c None", +". c #858FA4", +"+ c #F8F9FD", +"@ c #E0E7F7", +"# c #E1E7F7", +"$ c #E1E8F7", +"% c #E2E8F7", +"& c #E2E9F7", +"* c #E3E9F7", +"= c #E4EAF8", +"- c #E5EAF8", +"; c #E5EBF8", +"> c #E6EBF8", +", c #E7ECF8", +"' c #CED3DE", +") c #E8EDF9", +"! c #647190", +"~ c #647290", +"{ c #657290", +"] c #E9EEF9", +"^ c #EAEEF9", +"/ c #EBEFF9", +"( c #657390", +"_ c #667390", +": c #ECF0FA", +"< c #EDF0FA", +"[ c #EDF1FA", +"} c #EEF1FA", +"| c #EEF2FA", +" .............. ", +" .++++++++++++++. ", +".+@@#$%&*==-;>,,'.", +".+@#$%&*==-;>,,)'.", +".+#$%&!==-~>,,))'.", +".+$%&!~~-~{{,))]'.", +".+%&*=~~~{{,))]^'.", +".+&*==-~{{,))]^^'.", +".+==-;{{{{{]^^//'.", +".+=-;{{{){(_^//:'.", +".+-;>,{))]_^//:<'.", +".+;>,,))]^^//:<['.", +".+>,,))]^^//:<[}'.", +".+,,))]^^//:<[}|'.", +" .''''''''''''''. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/close-inactive.xpm xfwm4-4.0.5/themes/bluecurve/close-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/close-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/close-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,28 @@ +/* XPM */ +static char * close_inactive_xpm[] = { +"18 16 9 1", +" c None", +". c #BDBDBD", +"+ c #EEEEEE", +"@ c #EDEDED", +"# c #ECECEC", +"$ c #939393", +"% c #EBEBEB", +"& c #EAEAEA", +"* c #E9E9E9", +" .............. ", +" .++++++++++++++. ", +".@@@@@@@@@@@@@@@@.", +".@@@@@@@@@@@@@@@@.", +".#####$###$######.", +".####$$$#$$$#####.", +".#####$$$$$######.", +".%%%%%%$$$%%%%%%%.", +".%%%%%$$$$$%%%%%%.", +".%%%%$$$%$$$%%%%%.", +".&&&&&$&&&$&&&&&&.", +".&&&&&&&&&&&&&&&&.", +".&&&&&&&&&&&&&&&&.", +".****************.", +" .**************. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/close-pressed.xpm xfwm4-4.0.5/themes/bluecurve/close-pressed.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/close-pressed.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/close-pressed.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,27 @@ +/* XPM */ +static char * close_pressed_xpm[] = { +"18 16 8 1", +" c None", +". c #858FA4", +"+ c #B0B7C8", +"@ c #647190", +"# c #647290", +"$ c #657290", +"% c #657390", +"& c #667390", +" .............. ", +" .++++++++++++++. ", +".++++++++++++++++.", +".++++++++++++++++.", +".+++++ at +++#++++++.", +".++++@##+#$$+++++.", +".+++++###$$++++++.", +".++++++#$$+++++++.", +".+++++$$$$$++++++.", +".++++$$$+$%&+++++.", +".+++++$+++&++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +" .++++++++++++++. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/hide-active.xpm xfwm4-4.0.5/themes/bluecurve/hide-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/hide-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/hide-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,47 @@ +/* XPM */ +static char * hide_active_xpm[] = { +"18 16 28 1", +" c None", +". c #858FA4", +"+ c #F8F9FD", +"@ c #E0E7F7", +"# c #E1E7F7", +"$ c #E1E8F7", +"% c #E2E8F7", +"& c #E2E9F7", +"* c #E3E9F7", +"= c #E4EAF8", +"- c #E5EAF8", +"; c #E5EBF8", +"> c #E6EBF8", +", c #E7ECF8", +"' c #CED3DE", +") c #E8EDF9", +"! c #E9EEF9", +"~ c #EAEEF9", +"{ c #647290", +"] c #657290", +"^ c #657390", +"/ c #EBEFF9", +"( c #667390", +"_ c #ECF0FA", +": c #EDF0FA", +"< c #EDF1FA", +"[ c #EEF1FA", +"} c #EEF2FA", +" .............. ", +" .++++++++++++++. ", +".+@@#$%&*==-;>,,'.", +".+@#$%&*==-;>,,)'.", +".+#$%&*==-;>,,))'.", +".+$%&*==-;>,,))!'.", +".+%&*==-;>,,))!~'.", +".+&*==-;>,,))!~~'.", +".+==-{]]]]]^~~//'.", +".+=-;]]]]]^(~//_'.", +".+-;>]]]]^((//_:'.", +".+;>,,))!~~//_:<'.", +".+>,,))!~~//_:<['.", +".+,,))!~~//_:<[}'.", +" .''''''''''''''. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/hide-inactive.xpm xfwm4-4.0.5/themes/bluecurve/hide-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/hide-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/hide-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,28 @@ +/* XPM */ +static char * hide_inactive_xpm[] = { +"18 16 9 1", +" c None", +". c #BDBDBD", +"+ c #EEEEEE", +"@ c #EDEDED", +"# c #ECECEC", +"$ c #EBEBEB", +"% c #939393", +"& c #EAEAEA", +"* c #E9E9E9", +" .............. ", +" .++++++++++++++. ", +".@@@@@@@@@@@@@@@@.", +".@@@@@@@@@@@@@@@@.", +".################.", +".################.", +".################.", +".$$$$$$$$$$$$$$$$.", +".$$$$%%%%%%%$$$$$.", +".$$$$%%%%%%%$$$$$.", +".&&&&%%%%%%%&&&&&.", +".&&&&&&&&&&&&&&&&.", +".&&&&&&&&&&&&&&&&.", +".****************.", +" .**************. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/hide-pressed.xpm xfwm4-4.0.5/themes/bluecurve/hide-pressed.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/hide-pressed.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/hide-pressed.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,26 @@ +/* XPM */ +static char * hide_pressed_xpm[] = { +"18 16 7 1", +" c None", +". c #858FA4", +"+ c #B0B7C8", +"@ c #647290", +"# c #657290", +"$ c #657390", +"% c #667390", +" .............. ", +" .++++++++++++++. ", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++@#####$+++++.", +".++++#####$%+++++.", +".++++####$%%+++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +" .++++++++++++++. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/left-active.xpm xfwm4-4.0.5/themes/bluecurve/left-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/left-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/left-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,10 @@ +/* XPM */ +static char * left_active_xpm[] = { +"5 4 3 1", +" c None", +"+ c #000000", +". c #e6e6e6 s active_color_2", +"+....", +"+....", +"+....", +"+...."}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/left-inactive.xpm xfwm4-4.0.5/themes/bluecurve/left-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/left-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/left-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,10 @@ +/* XPM */ +static char * left_inactive_xpm[] = { +"5 4 3 1", +" c None", +"+ c #000000", +". c #e6e6e6 s inactive_color_2", +"+....", +"+....", +"+....", +"+...."}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-active.xpm xfwm4-4.0.5/themes/bluecurve/maximize-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/maximize-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,48 @@ +/* XPM */ +static char * maximize_active_xpm[] = { +"18 16 29 1", +" c None", +". c #858FA4", +"+ c #F8F9FD", +"@ c #E0E7F7", +"# c #E1E7F7", +"$ c #E1E8F7", +"% c #E2E8F7", +"& c #E2E9F7", +"* c #E3E9F7", +"= c #E4EAF8", +"- c #E5EAF8", +"; c #E5EBF8", +"> c #E6EBF8", +", c #E7ECF8", +"' c #CED3DE", +") c #E8EDF9", +"! c #647190", +"~ c #647290", +"{ c #657290", +"] c #E9EEF9", +"^ c #EAEEF9", +"/ c #657390", +"( c #EBEFF9", +"_ c #667390", +": c #ECF0FA", +"< c #EDF0FA", +"[ c #EDF1FA", +"} c #EEF1FA", +"| c #EEF2FA", +" .............. ", +" .++++++++++++++. ", +".+@@#$%&*==-;>,,'.", +".+@#$%&*==-;>,,)'.", +".+#$%!!~~~~{,,))'.", +".+$%&!~~~~{{,))]'.", +".+%&*~~~~{{{))]^'.", +".+&*=~-;>,,{)]^^'.", +".+==-~>,,))/^^(('.", +".+=-;{,,))]_^((:'.", +".+-;>{{{{/__((:<'.", +".+;>,,))]^^((:<['.", +".+>,,))]^^((:<[}'.", +".+,,))]^^((:<[}|'.", +" .''''''''''''''. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-inactive.xpm xfwm4-4.0.5/themes/bluecurve/maximize-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/maximize-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,28 @@ +/* XPM */ +static char * maximize_inactive_xpm[] = { +"18 16 9 1", +" c None", +". c #BDBDBD", +"+ c #EEEEEE", +"@ c #EDEDED", +"# c #ECECEC", +"$ c #939393", +"% c #EBEBEB", +"& c #EAEAEA", +"* c #E9E9E9", +" .............. ", +" .++++++++++++++. ", +".@@@@@@@@@@@@@@@@.", +".@@@@@@@@@@@@@@@@.", +".####$$$$$$$#####.", +".####$$$$$$$#####.", +".####$$$$$$$#####.", +".%%%%$%%%%%$%%%%%.", +".%%%%$%%%%%$%%%%%.", +".%%%%$%%%%%$%%%%%.", +".&&&&$$$$$$$&&&&&.", +".&&&&&&&&&&&&&&&&.", +".&&&&&&&&&&&&&&&&.", +".****************.", +" .**************. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-pressed.xpm xfwm4-4.0.5/themes/bluecurve/maximize-pressed.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-pressed.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/maximize-pressed.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,27 @@ +/* XPM */ +static char * maximize_pressed_xpm[] = { +"18 16 8 1", +" c None", +". c #858FA4", +"+ c #B0B7C8", +"@ c #647190", +"# c #647290", +"$ c #657290", +"% c #657390", +"& c #667390", +" .............. ", +" .++++++++++++++. ", +".++++++++++++++++.", +".++++++++++++++++.", +".++++@@####$+++++.", +".++++@####$$+++++.", +".++++####$$$+++++.", +".++++#+++++$+++++.", +".++++#+++++%+++++.", +".++++$+++++&+++++.", +".++++$$$$%&&+++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +" .++++++++++++++. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-active.xpm xfwm4-4.0.5/themes/bluecurve/maximize-toggled-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/maximize-toggled-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,54 @@ +/* XPM */ +static char * maximize_toggled_active_xpm[] = { +"18 16 35 1", +" c None", +". c #858FA4", +"+ c #F8F9FD", +"@ c #E0E7F7", +"# c #E1E7F7", +"$ c #E1E8F7", +"% c #E2E8F7", +"& c #E2E9F7", +"* c #E3E9F7", +"= c #E4EAF8", +"- c #E5EAF8", +"; c #E5EBF8", +"> c #E6EBF8", +", c #E7ECF8", +"' c #CED3DE", +") c #8A95AE", +"! c #8A95AF", +"~ c #8B95AF", +"{ c #8B96AF", +"] c #E8EDF9", +"^ c #8C96AF", +"/ c #647190", +"( c #647290", +"_ c #657290", +": c #E9EEF9", +"< c #EAEEF9", +"[ c #8D97AF", +"} c #EBEFF9", +"| c #657390", +"1 c #ECF0FA", +"2 c #667390", +"3 c #EDF0FA", +"4 c #EDF1FA", +"5 c #EEF1FA", +"6 c #EEF2FA", +" .............. ", +" .++++++++++++++. ", +".+@@#$%&*==-;>,,'.", +".+@#$%&)!!~{{,,]'.", +".+#$%&*==-;>^,]]'.", +".+$%&/((((_,^]]:'.", +".+%&*((((__,^]:<'.", +".+&*=(((___]^:<<'.", +".+==-(>,,]_:[<}}'.", +".+=-;_,,]]|<<}}1'.", +".+-;>____|2<}}13'.", +".+;>,,]]:<<}}134'.", +".+>,,]]:<<}}1345'.", +".+,,]]:<<}}13456'.", +" .''''''''''''''. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-inactive.xpm xfwm4-4.0.5/themes/bluecurve/maximize-toggled-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/maximize-toggled-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,29 @@ +/* XPM */ +static char * maximize_toggled_inactive_xpm[] = { +"18 16 10 1", +" c None", +". c #BDBDBD", +"+ c #EEEEEE", +"@ c #EDEDED", +"# c #AEAEAE", +"$ c #ECECEC", +"% c #939393", +"& c #EBEBEB", +"* c #EAEAEA", +"= c #E9E9E9", +" .............. ", +" .++++++++++++++. ", +".@@@@@@@@@@@@@@@@.", +".@@@@@@######@@@@.", +".$$$$$$$$$$$#$$$$.", +".$$$$%%%%%%$#$$$$.", +".$$$$%%%%%%$#$$$$.", +".&&&&%%%%%%&#&&&&.", +".&&&&%&&&&%&#&&&&.", +".&&&&%&&&&%&&&&&&.", +".****%%%%%%******.", +".****************.", +".****************.", +".================.", +" .==============. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-pressed.xpm xfwm4-4.0.5/themes/bluecurve/maximize-toggled-pressed.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/maximize-toggled-pressed.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/maximize-toggled-pressed.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,33 @@ +/* XPM */ +static char * maximize_toggled_pressed_xpm[] = { +"18 16 14 1", +" c None", +". c #858FA4", +"+ c #B0B7C8", +"@ c #8A95AE", +"# c #8A95AF", +"$ c #8B95AF", +"% c #8B96AF", +"& c #8C96AF", +"* c #647190", +"= c #647290", +"- c #657290", +"; c #8D97AF", +"> c #657390", +", c #667390", +" .............. ", +" .++++++++++++++. ", +".++++++++++++++++.", +".++++++@##$%%++++.", +".+++++++++++&++++.", +".++++*====-+&++++.", +".++++====--+&++++.", +".++++===---+&++++.", +".++++=++++-+;++++.", +".++++-++++>++++++.", +".++++---->,++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +" .++++++++++++++. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/menu-active.xpm xfwm4-4.0.5/themes/bluecurve/menu-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/menu-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/menu-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,46 @@ +/* XPM */ +static char * menu_active_xpm[] = { +"18 16 27 1", +" c None", +". c #858FA4", +"+ c #F8F9FD", +"@ c #E0E7F7", +"# c #E1E7F7", +"$ c #E1E8F7", +"% c #E2E8F7", +"& c #E2E9F7", +"* c #E3E9F7", +"= c #E4EAF8", +"- c #E5EAF8", +"; c #E5EBF8", +"> c #E6EBF8", +", c #E7ECF8", +"' c #CED3DE", +") c #E8EDF9", +"! c #647190", +"~ c #657290", +"{ c #E9EEF9", +"] c #647290", +"^ c #EAEEF9", +"/ c #EBEFF9", +"( c #ECF0FA", +"_ c #EDF0FA", +": c #EDF1FA", +"< c #EEF1FA", +"[ c #EEF2FA", +" .............. ", +" .++++++++++++++. ", +".+@@#$%&*==-;>,,'.", +".+@#$%&*==-;>,,)'.", +".+#$%&*==-;>,,))'.", +".+$%&!==-;>~,)){'.", +".+%&!]]-;>~~~){^'.", +".+&*=]]]>~~~){^^'.", +".+==-;~~~~~{^^//'.", +".+=-;>,~~~{^^//('.", +".+-;>,,)~{^^//(_'.", +".+;>,,)){^^//(_:'.", +".+>,,)){^^//(_:<'.", +".+,,)){^^//(_:<['.", +" .''''''''''''''. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/menu-inactive.xpm xfwm4-4.0.5/themes/bluecurve/menu-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/menu-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/menu-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,28 @@ +/* XPM */ +static char * menu_inactive_xpm[] = { +"18 16 9 1", +" c None", +". c #BDBDBD", +"+ c #EEEEEE", +"@ c #EDEDED", +"# c #ECECEC", +"$ c #939393", +"% c #EBEBEB", +"& c #EAEAEA", +"* c #E9E9E9", +" .............. ", +" .++++++++++++++. ", +".@@@@@@@@@@@@@@@@.", +".@@@@@@@@@@@@@@@@.", +".################.", +".####$#####$#####.", +".###$$$###$$$####.", +".%%%%$$$%$$$%%%%%.", +".%%%%%$$$$$%%%%%%.", +".%%%%%%$$$%%%%%%%.", +".&&&&&&&$&&&&&&&&.", +".&&&&&&&&&&&&&&&&.", +".&&&&&&&&&&&&&&&&.", +".****************.", +" .**************. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/menu-pressed.xpm xfwm4-4.0.5/themes/bluecurve/menu-pressed.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/menu-pressed.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/menu-pressed.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,25 @@ +/* XPM */ +static char * menu_pressed_xpm[] = { +"18 16 6 1", +" c None", +". c #858FA4", +"+ c #B0B7C8", +"@ c #647190", +"# c #657290", +"$ c #647290", +" .............. ", +" .++++++++++++++. ", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++ at +++++#+++++.", +".+++@$$+++###++++.", +".++++$$$+###+++++.", +".+++++#####++++++.", +".++++++###+++++++.", +".+++++++#++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +".++++++++++++++++.", +" .++++++++++++++. ", +" .............. "}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/right-active.xpm xfwm4-4.0.5/themes/bluecurve/right-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/right-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/right-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,10 @@ +/* XPM */ +static char * right_active_xpm[] = { +"5 4 3 1", +" c None", +"+ c #000000", +". c #e6e6e6 s active_color_2", +"....+", +"....+", +"....+", +"....+"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/right-inactive.xpm xfwm4-4.0.5/themes/bluecurve/right-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/right-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/right-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,10 @@ +/* XPM */ +static char * right_inactive_xpm[] = { +"5 4 3 1", +" c None", +"+ c #000000", +". c #e6e6e6 s inactive_color_2", +"....+", +"....+", +"....+", +"....+"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/themerc xfwm4-4.0.5/themes/bluecurve/themerc --- xfwm4-4.0.5.orig2/themes/bluecurve/themerc 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/themerc 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,11 @@ +active_text_color=#ffffff +inactive_text_color=#777777 +button_layout=O|HMC +button_offset=-1 +button_spacing=2 +full_width_title=true +title_horizontal_offset=4 +title_shadow_active=true +title_shadow_inactive=false +title_vertical_offset_active=2 +title_vertical_offset_inactive=2 diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-1-active.xpm xfwm4-4.0.5/themes/bluecurve/title-1-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-1-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-1-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,33 @@ +/* XPM */ +static char * title_1_active_xpm[] = { +"2 22 8 1", +" c None", +". c #000000", +"+ c #BEC6D8", +"@ c #C3CBDE", +"# c #C9D1E3", +"$ c #CED6E9", +"% c #D3DCEF", +"& c #7283A7", +"..", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"@@", +"##", +"$$", +"%%", +"&&"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-1-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-1-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-1-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-1-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,35 @@ +/* XPM */ +static char * title_1_inactive_xpm[] = { +"2 22 10 1", +" c None", +". c #000000", +"+ c #E8E8E8", +"@ c #E3E3E3", +"# c #DEDEDE", +"$ c #D9D9D9", +"% c #D6D6D6", +"& c #D4D4D4", +"* c #D2D2D2", +"= c #C4C4C4", +"..", +"++", +"@@", +"##", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"%%", +"&&", +"**", +"**", +"=="}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-2-active.xpm xfwm4-4.0.5/themes/bluecurve/title-2-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-2-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-2-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,34 @@ +/* XPM */ +static char * title_2_active_xpm[] = { +"4 22 9 1", +" c None", +". c #000000", +"+ c #BEC6D8", +"@ c #283C67", +"# c #C3CBDE", +"$ c #C9D1E3", +"% c #CED6E9", +"& c #D3DCEF", +"* c #7283A7", +"....", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"+++@", +"###@", +"$$$@", +"%%%@", +"&&&@", +"***@"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-2-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-2-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-2-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-2-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,35 @@ +/* XPM */ +static char * title_2_inactive_xpm[] = { +"4 22 10 1", +" c None", +". c #000000", +"+ c #E8E8E8", +"@ c #E3E3E3", +"# c #DEDEDE", +"$ c #D9D9D9", +"% c #D6D6D6", +"& c #D4D4D4", +"* c #D2D2D2", +"= c #C4C4C4", +"....", +"++++", +"@@@@", +"####", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"%%%%", +"&&&&", +"****", +"****", +"===="}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-3-active.xpm xfwm4-4.0.5/themes/bluecurve/title-3-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-3-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-3-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,81 @@ +/* XPM */ +static char * title_3_active_xpm[] = { +"5 22 56 1", +" c None", +". c #000000", +"+ c #A8B9DE", +"@ c #647EBA", +"# c #3D4F77", +"$ c #899DC9", +"% c #5E7AB8", +"& c #859AC7", +"* c #5875B5", +"= c #3A4D76", +"- c #5370B3", +"; c #374975", +"> c #8095C5", +", c #4D6CB0", +"' c #334672", +") c #7C92C3", +"! c #4B6AB0", +"~ c #314572", +"{ c #7B91C3", +"] c #304471", +"^ c #7A91C2", +"/ c #4969AF", +"( c #7A90C2", +"_ c #4867AE", +": c #304472", +"< c #4665AD", +"[ c #2E4271", +"} c #778DC0", +"| c #4464AC", +"1 c #2D4171", +"2 c #768BC0", +"3 c #2F4270", +"4 c #788EC0", +"5 c #314573", +"6 c #7A8EC2", +"7 c #4A68AF", +"8 c #7D92C4", +"9 c #4E6CB1", +"0 c #364B78", +"a c #5270B4", +"b c #3B4F7D", +"c c #7D93C4", +"d c #5774B5", +"e c #405480", +"f c #7E95C5", +"g c #5F7AB8", +"h c #485B86", +"i c #8497C7", +"j c #4F618B", +"k c #879BC7", +"l c #6680BA", +"m c #8B9ECA", +"n c #6D85BE", +"o c #566892", +"p c #7289C0", +"q c #0B0B0C", +".....", +"+++++", +"@@@@@", +"#$%%%", +"&***=", +"---;>", +",,'),", +"!~{!!", +"]^///", +"(___:", +"<<<[}", +"||12|", +"<34<<", +"56777", +"89990", +"aaabc", +"ddefd", +"ghigg", +"jklll", +"mnnno", +"ppppp", +"qqqqq"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-3-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-3-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-3-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-3-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,35 @@ +/* XPM */ +static char * title_3_inactive_xpm[] = { +"5 22 10 1", +" c None", +". c #000000", +"+ c #E8E8E8", +"@ c #E3E3E3", +"# c #DEDEDE", +"$ c #D9D9D9", +"% c #D6D6D6", +"& c #D4D4D4", +"* c #D2D2D2", +"= c #C4C4C4", +".....", +"+++++", +"@@@@@", +"#####", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"$$$$$", +"%%%%%", +"&&&&&", +"*****", +"*****", +"====="}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-4-active.xpm xfwm4-4.0.5/themes/bluecurve/title-4-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-4-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-4-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,34 @@ +/* XPM */ +static char * title_4_active_xpm[] = { +"4 22 9 1", +" c None", +". c #000000", +"+ c #283C67", +"@ c #BEC6D8", +"# c #C3CBDE", +"$ c #C9D1E3", +"% c #CED6E9", +"& c #D3DCEF", +"* c #7283A7", +"....", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+@@@", +"+###", +"+$$$", +"+%%%", +"+&&&", +"+***"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-4-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-4-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-4-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-4-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,35 @@ +/* XPM */ +static char * title_4_inactive_xpm[] = { +"4 22 10 1", +" c None", +". c #000000", +"+ c #E8E8E8", +"@ c #E3E3E3", +"# c #DEDEDE", +"$ c #D9D9D9", +"% c #D6D6D6", +"& c #D4D4D4", +"* c #D2D2D2", +"= c #C4C4C4", +"....", +"++++", +"@@@@", +"####", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"$$$$", +"%%%%", +"&&&&", +"****", +"****", +"===="}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-5-active.xpm xfwm4-4.0.5/themes/bluecurve/title-5-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-5-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-5-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,33 @@ +/* XPM */ +static char * title_5_active_xpm[] = { +"2 22 8 1", +" c None", +". c #000000", +"+ c #BEC6D8", +"@ c #C3CBDE", +"# c #C9D1E3", +"$ c #CED6E9", +"% c #D3DCEF", +"& c #7283A7", +"..", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"++", +"@@", +"##", +"$$", +"%%", +"&&"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/title-5-inactive.xpm xfwm4-4.0.5/themes/bluecurve/title-5-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/title-5-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/title-5-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,35 @@ +/* XPM */ +static char * title_5_inactive_xpm[] = { +"2 22 10 1", +" c None", +". c #000000", +"+ c #E8E8E8", +"@ c #E3E3E3", +"# c #DEDEDE", +"$ c #D9D9D9", +"% c #D6D6D6", +"& c #D4D4D4", +"* c #D2D2D2", +"= c #C4C4C4", +"..", +"++", +"@@", +"##", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"$$", +"%%", +"&&", +"**", +"**", +"=="}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-left-active.xpm xfwm4-4.0.5/themes/bluecurve/top-left-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/top-left-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/top-left-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,38 @@ +/* XPM */ +static char * top_left_active_xpm[] = { +"10 22 13 1", +" c None", +". c #000000", +"+ c #36383D", +"@ c #A7AEBE", +"# c #BEC6D8", +"$ c #979EAC", +"% c #393B40", +"& c #A5ACBB", +"* c #C3CBDE", +"= c #C9D1E3", +"- c #CED6E9", +"; c #D3DCEF", +"> c #7283A7", +" .....", +" .+@####", +" .$######", +" .$#######", +" %########", +".&########", +".#########", +".#########", +".#########", +".#########", +".#########", +".#########", +".#########", +".#########", +".#########", +".#########", +".#########", +".*********", +".=========", +".---------", +".;;;;;;;;;", +".>>>>>>>>>"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-left-inactive.xpm xfwm4-4.0.5/themes/bluecurve/top-left-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/top-left-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/top-left-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,41 @@ +/* XPM */ +static char * top_left_inactive_xpm[] = { +"10 22 16 1", +" c None", +". c #000000", +"+ c #424242", +"@ c #CCCCCC", +"# c #E8E8E8", +"$ c #B5B5B5", +"% c #E3E3E3", +"& c #B1B1B1", +"* c #DEDEDE", +"= c #414141", +"- c #D9D9D9", +"; c #BCBCBC", +"> c #D6D6D6", +", c #D4D4D4", +"' c #D2D2D2", +") c #C4C4C4", +" .....", +" .+@####", +" .$%%%%%%", +" .&*******", +" =--------", +".;--------", +".---------", +".---------", +".---------", +".---------", +".---------", +".---------", +".---------", +".---------", +".---------", +".---------", +".---------", +".>>>>>>>>>", +".,,,,,,,,,", +".'''''''''", +".'''''''''", +".)))))))))"}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-right-active.xpm xfwm4-4.0.5/themes/bluecurve/top-right-active.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/top-right-active.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/top-right-active.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,38 @@ +/* XPM */ +static char * top_right_active_xpm[] = { +"10 22 13 1", +" c None", +". c #000000", +"+ c #BEC6D8", +"@ c #A7AEBE", +"# c #36383D", +"$ c #979EAC", +"% c #393B40", +"& c #A5ACBB", +"* c #C3CBDE", +"= c #C9D1E3", +"- c #CED6E9", +"; c #D3DCEF", +"> c #7283A7", +"..... ", +"++++@#. ", +"++++++$. ", +"+++++++$. ", +"++++++++% ", +"++++++++&.", +"+++++++++.", +"+++++++++.", +"+++++++++.", +"+++++++++.", +"+++++++++.", +"+++++++++.", +"+++++++++.", +"+++++++++.", +"+++++++++.", +"+++++++++.", +"+++++++++.", +"*********.", +"=========.", +"---------.", +";;;;;;;;;.", +">>>>>>>>>."}; diff -Naur xfwm4-4.0.5.orig2/themes/bluecurve/top-right-inactive.xpm xfwm4-4.0.5/themes/bluecurve/top-right-inactive.xpm --- xfwm4-4.0.5.orig2/themes/bluecurve/top-right-inactive.xpm 1970-01-01 01:00:00.000000000 +0100 +++ xfwm4-4.0.5/themes/bluecurve/top-right-inactive.xpm 2004-04-19 23:24:24.000000000 +0200 @@ -0,0 +1,41 @@ +/* XPM */ +static char * top_right_inactive_xpm[] = { +"10 22 16 1", +" c None", +". c #000000", +"+ c #E8E8E8", +"@ c #CCCCCC", +"# c #424242", +"$ c #E3E3E3", +"% c #B5B5B5", +"& c #DEDEDE", +"* c #B1B1B1", +"= c #D9D9D9", +"- c #414141", +"; c #BCBCBC", +"> c #D6D6D6", +", c #D4D4D4", +"' c #D2D2D2", +") c #C4C4C4", +"..... ", +"++++@#. ", +"$$$$$$%. ", +"&&&&&&&*. ", +"========- ", +"========;.", +"=========.", +"=========.", +"=========.", +"=========.", +"=========.", +"=========.", +"=========.", +"=========.", +"=========.", +"=========.", +"=========.", +">>>>>>>>>.", +",,,,,,,,,.", +"'''''''''.", +"'''''''''.", +")))))))))."}; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfwm4/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 14:46:59 -0000 1.4 +++ .cvsignore 20 Mar 2005 22:53:32 -0000 1.5 @@ -1 +1 @@ -xfwm4-4.0.6.tar.gz +xfwm4-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfwm4/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 14:46:59 -0000 1.4 +++ sources 20 Mar 2005 22:53:32 -0000 1.5 @@ -1 +1 @@ -911688ba221bc65e66e15bb87993edec xfwm4-4.0.6.tar.gz +da3e434bff601fa567710fa288979e2d xfwm4-4.2.1.tar.bz2 Index: xfwm4.spec =================================================================== RCS file: /cvs/dist/rpms/xfwm4/FC-3/xfwm4.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xfwm4.spec 9 Sep 2004 14:46:59 -0000 1.5 +++ xfwm4.spec 20 Mar 2005 22:53:32 -0000 1.6 @@ -1,31 +1,33 @@ -Summary: Next generation window manager for xfce +Summary: Next generation window manager for Xfce Name: xfwm4 -Version: 4.0.6 -Release: 1 +Version: 4.2.1 +Release: 2.FC3 License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.1/src/%{name}-%{version}.tar.gz +Source0: http://www.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-4.2.1.tar.bz2 # Change default for Fedora -Patch: xfwm4-fedora.patch +Patch0: xfwm4-bluecurve-prep.patch +Patch1: xfwm4-bluecurve.patch Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libxfce4mcs >= 4.0.5 -Requires: libxfcegui4 >= 4.0.5 -Requires: xfce-mcs-manager >= 4.0.5 -BuildRequires: libxfce4mcs-devel >= 4.0.5 -BuildRequires: libxfcegui4-devel >= 4.0.5 -BuildRequires: xfce-mcs-manager-devel >= 4.0.5 +Requires: libxfce4mcs >= %{version} +Requires: libxfcegui4 >= %{version} +Requires: xfce-mcs-manager >= %{version} +BuildRequires: libxfce4mcs-devel >= %{version} +BuildRequires: libxfcegui4-devel >= %{version} +BuildRequires: xfce-mcs-manager-devel >= %{version} %description -xfwm4 is a window manager compatable with GNOME, GNOME2, KDE2, KDE3 and Xfce. +xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce. %prep %setup -q -%patch -p1 -b .fedora +%patch0 -p1 -b .bluecurve-prep +%patch1 -p1 -b .bluecurve %build %configure @@ -43,14 +45,33 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc example.xfwm4rc example.gtkrc-2.0 README INSTALL TODO COPYING AUTHORS -%{_bindir}/* +%doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR +%{_bindir}/xfwm4 %{_libdir}/xfce4/mcs-plugins/* -%{_datadir}/xfwm4/defaults -%{_datadir}/xfwm4/themes -%{_datadir}/xfce4/doc +%{_datadir}/applications/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/xfce4 +%{_datadir}/xfwm4 +%{_datadir}/themes %changelog +* Sun Mar 20 2005 Kevin Fenzi - 4.2.1-2 +- Readded changelogs +- Split old fedora patch into a bluecurve-prep and bluecurve patch and applied + +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to version 4.2.1 + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-2 +- Removed generic INSTALL from %doc +- Fixed case of Xfce + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-1 +- Inital Fedora Extras version + +* Thu Jan 27 2005 Than Ngo 4.2.0-1 +- 4.2.0 + * Mon Jul 19 2004 Than Ngo 4.0.6-1 - update to 4.0.6 - use %%find_lang macros --- xfwm4-fedora.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 20 22:54:57 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 17:54:57 -0500 Subject: rpms/xfwm4-themes/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfwm4-themes.spec, 1.5, 1.6 Message-ID: <200503202254.j2KMsvBZ018977@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xfwm4-themes/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv18956/FC-3 Modified Files: .cvsignore sources xfwm4-themes.spec Log Message: auto-import xfwm4-themes-4.2.1-2.FC3 on branch FC-3 from xfwm4-themes-4.2.1-2.FC3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xfwm4-themes/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 14:46:34 -0000 1.4 +++ .cvsignore 20 Mar 2005 22:54:54 -0000 1.5 @@ -1 +1 @@ -xfwm4-themes-4.0.6.tar.gz +xfwm4-themes-4.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xfwm4-themes/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 14:46:34 -0000 1.4 +++ sources 20 Mar 2005 22:54:54 -0000 1.5 @@ -1 +1 @@ -63c091efdba452191ea990f92c7302d2 xfwm4-themes-4.0.6.tar.gz +f3c3110d1c5a7a49b53ced19512ab66a xfwm4-themes-4.2.1.tar.bz2 Index: xfwm4-themes.spec =================================================================== RCS file: /cvs/dist/rpms/xfwm4-themes/FC-3/xfwm4-themes.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xfwm4-themes.spec 24 Sep 2004 20:17:32 -0000 1.5 +++ xfwm4-themes.spec 20 Mar 2005 22:54:54 -0000 1.6 @@ -1,17 +1,17 @@ -Summary: Themes for xfwm4 +Summary: Additional themes for xfwm4 Name: xfwm4-themes -Version: 4.0.6 -Release: 2 +Version: 4.2.1 +Release: 2.FC3 License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.0.6/src/%{name}-%{version}.tar.gz +Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfwm4-themes-4.2.1.tar.bz2 Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: xfwm4 BuildArch: noarch %description -A set of additionnal themes for the xfwm4 window manager. +A set of additional themes for the xfwm4 window manager. %prep %setup -q @@ -31,10 +31,25 @@ %files %defattr(-,root,root) -%doc README INSTALL TODO COPYING AUTHORS -%{_datadir}/xfwm4/themes +%doc README TODO COPYING AUTHORS +%{_datadir}/themes %changelog +* Sun Mar 20 2005 Kevin Fenzi - 4.2.1-2 +- Readded changelogs back in from core cvs + +* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 +- Updated to 4.2.1 version + +* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-2 +- Fixed spelling: Additionnal to Additional + +* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-1 +- Inital Fedora Extras version + +* Thu Feb 03 2005 Than Ngo 4.2.0-1 +- 4.2.0 + * Fri Sep 24 2004 Than Ngo 4.0.6-2 - fix package description @@ -55,4 +70,3 @@ * Tue Dec 16 2003 Than Ngo 4.0.1-1 - initial build - From fedora-cvs-commits at redhat.com Mon Mar 21 00:27:12 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 20 Mar 2005 19:27:12 -0500 Subject: rpms/kernel/devel linux-2.6.11-execshield.patch,1.1,1.2 Message-ID: <200503210027.j2L0RBtl029192@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29178 Modified Files: linux-2.6.11-execshield.patch Log Message: compile fixes linux-2.6.11-execshield.patch: linux-2.6.11/arch/x86_64/kernel/process.c | 7 - linux-2.6.11/include/asm-x86_64/processor.h | 5 - linux/arch/i386/kernel/asm-offsets.c | 1 linux/arch/i386/kernel/entry.S | 8 + linux/arch/i386/kernel/process.c | 59 +++++++++++++ linux/arch/i386/kernel/signal.c | 4 linux/arch/i386/kernel/smp.c | 3 linux/arch/i386/kernel/sysenter.c | 55 ++++++++++++ linux/arch/i386/kernel/traps.c | 48 ++++++++++- linux/arch/i386/kernel/vsyscall-sysenter.S | 6 - linux/arch/i386/kernel/vsyscall.lds.S | 4 linux/arch/i386/mm/init.c | 6 + linux/arch/i386/mm/mmap.c | 6 - linux/arch/ia64/ia32/binfmt_elf32.c | 2 linux/arch/x86_64/ia32/ia32_binfmt.c | 2 linux/arch/x86_64/mm/Makefile | 2 linux/arch/x86_64/mm/mmap.c | 95 ++++++++++++++++++++++ linux/drivers/char/random.c | 7 + linux/fs/binfmt_elf.c | 120 +++++++++++++++++++++++----- linux/fs/proc/array.c | 8 + linux/fs/proc/base.c | 4 linux/fs/proc/task_mmu.c | 25 ++++- linux/include/asm-i386/desc.h | 14 +++ linux/include/asm-i386/elf.h | 42 ++++++--- linux/include/asm-i386/mmu.h | 6 + linux/include/asm-i386/pgalloc.h | 1 linux/include/asm-i386/processor.h | 8 + linux/include/asm-i386/thread_info.h | 1 linux/include/asm-ia64/pgalloc.h | 4 linux/include/asm-ppc/pgalloc.h | 5 + linux/include/asm-ppc64/pgalloc.h | 5 + linux/include/asm-s390/pgalloc.h | 4 linux/include/asm-sparc/pgalloc.h | 4 linux/include/asm-sparc64/pgalloc.h | 4 linux/include/asm-x86_64/pgalloc.h | 7 + linux/include/asm-x86_64/processor.h | 9 ++ linux/include/linux/mm.h | 9 +- linux/include/linux/resource.h | 5 - linux/include/linux/sched.h | 9 ++ linux/include/linux/sysctl.h | 3 linux/kernel/signal.c | 38 ++++++++ linux/kernel/sysctl.c | 39 +++++++++ linux/mm/fremap.c | 10 +- linux/mm/mmap.c | 107 +++++++++++++++++++++++- linux/mm/mprotect.c | 5 - linux/mm/mremap.c | 4 46 files changed, 729 insertions(+), 91 deletions(-) Index: linux-2.6.11-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-execshield.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.11-execshield.patch 18 Mar 2005 21:55:21 -0000 1.1 +++ linux-2.6.11-execshield.patch 21 Mar 2005 00:27:08 -0000 1.2 @@ -1602,3 +1602,32 @@ #define pmd_populate_kernel(mm, pmd, pte) \ set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte))) #define pud_populate(mm, pud, pmd) \ +--- linux-2.6.11/include/asm-x86_64/processor.h.~1~ 2005-03-20 02:30:47.000000000 -0800 ++++ linux-2.6.11/include/asm-x86_64/processor.h 2005-03-20 16:03:58.630866387 -0800 +@@ -161,10 +161,7 @@ static inline void clear_in_cr4 (unsigne + /* + * User space process size. 47bits. + */ +-#define TASK_SIZE (0x800000000000UL) +- +-#define TASK_SIZE_64 (0x800000000000) +- ++#define TASK_SIZE_64 (0x800000000000UL) + #define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64) + + #define __HAVE_ARCH_ALIGN_STACK + +--- linux-2.6.11/arch/x86_64/kernel/process.c.~1~ 2005-03-20 02:30:52.000000000 -0800 ++++ linux-2.6.11/arch/x86_64/kernel/process.c 2005-03-20 16:13:31.209561108 -0800 +@@ -746,10 +746,3 @@ int dump_task_regs(struct task_struct *t + + return 1; + } +- +-unsigned long arch_align_stack(unsigned long sp) +-{ +- if (randomize_va_space) +- sp -= get_random_int() % 8192; +- return sp & ~0xf; +-} + From fedora-cvs-commits at redhat.com Mon Mar 21 07:03:26 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 02:03:26 -0500 Subject: rpms/gettext/devel .cvsignore, 1.8, 1.9 gettext.spec, 1.41, 1.42 sources, 1.8, 1.9 Message-ID: <200503210703.j2L73QUX020585@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gettext/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20553 Modified Files: .cvsignore gettext.spec sources Log Message: - fixed compiling problme on gcc4 (#150992) - fixed Group for -devel (#138303) - moved gettextize and autopoint to -deel (#137542, #145768) - moved some of the man pages Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gettext/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 Sep 2004 05:07:23 -0000 1.8 +++ .cvsignore 21 Mar 2005 07:03:22 -0000 1.9 @@ -1 +1,2 @@ gettext-0.14.1.tar.gz +gettext-0.14.3.tar.gz Index: gettext.spec =================================================================== RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gettext.spec 1 Mar 2005 08:36:22 -0000 1.41 +++ gettext.spec 21 Mar 2005 07:03:22 -0000 1.42 @@ -4,8 +4,8 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext -Version: 0.14.1 -Release: 14 +Version: 0.14.3 +Release: 1 License: GPL/LGPL Group: Development/Tools Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz @@ -13,8 +13,9 @@ Source1: po-mode-init.el Source2: msghack.py Patch0: gettext-0.14.1-amd64-libtool.patch -Patch1: gettext-0.14.1-phase0getc.patch -Patch2: gettext-0.14.1-tempfile.patch +Patch1: gettext-0.14.3-gcc4.patch +#Patch1: gettext-0.14.1-phase0getc.patch +#Patch2: gettext-0.14.1-tempfile.patch Prereq: /sbin/install-info %ifarch x86_64 ppc64 s390x BuildRequires: automake >= 1.8, autoconf >= 2.5 @@ -37,7 +38,7 @@ %package devel Summary: Development files for %{name} -Group: Development/C +Group: Development/Tools License: LGPL Requires: %{name} = %{version}-%{release} Provides: devel(libintl) @@ -55,8 +56,9 @@ %ifarch x86_64 ppc64 s390x %patch0 -p1 -b .x86_64 %endif -%patch1 -p1 -b .phasegetc -%patch2 -p1 -b .tempfile +%patch1 -p1 -b .gcc4 +#%patch1 -p1 -b .phasegetc +#%patch2 -p1 -b .tempfile %build [ -f /usr/share/automake/depcomp ] && cp -f /usr/share/automake/{depcomp,ylwrap} . || : @@ -166,11 +168,13 @@ %defattr(-,root,root) %doc gettext-runtime/ABOUT-NLS AUTHORS gettext-runtime/BUGS %doc COPYING gettext-tools/misc/DISCLAIM README -%doc NEWS THANKS gettext-tools/TODO +%doc NEWS THANKS %doc gettext-runtime/man/*.1.html %doc gettext-runtime/intl/COPYING* /bin/* /usr/bin/* +%exclude %{_bindir}/autopoint +%exclude %{_bindir}/gettextize # These aren't in glibc... %dir /usr/share/locale/en at boldquot @@ -181,7 +185,9 @@ %{_libdir}/libgettextlib*.so %{_libdir}/libgettextsrc*.so %{_infodir}/gettext* -%{_mandir}/*/* +%{_mandir}/man1/* +%exclude %{_mandir}/man1/gettextize.1.gz +%exclude %{_mandir}/man1/autopoint.1.gz #%config %{_libdir}/charset.alias %{_libdir}/%{name} %exclude %{_libdir}/%{name}/gnu.gettext.* @@ -192,6 +198,7 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/projects %{_bindir}/gettextize +%{_bindir}/autopoint %{_datadir}/%{name}/ABOUT-NLS %{_datadir}/%{name}/projects/* %{_datadir}/%{name}/archive.tar.gz @@ -208,12 +215,20 @@ %{_libdir}/lib*.la %{_libdir}/libasprintf.so* %{_libdir}/libgettextpo.so* +%{_mandir}/man1/gettextize.1.gz +%{_mandir}/man1/autopoint.1.gz %{_mandir}/man3/* %{_datadir}/%{name}/libintl.jar %doc gettext-runtime/intl-java/javadoc* %{_libdir}/%{name}/gnu.gettext.* %changelog +* Mon Mar 21 2005 Leon Ho +- fixed compiling problme on gcc4 (#150992) +- fixed Group for -devel (#138303) +- moved gettextize and autopoint to -deel (#137542, #145768) +- moved some of the man pages + * Tue Mar 01 2005 Jakub Jelinek - rebuilt with gcc 4.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gettext/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Sep 2004 05:07:23 -0000 1.8 +++ sources 21 Mar 2005 07:03:22 -0000 1.9 @@ -1 +1,2 @@ 78f4b862510beb2e5d43223dd610e77d gettext-0.14.1.tar.gz +14c2644c2f3b0eb67d5db7ee389547de gettext-0.14.3.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 21 07:04:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 02:04:04 -0500 Subject: rpms/gettext/devel gettext.spec,1.42,1.43 Message-ID: <200503210704.j2L744EA020682@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gettext/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20655 Modified Files: gettext.spec Log Message: 0.14.3 Index: gettext.spec =================================================================== RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gettext.spec 21 Mar 2005 07:03:22 -0000 1.42 +++ gettext.spec 21 Mar 2005 07:04:01 -0000 1.43 @@ -224,6 +224,7 @@ %changelog * Mon Mar 21 2005 Leon Ho +- updated to 0.14.3 - fixed compiling problme on gcc4 (#150992) - fixed Group for -devel (#138303) - moved gettextize and autopoint to -deel (#137542, #145768) From fedora-cvs-commits at redhat.com Mon Mar 21 07:08:35 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 02:08:35 -0500 Subject: rpms/gettext/devel gettext-0.14.3-gcc4.patch,NONE,1.1 Message-ID: <200503210708.j2L78Zm8021098@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gettext/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21089 Added Files: gettext-0.14.3-gcc4.patch Log Message: gcc patch gettext-0.14.3-gcc4.patch: dcigettext.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gettext-0.14.3-gcc4.patch --- Hack by Robert Scheck for gettext >= 0.14.1, which makes gettext rebuildable using gcc 4. --- gettext-0.14.1/gettext-runtime/intl/dcigettext.c 2003-10-16 12:48:24.000000000 +0200 +++ gettext-0.14.1/gettext-runtime/intl/dcigettext.c.gcc4 2005-03-13 18:36:01.000000000 +0100 @@ -151,7 +151,7 @@ # if VMS # define getcwd(buf, max) (getcwd) (buf, max, 0) # else -char *getcwd (); +//char *getcwd (); # endif # endif # ifndef HAVE_STPCPY From fedora-cvs-commits at redhat.com Mon Mar 21 09:13:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 04:13:28 -0500 Subject: rpms/openoffice.org/devel sources,1.43,1.44 Message-ID: <200503210913.j2L9DSs9015544@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15531 Modified Files: sources Log Message: uncompressed dictionaries Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 20 Mar 2005 21:55:13 -0000 1.43 +++ sources 21 Mar 2005 09:13:26 -0000 1.44 @@ -1,3 +1,3 @@ c94a123e4006b410706a5b550f007e93 Archive-Zip-1.13.tar.gz -ba84593fcd9afbf6ddd981cc205ea729 openoffice.org-myspell-contrib.tar.gz 3214ce92e01d5227d33e1e66816fd92a SRC680_m87.tar.bz2 +032cebc4431091ac7023b50c88797ffe openoffice.org-myspell-contrib.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 21 10:06:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 05:06:59 -0500 Subject: rpms/elinks/devel .cvsignore, 1.13, 1.14 elinks.spec, 1.21, 1.22 sources, 1.13, 1.14 Message-ID: <200503211006.j2LA6xZQ011564@cvs.devel.redhat.com> Update of /cvs/dist/rpms/elinks/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11549 Modified Files: .cvsignore elinks.spec sources Log Message: -sync with upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/elinks/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 8 Feb 2005 12:59:23 -0000 1.13 +++ .cvsignore 21 Mar 2005 10:06:57 -0000 1.14 @@ -1,2 +1,2 @@ -elinks-0.10.2.tar.bz2 +elinks-0.10.3.tar.bz2 manual-0.82-en.tar.bz2 Index: elinks.spec =================================================================== RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- elinks.spec 5 Mar 2005 12:10:14 -0000 1.21 +++ elinks.spec 21 Mar 2005 10:06:57 -0000 1.22 @@ -1,8 +1,8 @@ %define rescue %{nil} Name: elinks Summary: A text-mode Web browser. -Version: 0.10.2 -Release: 2 +Version: 0.10.3 +Release: 1 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 @@ -79,6 +79,9 @@ %{_mandir}/man5/* %changelog +* Mon Mar 21 2005 Karel Zak 0.10.3-1 +- sync with upstream; stable 0.10.3 + * Sat Mar 5 2005 Karel Zak 0.10.2-2 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/elinks/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Feb 2005 12:59:23 -0000 1.13 +++ sources 21 Mar 2005 10:06:57 -0000 1.14 @@ -1,2 +1,2 @@ -7bf8981fb7502f3411bd114061751994 elinks-0.10.2.tar.bz2 +78a12a5500c3e726aa7365cca216e880 elinks-0.10.3.tar.bz2 947950d4974c25f95f1a3988bf88cb21 manual-0.82-en.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 21 10:19:32 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 05:19:32 -0500 Subject: rpms/rpm/devel rpm-4.4.1-fileconflicts.patch,NONE,1.1 Message-ID: <200503211019.j2LAJWsB014862@cvs.devel.redhat.com> Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14843 Added Files: rpm-4.4.1-fileconflicts.patch Log Message: Patch to revert to file conflicts behaviour rpm-4.4.1-fileconflicts.patch: poptI.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) --- NEW FILE rpm-4.4.1-fileconflicts.patch --- --- rpm-4.4.1/lib/poptI.c.conflicts 2005-03-21 10:19:45.000000000 +0000 +++ rpm-4.4.1/lib/poptI.c 2005-03-21 10:19:52.000000000 +0000 @@ -16,8 +16,7 @@ /*@unchecked@*/ struct rpmInstallArguments_s rpmIArgs = { 0, /* transFlags */ - /* probFilter */ - (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES), + 0, /* probFilter */ 0, /* installInterfaceFlags */ 0, /* eraseInterfaceFlags */ 0, /* qva_flags */ From fedora-cvs-commits at redhat.com Mon Mar 21 11:09:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 06:09:10 -0500 Subject: rpms/gphoto2/devel gphoto2-memset.patch, NONE, 1.1 gphoto2.spec, 1.22, 1.23 Message-ID: <200503211109.j2LB9AS0007830@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7815 Modified Files: gphoto2.spec Added Files: gphoto2-memset.patch Log Message: * Mon Mar 21 2005 Tim Waugh - Fixed memset() usage bug. gphoto2-memset.patch: commands.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gphoto2-memset.patch --- --- gphoto2-2.1.5/libgphoto2-2.1.5/camlibs/digita/commands.c.memset 2005-03-21 11:06:23.000000000 +0000 +++ gphoto2-2.1.5/libgphoto2-2.1.5/camlibs/digita/commands.c 2005-03-21 11:07:09.000000000 +0000 @@ -41,7 +41,7 @@ static void build_command(struct digita_command *cmd, int length, short command) { - memset(cmd, sizeof(*cmd), 0); + memset(cmd, 0, sizeof(*cmd)); /* Length is the sizeof the digita_command minus the length */ /* parameter, plus whatever other data we send */ Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gphoto2.spec 11 Mar 2005 23:05:22 -0000 1.22 +++ gphoto2.spec 21 Mar 2005 11:09:08 -0000 1.23 @@ -13,6 +13,7 @@ Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.gz Patch1: gphoto2-hotplug.patch Patch2: gphoto2-gcc4.patch +Patch3: gphoto2-memset.patch Url: http://www.gphoto.org/ ExcludeArch: s390 s390x # For /etc/hotplug/usb.. @@ -71,6 +72,7 @@ %setup -q -a 1 %patch1 -p1 -b .hotplug %patch2 -p1 -b .gcc4 +%patch3 -p1 -b .memset #################################### %build @@ -200,6 +202,9 @@ # ChangeLog ######################################################################## %changelog +* Mon Mar 21 2005 Tim Waugh +- Fixed memset() usage bug. + * Fri Mar 11 2005 Tim Waugh - Re-enable docs. From fedora-cvs-commits at redhat.com Mon Mar 21 11:28:20 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 06:28:20 -0500 Subject: rpms/mtools/devel mtools-memset.patch, NONE, 1.1 mtools.spec, 1.15, 1.16 Message-ID: <200503211128.j2LBSKAL021981@cvs.devel.redhat.com> Update of /cvs/dist/rpms/mtools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21954 Modified Files: mtools.spec Added Files: mtools-memset.patch Log Message: * Mon Mar 21 2005 Tim Waugh - Fixed memset() usage bug. mtools-memset.patch: fat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE mtools-memset.patch --- --- mtools-3.9.9/fat.c.memset 2005-03-21 11:23:10.000000000 +0000 +++ mtools-3.9.9/fat.c 2005-03-21 11:23:36.000000000 +0000 @@ -437,8 +437,8 @@ InfoSector_t *infoSector; infoSector = (InfoSector_t *) safe_malloc(This->sector_size); set_dword(infoSector->signature1, INFOSECT_SIGNATURE1); - memset(infoSector->filler1, sizeof(infoSector->filler1),0); - memset(infoSector->filler2, sizeof(infoSector->filler2),0); + memset(infoSector->filler1, 0, sizeof(infoSector->filler1)); + memset(infoSector->filler2, 0, sizeof(infoSector->filler2)); set_dword(infoSector->signature2, INFOSECT_SIGNATURE2); set_dword(infoSector->pos, This->last); set_dword(infoSector->count, This->freeSpace); Index: mtools.spec =================================================================== RCS file: /cvs/dist/rpms/mtools/devel/mtools.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mtools.spec 15 Mar 2005 11:32:02 -0000 1.15 +++ mtools.spec 21 Mar 2005 11:28:18 -0000 1.16 @@ -13,6 +13,7 @@ Patch3: mtools-3.9.7-bigdisk.patch Patch4: mtools-3.9.9-noargs.patch Patch5: mtools-3.9.9-badc.patch +Patch6: mtools-memset.patch Prereq: /sbin/install-info BuildRequires: texinfo @@ -33,6 +34,7 @@ %patch3 -p1 -b .big %patch4 -p1 -b .noargs %patch5 -p1 -b .badc +%patch6 -p1 -b .memset %build %configure @@ -68,6 +70,9 @@ %{_infodir}/* %changelog +* Mon Mar 21 2005 Tim Waugh +- Fixed memset() usage bug. + * Tue Mar 15 2005 Tim Waugh 3.9.9-12 - Fix build (bug #151135). From fedora-cvs-commits at redhat.com Mon Mar 21 11:38:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 06:38:44 -0500 Subject: rpms/mtools/devel mtools.spec,1.16,1.17 Message-ID: <200503211138.j2LBciKr022050@cvs.devel.redhat.com> Update of /cvs/dist/rpms/mtools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22037 Modified Files: mtools.spec Log Message: 3.9.9-13 Index: mtools.spec =================================================================== RCS file: /cvs/dist/rpms/mtools/devel/mtools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mtools.spec 21 Mar 2005 11:28:18 -0000 1.16 +++ mtools.spec 21 Mar 2005 11:38:42 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Programs for accessing MS-DOS disks without mounting the disks. Name: mtools Version: 3.9.9 -Release: 12 +Release: 13 License: GPL Group: Applications/System Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2 @@ -70,7 +70,7 @@ %{_infodir}/* %changelog -* Mon Mar 21 2005 Tim Waugh +* Mon Mar 21 2005 Tim Waugh 3.9.9-13 - Fixed memset() usage bug. * Tue Mar 15 2005 Tim Waugh 3.9.9-12 From fedora-cvs-commits at redhat.com Mon Mar 21 11:42:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 06:42:38 -0500 Subject: rpms/rpm/devel rpm.spec,1.152,1.153 Message-ID: <200503211142.j2LBgcaM022143@cvs.devel.redhat.com> Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22130 Modified Files: rpm.spec Log Message: Fileconflicts as in FC3 Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- rpm.spec 17 Mar 2005 20:39:47 -0000 1.152 +++ rpm.spec 21 Mar 2005 11:42:36 -0000 1.153 @@ -20,13 +20,14 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 7 +Release: 8 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch Patch1: rpm-4.4.1-gcc4.patch Patch2: rpm-4.4.1-hkp-disable.patch Patch3: rpm-4.4.1-read-macro.patch +Patch4: rpm-4.4.1-fileconflicts.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -78,6 +79,7 @@ Requires: beecrypt >= 4.1.2 Requires: neon-devel Requires: sqlite-devel +Requires: libselinux-devel %description devel This package contains the RPM C library and header files. These @@ -138,6 +140,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 -b .fileconflicts %build @@ -508,6 +511,10 @@ %{__includedir}/popt.h %changelog +* Mon Mar 21 2005 Paul Nasrat 4.4.1-8 +- Add devel requires libselinux-devel +- Fileconflicts as FC3 (#151609) + * Wed Mar 9 2005 Jeff Johnson 4.4.1-7 - rebuild against renamed sqlite package (#149719). From fedora-cvs-commits at redhat.com Mon Mar 21 12:20:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 07:20:31 -0500 Subject: rpms/gcc/devel gcc4-pr20290.patch, NONE, 1.1 gcc4-rh151466.patch, NONE, 1.1 .cvsignore, 1.76, 1.77 gcc4-pr16104.patch, 1.1, 1.2 gcc4.spec, 1.16, 1.17 sources, 1.77, 1.78 gcc4-ada-makej.patch, 1.1, NONE gcc4-libjawt.patch, 1.2, NONE gcc4-rh150150.patch, 1.1, NONE Message-ID: <200503211220.j2LCKVd5007317@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7283 Modified Files: .cvsignore gcc4-pr16104.patch gcc4.spec sources Added Files: gcc4-pr20290.patch gcc4-rh151466.patch Removed Files: gcc4-ada-makej.patch gcc4-libjawt.patch gcc4-rh150150.patch Log Message: 4.0.0-0.35 gcc4-pr20290.patch: loop.c | 22 +++++++--- testsuite/gcc.c-torture/execute/loop-ivopts-2.c | 50 ++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 7 deletions(-) --- NEW FILE gcc4-pr20290.patch --- 2005-03-20 Alexandre Oliva PR rtl-optimization/20290 * loop.c (for_each_insn_in_loop): Don't assume the loop body runs in every iteration if the entry point is the exit test. * gcc.c-torture/execute/loop-ivopts-2.c: New. --- gcc/loop.c 17 Jan 2005 08:46:15 -0000 1.522 +++ gcc/loop.c 20 Mar 2005 06:36:43 -0000 @@ -4655,12 +4655,18 @@ for_each_insn_in_loop (struct loop *loop int not_every_iteration = 0; int maybe_multiple = 0; int past_loop_latch = 0; + bool exit_test_is_entry = false; rtx p; - /* If loop_scan_start points to the loop exit test, we have to be wary of - subversive use of gotos inside expression statements. */ + /* If loop_scan_start points to the loop exit test, the loop body + cannot be counted on running on every iteration, and we have to + be wary of subversive use of gotos inside expression + statements. */ if (prev_nonnote_insn (loop->scan_start) != prev_nonnote_insn (loop->start)) - maybe_multiple = back_branch_in_range_p (loop, loop->scan_start); + { + exit_test_is_entry = true; + maybe_multiple = back_branch_in_range_p (loop, loop->scan_start); + } /* Scan through loop and update NOT_EVERY_ITERATION and MAYBE_MULTIPLE. */ for (p = next_insn_in_loop (loop, loop->scan_start); @@ -4718,10 +4724,12 @@ for_each_insn_in_loop (struct loop *loop beginning, don't set not_every_iteration for that. This can be any kind of jump, since we want to know if insns will be executed if the loop is executed. */ - && !(JUMP_LABEL (p) == loop->top - && ((NEXT_INSN (NEXT_INSN (p)) == loop->end - && any_uncondjump_p (p)) - || (NEXT_INSN (p) == loop->end && any_condjump_p (p))))) + && (exit_test_is_entry + || !(JUMP_LABEL (p) == loop->top + && ((NEXT_INSN (NEXT_INSN (p)) == loop->end + && any_uncondjump_p (p)) + || (NEXT_INSN (p) == loop->end + && any_condjump_p (p)))))) { rtx label = 0; --- gcc/testsuite/gcc.c-torture/execute/loop-ivopts-2.c 1 Jan 1970 00:00:00 -0000 +++ gcc/testsuite/gcc.c-torture/execute/loop-ivopts-2.c 20 Mar 2005 06:36:58 -0000 @@ -0,0 +1,50 @@ +/* PR rtl-optimization/20290 */ + +/* We used to mis-optimize the second loop in main on at least ppc and + arm, because tree loop would change the loop to something like: + + ivtmp.65 = &l[i]; + ivtmp.16 = 113; + goto (); + +:; + *(ivtmp.65 + 4294967292B) = 9; + i = i + 1; + +:; + ivtmp.16 = ivtmp.16 - 1; + ivtmp.65 = ivtmp.65 + 4B; + if (ivtmp.16 != 0) goto ; + + We used to consider the increment of i as executed in every + iteration, so we'd miscompute the final value. */ + +extern void abort (void); + +void +check (unsigned int *l) +{ + int i; + for (i = 0; i < 288; i++) + if (l[i] != 7 + (i < 256 || i >= 280) + (i >= 144 && i < 256)) + abort (); +} + +int +main (void) +{ + int i; + unsigned int l[288]; + + for (i = 0; i < 144; i++) + l[i] = 8; + for (; i < 256; i++) + l[i] = 9; + for (; i < 280; i++) + l[i] = 7; + for (; i < 288; i++) + l[i] = 8; + check (l); + return 0; +} + gcc4-rh151466.patch: cfglayout.c | 6 ++++ final.c | 20 ++++++++++----- testsuite/gcc.dg/20050321-1.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 7 deletions(-) --- NEW FILE gcc4-rh151466.patch --- 2005-03-21 Jakub Jelinek * cfglayout.c (reemit_insn_block_notes): Don't put block notes in between jump table and its label. * final.c (shorten_branches): Handle notes in between ADDR_VEC resp. ADDR_DIFF_VEC and the label preceeding it. (final_scan_insn): Likewise. Ensure ADDR_VEC resp. ADDR_DIFF_VEC is emitted in the right section. * gcc.dg/20050321-1.c: New test. --- gcc/cfglayout.c.jj 2004-12-07 09:41:35.000000000 +0100 +++ gcc/cfglayout.c 2005-03-21 12:15:30.000000000 +0100 @@ -523,6 +523,12 @@ reemit_insn_block_notes (void) { tree this_block; + /* Avoid putting scope notes between jump table and its label. */ + if (JUMP_P (insn) + && (GET_CODE (PATTERN (insn)) == ADDR_VEC + || GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC)) + continue; + this_block = insn_scope (insn); /* For sequences compute scope resulting from merging all scopes of instructions nested inside. */ --- gcc/final.c.jj 2004-11-27 10:34:59.000000000 +0100 +++ gcc/final.c 2005-03-21 11:49:23.000000000 +0100 @@ -835,7 +835,7 @@ shorten_branches (rtx first ATTRIBUTE_UN max_log = log; max_skip = LABEL_ALIGN_MAX_SKIP; } - next = NEXT_INSN (insn); + next = next_nonnote_insn (insn); /* ADDR_VECs only take room if read-only data goes into the text section. */ if (JUMP_TABLES_IN_TEXT_SECTION || !HAVE_READONLY_DATA_SECTION) @@ -1677,6 +1677,7 @@ final_scan_insn (rtx insn, FILE *file, i #ifdef HAVE_cc0 rtx set; #endif + rtx next; insn_counter++; @@ -1932,10 +1933,11 @@ final_scan_insn (rtx insn, FILE *file, i fputs (ASM_APP_OFF, file); app_on = 0; } - if (NEXT_INSN (insn) != 0 - && JUMP_P (NEXT_INSN (insn))) + + next = next_nonnote_insn (insn); + if (next != 0 && JUMP_P (next)) { - rtx nextbody = PATTERN (NEXT_INSN (insn)); + rtx nextbody = PATTERN (next); /* If this label is followed by a jump-table, make sure we put the label in the read-only section. Also @@ -1956,7 +1958,7 @@ final_scan_insn (rtx insn, FILE *file, i targetm.asm_out.function_rodata_section (current_function_decl); #ifdef ADDR_VEC_ALIGN - log_align = ADDR_VEC_ALIGN (NEXT_INSN (insn)); + log_align = ADDR_VEC_ALIGN (next); #else log_align = exact_log2 (BIGGEST_ALIGNMENT / BITS_PER_UNIT); #endif @@ -1967,7 +1969,7 @@ final_scan_insn (rtx insn, FILE *file, i #ifdef ASM_OUTPUT_CASE_LABEL ASM_OUTPUT_CASE_LABEL (file, "L", CODE_LABEL_NUMBER (insn), - NEXT_INSN (insn)); + next); #else targetm.asm_out.internal_label (file, "L", CODE_LABEL_NUMBER (insn)); #endif @@ -2022,6 +2024,11 @@ final_scan_insn (rtx insn, FILE *file, i if (prescan > 0) break; + if (! JUMP_TABLES_IN_TEXT_SECTION) + targetm.asm_out.function_rodata_section (current_function_decl); + else + function_section (current_function_decl); + if (app_on) { fputs (ASM_APP_OFF, file); @@ -2157,7 +2164,6 @@ final_scan_insn (rtx insn, FILE *file, i { /* A delayed-branch sequence */ int i; - rtx next; if (prescan > 0) break; --- gcc/testsuite/gcc.dg/20050321-1.c.jj 2005-03-21 11:55:33.000000000 +0100 +++ gcc/testsuite/gcc.dg/20050321-1.c 2005-03-21 11:54:55.000000000 +0100 @@ -0,0 +1,54 @@ +/* This testcase could not assemble on ppc32, because the compiler assumed + the huge ADDR_DIFF_VEC will be emitted into rodata section, yet because + of some notes inserted between jump table's CODE_LABEL and the jump table + it ended up in the .text section and thus shorten_branches couldn't + figure out branch to lab is too far. */ +/* { dg-do link } */ +/* { dg-options "-g1 -fpic" } */ + +#define A(n) \ + case n##1: return n##1 * 131 + 63; \ + case n##3: return n##3 * 1231 + 182; \ + case n##5: return n##5 * 351 + 1; \ + case n##7: return n##7 * 312 + 61; \ + case n##9: return n##9 * 17 - 1; +#define B(n) \ +A(n##0) A(n##1) A(n##2) A(n##3) A(n##4) \ +A(n##5) A(n##6) A(n##7) A(n##8) A(n##9) +#define C(n) \ +B(n##0) B(n##1) B(n##2) B(n##3) B(n##4) \ +B(n##5) B(n##6) B(n##7) B(n##8) B(n##9) +#define D(n) \ +C(n##0) C(n##1) B(n##20) B(n##21) B(n##22) + +int +foo (int x) +{ + { +lab:; + int a = x; + while (a < 60000) + { + int b = a; + { + int c = b; + switch (c) + { + D(1) + default: break; + } + } + a += 10000; + if (a == 4168) + goto lab; + } + } + return x; +} + +int +main (void) +{ + foo (71); + return 0; +} Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- .cvsignore 15 Mar 2005 17:23:22 -0000 1.76 +++ .cvsignore 21 Mar 2005 12:20:28 -0000 1.77 @@ -1 +1 @@ -gcc-4.0.0-20050315.tar.bz2 +gcc-4.0.0-20050321.tar.bz2 gcc4-pr16104.patch: fold-const.c | 14 +++- testsuite/gcc.c-torture/execute/20050316-1.c | 69 +++++++++++++++++++++ testsuite/gcc.c-torture/execute/20050316-2.c | 49 +++++++++++++++ testsuite/gcc.c-torture/execute/20050316-3.c | 36 +++++++++++ testsuite/gcc.dg/torture/pr16104-1.c | 88 +++++++++++++++++++++++++++ 5 files changed, 253 insertions(+), 3 deletions(-) Index: gcc4-pr16104.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc4-pr16104.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc4-pr16104.patch 28 Feb 2005 12:48:42 -0000 1.1 +++ gcc4-pr16104.patch 21 Mar 2005 12:20:28 -0000 1.2 @@ -1,51 +1,134 @@ -2005-01-13 Jakub Jelinek +2005-03-16 Richard Henderson + Jakub Jelinek PR rtl-optimization/16104 - * expr.c (convert_move): Handle vector from resp. to if mode - sizes differ. + * fold-const.c (fold_unary): Fix folding of vector conversions. - * gcc.c-torture/execute/20050113-1.c: New test. + * gcc.c-torture/execute/20050316-1.c: New test. + * gcc.c-torture/execute/20050316-2.c: New test. + * gcc.c-torture/execute/20050316-3.c: New test. + * gcc.dg/torture/pr16104-1.c: New test. ---- gcc/expr.c.jj 2005-01-04 15:41:28.000000000 +0100 -+++ gcc/expr.c 2005-01-13 14:38:42.431843676 +0100 -@@ -364,7 +364,27 @@ convert_move (rtx to, rtx from, int unsi +--- gcc/fold-const.c.jj 2005-03-10 15:42:58.000000000 +0100 ++++ gcc/fold-const.c 2005-03-16 09:43:50.777071142 +0100 +@@ -6874,16 +6874,19 @@ fold (tree expr) + int inside_int = INTEGRAL_TYPE_P (inside_type); + int inside_ptr = POINTER_TYPE_P (inside_type); + int inside_float = FLOAT_TYPE_P (inside_type); ++ int inside_vec = TREE_CODE (inside_type) == VECTOR_TYPE; + unsigned int inside_prec = TYPE_PRECISION (inside_type); + int inside_unsignedp = TYPE_UNSIGNED (inside_type); + int inter_int = INTEGRAL_TYPE_P (inter_type); + int inter_ptr = POINTER_TYPE_P (inter_type); + int inter_float = FLOAT_TYPE_P (inter_type); ++ int inter_vec = TREE_CODE (inter_type) == VECTOR_TYPE; + unsigned int inter_prec = TYPE_PRECISION (inter_type); + int inter_unsignedp = TYPE_UNSIGNED (inter_type); + int final_int = INTEGRAL_TYPE_P (type); + int final_ptr = POINTER_TYPE_P (type); + int final_float = FLOAT_TYPE_P (type); ++ int final_vec = TREE_CODE (type) == VECTOR_TYPE; + unsigned int final_prec = TYPE_PRECISION (type); + int final_unsignedp = TYPE_UNSIGNED (type); - if (VECTOR_MODE_P (to_mode) || VECTOR_MODE_P (from_mode)) - { -- gcc_assert (GET_MODE_BITSIZE (from_mode) == GET_MODE_BITSIZE (to_mode)); -+ if (GET_MODE_BITSIZE (from_mode) != GET_MODE_BITSIZE (to_mode)) -+ { -+ if (VECTOR_MODE_P (from_mode)) -+ { -+ enum machine_mode new_mode; -+ -+ new_mode = mode_for_size (GET_MODE_BITSIZE (from_mode), -+ MODE_INT, 0); -+ from = simplify_gen_subreg (new_mode, from, from_mode, 0); -+ } -+ if (VECTOR_MODE_P (to_mode)) -+ { -+ enum machine_mode new_mode; -+ -+ new_mode = mode_for_size (GET_MODE_BITSIZE (to_mode), -+ MODE_INT, 0); -+ to = simplify_gen_subreg (new_mode, to, to_mode, 0); -+ } -+ convert_move (to, from, unsignedp); -+ return; -+ } +@@ -6904,12 +6907,15 @@ fold (tree expr) + since then we sometimes need the inner conversion. Likewise if + the outer has a precision not equal to the size of its mode. */ + if ((((inter_int || inter_ptr) && (inside_int || inside_ptr)) +- || (inter_float && inside_float)) ++ || (inter_float && inside_float) ++ || (inter_vec && inside_vec)) + && inter_prec >= inside_prec +- && (inter_float || inter_unsignedp == inside_unsignedp) ++ && (inter_float || inter_vec ++ || inter_unsignedp == inside_unsignedp) + && ! (final_prec != GET_MODE_BITSIZE (TYPE_MODE (type)) + && TYPE_MODE (type) == TYPE_MODE (inter_type)) +- && ! final_ptr) ++ && ! final_ptr ++ && (! final_vec || inter_prec == inside_prec)) + return fold (build1 (code, type, + TREE_OPERAND (TREE_OPERAND (t, 0), 0))); - if (VECTOR_MODE_P (to_mode)) - from = simplify_gen_subreg (to_mode, from, GET_MODE (from), 0); ---- gcc/testsuite/gcc.c-torture/execute/20050113-1.c.jj 2005-01-13 15:51:09.194383356 +0100 -+++ gcc/testsuite/gcc.c-torture/execute/20050113-1.c 2005-01-13 15:37:22.000000000 +0100 -@@ -0,0 +1,56 @@ +@@ -6923,6 +6929,7 @@ fold (tree expr) + + /* Two conversions in a row are not needed unless: + - some conversion is floating-point (overstrict for now), or ++ - some conversion is a vector (overstrict for now), or + - the intermediate type is narrower than both initial and + final, or + - the intermediate type and innermost type differ in signedness, +@@ -6932,6 +6939,7 @@ fold (tree expr) + - the final type is a pointer type and the precisions of the + initial and intermediate types differ. */ + if (! inside_float && ! inter_float && ! final_float ++ && ! inside_vec && ! inter_vec && ! final_vec + && (inter_prec > inside_prec || inter_prec > final_prec) + && ! (inside_int && inter_int + && inter_unsignedp != inside_unsignedp +--- gcc/testsuite/gcc.c-torture/execute/20050316-2.c.jj 2005-03-16 10:49:04.602767006 +0100 ++++ gcc/testsuite/gcc.c-torture/execute/20050316-2.c 2005-03-16 10:46:39.000000000 +0100 +@@ -0,0 +1,49 @@ ++extern void abort (void); ++ ++typedef int V2SI __attribute__ ((vector_size (8))); ++typedef unsigned int V2USI __attribute__ ((vector_size (8))); ++typedef float V2SF __attribute__ ((vector_size (8))); ++typedef short V2HI __attribute__ ((vector_size (4))); ++typedef unsigned int V2UHI __attribute__ ((vector_size (4))); ++ ++long long ++test1 (V2SF x) ++{ ++ return (long long) (V2SI) x; ++} ++ ++long long ++test2 (V2SF x) ++{ ++ return (long long) x; ++} ++ ++long long ++test3 (V2SI x) ++{ ++ return (long long) (V2SF) x; ++} ++ ++int ++main (void) ++{ ++ if (sizeof (short) != 2 || sizeof (int) != 4 || sizeof (long long) != 8) ++ return 0; ++ ++ V2SF x = { 2.0, 2.0 }; ++ union { long long l; float f[2]; int i[2]; } u; ++ u.l = test1 (x); ++ if (u.f[0] != 2.0 || u.f[1] != 2.0) ++ abort (); ++ ++ V2SF y = { 6.0, 6.0 }; ++ u.l = test2 (y); ++ if (u.f[0] != 6.0 || u.f[1] != 6.0) ++ abort (); ++ ++ V2SI z = { 4, 4 }; ++ u.l = test3 (z); ++ if (u.i[0] != 4 || u.i[1] != 4) ++ abort (); ++ return 0; ++} +--- gcc/testsuite/gcc.c-torture/execute/20050316-1.c.jj 2005-03-16 10:48:52.510920288 +0100 ++++ gcc/testsuite/gcc.c-torture/execute/20050316-1.c 2005-03-16 10:28:44.000000000 +0100 +@@ -0,0 +1,69 @@ +/* PR rtl-optimization/16104 */ + +extern void abort (void); + +typedef int V2SI __attribute__ ((vector_size (8))); ++typedef unsigned int V2USI __attribute__ ((vector_size (8))); +typedef short V2HI __attribute__ ((vector_size (4))); ++typedef unsigned int V2UHI __attribute__ ((vector_size (4))); + +int +test1 (void) @@ -71,12 +154,134 @@ + return (V2SI) (long long) (int) x; +} + ++V2SI ++test5 (V2USI x) ++{ ++ return (V2SI) x; ++} ++ ++int ++main (void) ++{ ++ if (sizeof (short) != 2 || sizeof (int) != 4 || sizeof (long long) != 8) ++ return 0; ++ ++ if (test1 () != 0) ++ abort (); ++ ++ V2SI x = { 2, 2 }; ++ if (test2 (x) != 2) ++ abort (); ++ ++ union { V2SI x; int y[2]; V2USI z; long long l; } u; ++ u.x = test3 (); ++ if (u.y[0] != 0 || u.y[1] != 0) ++ abort (); ++ ++ V2HI y = { 4, 4 }; ++ union { V2SI x; long long y; } v; ++ v.x = test4 (y); ++ if (v.y != 0x40004) ++ abort (); ++ ++ V2USI z = { 6, 6 }; ++ u.x = test5 (z); ++ if (u.y[0] != 6 || u.y[1] != 6) ++ abort (); ++ return 0; ++} +--- gcc/testsuite/gcc.c-torture/execute/20050316-3.c.jj 2005-03-16 10:49:19.461121066 +0100 ++++ gcc/testsuite/gcc.c-torture/execute/20050316-3.c 2005-03-16 10:30:06.000000000 +0100 +@@ -0,0 +1,36 @@ ++extern void abort (void); ++ ++typedef int V2SI __attribute__ ((vector_size (8))); ++typedef unsigned int V2USI __attribute__ ((vector_size (8))); ++typedef short V2HI __attribute__ ((vector_size (4))); ++typedef unsigned int V2UHI __attribute__ ((vector_size (4))); ++ ++V2USI ++test1 (V2SI x) ++{ ++ return (V2USI) (V2SI) (long long) x; ++} ++ ++long long ++test2 (V2SI x) ++{ ++ return (long long) (V2USI) (V2SI) (long long) x; ++} ++ +int +main (void) +{ + if (sizeof (short) != 2 || sizeof (int) != 4 || sizeof (long long) != 8) + return 0; + ++ union { V2SI x; int y[2]; V2USI z; long long l; } u; ++ V2SI a = { -3, -3 }; ++ u.z = test1 (a); ++ if (u.y[0] != -3 || u.y[1] != -3) ++ abort (); ++ ++ u.l = test2 (a); ++ if (u.y[0] != -3 || u.y[1] != -3) ++ abort (); ++ return 0; ++} +--- gcc/testsuite/gcc.dg/torture/pr16104-1.c.jj 2005-03-16 10:55:22.351496535 +0100 ++++ gcc/testsuite/gcc.dg/torture/pr16104-1.c 2005-03-16 10:55:13.746029061 +0100 +@@ -0,0 +1,88 @@ ++/* PR rtl-optimization/16104 */ ++/* { dg-do run { target i?86-*-* x86_64-*-* } } */ ++/* { dg-options "-msse2" } */ ++ ++#include "../i386-cpuid.h" ++ ++extern void abort (void); ++ ++typedef int V2SI __attribute__ ((vector_size (8))); ++typedef unsigned int V2USI __attribute__ ((vector_size (8))); ++typedef short V2HI __attribute__ ((vector_size (4))); ++typedef unsigned int V2UHI __attribute__ ((vector_size (4))); ++ ++int ++test1 (void) ++{ ++ return (long long) (V2SI) 0LL; ++} ++ ++int ++test2 (V2SI x) ++{ ++ return (long long) x; ++} ++ ++V2SI ++test3 (void) ++{ ++ return (V2SI) (long long) (int) (V2HI) 0; ++} ++ ++V2SI ++test4 (V2HI x) ++{ ++ return (V2SI) (long long) (int) x; ++} ++ ++V2SI ++test5 (V2USI x) ++{ ++ return (V2SI) x; ++} ++ ++int ++__attribute__ ((noinline)) ++do_test (void) ++{ ++ if (sizeof (short) != 2 || sizeof (int) != 4 || sizeof (long long) != 8) ++ return 0; ++ + if (test1 () != 0) + abort (); + @@ -84,7 +289,7 @@ + if (test2 (x) != 2) + abort (); + -+ union { V2SI x; int y[2]; } u; ++ union { V2SI x; int y[2]; V2USI z; long long l; } u; + u.x = test3 (); + if (u.y[0] != 0 || u.y[1] != 0) + abort (); @@ -94,5 +299,24 @@ + v.x = test4 (y); + if (v.y != 0x40004) + abort (); ++ ++ V2USI z = { 6, 6 }; ++ u.x = test5 (z); ++ if (u.y[0] != 6 || u.y[1] != 6) ++ abort (); + return 0; +} ++ ++int ++main (void) ++{ ++ unsigned long cpu_facilities; ++ ++ cpu_facilities = i386_cpuid (); ++ ++ if ((cpu_facilities & (bit_MMX | bit_SSE | bit_CMOV | bit_SSE2)) ++ != (bit_MMX | bit_SSE | bit_CMOV | bit_SSE2)) ++ return 0; ++ ++ return do_test (); ++} Index: gcc4.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc4.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gcc4.spec 15 Mar 2005 17:52:56 -0000 1.16 +++ gcc4.spec 21 Mar 2005 12:20:28 -0000 1.17 @@ -1,6 +1,6 @@ -%define DATE 20050315 +%define DATE 20050321 %define gcc_version 4.0.0 -%define gcc_release 0.34 +%define gcc_release 0.35 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} alpha ia64 x86_64 s390 @@ -77,13 +77,12 @@ Patch5: gcc4-pr16104.patch Patch6: gcc4-pr19769-workaround.patch Patch7: gcc4-java-nomulti.patch -Patch8: gcc4-libjawt.patch -Patch9: gcc4-c++-pr19317.patch -Patch10: gcc4-rh150150.patch -Patch11: gcc4-pr20126.patch -Patch12: gcc4-pr20249.patch -Patch13: gcc4-c++-pr20381.patch -Patch14: gcc4-ada-makej.patch +Patch8: gcc4-c++-pr19317.patch +Patch9: gcc4-pr20126.patch +Patch10: gcc4-pr20249.patch +Patch11: gcc4-c++-pr20381.patch +Patch12: gcc4-pr20290.patch +Patch13: gcc4-rh151466.patch %define _gnu %{nil} %ifarch sparc @@ -97,11 +96,11 @@ %endif %description -The gcc package contains the GNU Compiler Collection version 3.4. +The gcc package contains the GNU Compiler Collection version 4.0. You'll need this package in order to compile C code. %package -n libgcc -Summary: GCC version 3.4 shared support library +Summary: GCC version 4.0 shared support library Group: System Environment/Libraries Autoreq: false @@ -113,8 +112,8 @@ Summary: C++ support for GCC Group: Development/Languages Requires: gcc = %{version}-%{release} -Requires: libstdc++ = %{version} -Requires: libstdc++-devel = %{version} +Requires: libstdc++ = %{version}-%{release} +Requires: libstdc++-devel = %{version}-%{release} Obsoletes: gcc3-c++ Obsoletes: gcc34-c++ Obsoletes: gcc35-c++ @@ -180,6 +179,7 @@ Group: Development/Languages Requires: gcc = %{version}-%{release} Requires: libgfortran = %{version}-%{release} +BuildRequires: gmp-devel >= 4.1.2-8 Prereq: /sbin/install-info Obsoletes: gcc3-g77 Obsoletes: gcc-g77 @@ -226,7 +226,8 @@ Summary: Java support for GCC Group: Development/Languages Requires: gcc = %{version}-%{release} -Requires: libgcj >= %{version}, libgcj-devel >= %{version}, zlib-devel +Requires: libgcj = %{version}-%{release} +Requires: libgcj-devel = %{version}-%{release}, zlib-devel Obsoletes: gcc3-java Obsoletes: gcc34-java Obsoletes: gcc35-java @@ -264,7 +265,7 @@ %package -n libgcj-devel Summary: Libraries for Java development using GCC Group: Development/Languages -Requires: zip >= 2.1, libgcj = %{version} +Requires: zip >= 2.1, libgcj = %{version}-%{release} Obsoletes: libgcj3-devel Obsoletes: libgcj34-devel Obsoletes: libgcj4-devel @@ -398,13 +399,10 @@ %patch5 -p0 -b .pr16104~ %patch6 -p0 -b .pr19769-workaround~ %patch7 -p0 -b .java-nomulti~ -%patch8 -p0 -b .libjawt~ -%patch9 -p0 -b .c++-pr19317~ -%patch10 -p0 -b .rh150150~ -%patch11 -p0 -b .pr20126~ -%patch12 -p0 -b .pr20249~ -%patch13 -p0 -b .c++-pr20381~ -%patch14 -p0 -b .ada-makej~ +%patch8 -p0 -b .c++-pr19317~ +%patch9 -p0 -b .pr20126~ +%patch10 -p0 -b .pr20249~ +%patch11 -p0 -b .c++-pr20381~ perl -pi -e 's/4\.0\.0/4.0.0/' gcc/version.c perl -pi -e 's/"%{gcc_version}"/"%{gcc_version} \(release\)"/' gcc/version.c @@ -836,7 +834,7 @@ exit 1;; esac done -exec %{_prefix}/bin/gcc $fl ${1+"$@"} +exec gcc $fl ${1+"$@"} EOF cat > $RPM_BUILD_ROOT%{_prefix}/bin/c99 <<"EOF" #!/bin/sh @@ -848,7 +846,7 @@ exit 1;; esac done -exec %{_prefix}/bin/gcc $fl ${1+"$@"} +exec gcc $fl ${1+"$@"} EOF chmod 755 $RPM_BUILD_ROOT%{_prefix}/bin/c?9 @@ -1376,6 +1374,21 @@ %endif %changelog +* Mon Mar 21 2005 Jakub Jelinek 4.0.0-0.35 +- update from CVS + - PRs ada/18727, ada/19140, ada/19408, ada/19900, ada/20255, ada/20344, + c++/20240, c++/20333, fortran/18525, fortran/18827, java/20522, + libfortran/20257, libfortran/20480, libgcj/20251, middle-end/15700, + middle-end/20225, middle-end/20493, target/18251, target/18380, + target/18551, tree-optimization/17454, tree-optimization/20474 +- replace 3.4 with 4.0 in gcc %%description and libgcc Summary (#151327) +- don't hardcode full path to gcc in c89 and c99 wrapper scripts (#151620) +- fix loop optimizer with loops that after tree optimization are entered + after the loop body (Alexandre Oliva, PR rtl-optimization/20290, #150020) +- fix handling of jump tables at the end of scope with -g1 (#151466) +- BuildRequire gmp-devel with mpfr support +- tighten up rpm requires between subpackages + * Tue Mar 15 2005 Jakub Jelinek 4.0.0-0.34 - update from gcc-4_0-branch - PRs c++/20157, c++/20280, fortran/16907, fortran/20323, fortran/20361, Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- sources 15 Mar 2005 17:23:22 -0000 1.77 +++ sources 21 Mar 2005 12:20:28 -0000 1.78 @@ -1 +1 @@ -60ef6c1253ff90cfb165ec69bac0c178 gcc-4.0.0-20050315.tar.bz2 +0b8ffbf81cb3094bf62d25d9f13866f2 gcc-4.0.0-20050321.tar.bz2 --- gcc4-ada-makej.patch DELETED --- --- gcc4-libjawt.patch DELETED --- --- gcc4-rh150150.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 21 12:24:09 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 07:24:09 -0500 Subject: rpms/httpd/FC-3 httpd-2.0.52-apctlopts.patch, NONE, 1.1 httpd-2.0.52-htdigperms.patch, NONE, 1.1 httpd-2.0.52-ssluser.patch, NONE, 1.1 httpd-2.0.53.tar.gz.asc, NONE, 1.1 .cvsignore, 1.11, 1.12 httpd-2.0.40-apctl.patch, 1.10, 1.11 httpd-2.0.45-export.patch, 1.3, 1.4 httpd.init, 1.7, 1.8 httpd.spec, 1.53, 1.54 sources, 1.9, 1.10 httpd-2.0.52-CAN-2004-0885.patch, 1.1, NONE httpd-2.0.52-CAN-2004-0942.patch, 1.1, NONE httpd-2.0.52.tar.gz.asc, 1.1, NONE Message-ID: <200503211224.j2LCO9sj007444@cvs.devel.redhat.com> Update of /cvs/dist/rpms/httpd/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv7424 Modified Files: .cvsignore httpd-2.0.40-apctl.patch httpd-2.0.45-export.patch httpd.init httpd.spec sources Added Files: httpd-2.0.52-apctlopts.patch httpd-2.0.52-htdigperms.patch httpd-2.0.52-ssluser.patch httpd-2.0.53.tar.gz.asc Removed Files: httpd-2.0.52-CAN-2004-0885.patch httpd-2.0.52-CAN-2004-0942.patch httpd-2.0.52.tar.gz.asc Log Message: * Mon Mar 21 2005 Joe Orton 2.0.53-3.1 - update to 2.0.53 - apachectl: use runuser so "apachectl testconfig" produces output - apachectl: restore use of $OPTIONS again (#115910) - mod_ssl: set user from SSLUserName in access hook (upstream #31418) - htdigest: fix permissions of created files (upstream #33765) - httpd.init: refuse to restart if config syntax test fails httpd-2.0.52-apctlopts.patch: apachectl.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE httpd-2.0.52-apctlopts.patch --- Always invoke $HTTPD with $OPTIONS from /etc/sysconfig/httpd (#115910). --- httpd-2.0.52/support/apachectl.in.apctlopts +++ httpd-2.0.52/support/apachectl.in @@ -92,9 +92,9 @@ # httpd is denied terminal access in SELinux, so run in the # current context to get stdout from $HTTPD -t. if test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then - runcon -- `id -Z` $HTTPD -t + runcon -- `id -Z` $HTTPD $OPTIONS -t else - $HTTPD -t + $HTTPD $OPTIONS -t fi ERROR=$? } @@ -102,7 +102,7 @@ case $ARGV in restart|graceful) if $HTTPD -t >&/dev/null; then - $HTTPD -k $ARGV + $HTTPD $OPTIONS -k $ARGV ERROR=$? else echo "apachectl: Configuration syntax error, will not run \"$ARGV\":" @@ -111,12 +111,12 @@ ;; start|stop) check13 - $HTTPD -k $ARGV + $HTTPD $OPTIONS -k $ARGV ERROR=$? ;; startssl|sslstart|start-SSL) check13 - $HTTPD -k start -DSSL + $HTTPD $OPTIONS -DSSL -k start ERROR=$? ;; configtest) @@ -131,7 +131,7 @@ $LYNX $STATUSURL ;; *) - $HTTPD $ARGV + $HTTPD $OPTIONS $ARGV ERROR=$? esac httpd-2.0.52-htdigperms.patch: htdigest.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE httpd-2.0.52-htdigperms.patch --- --- httpd-2.0.52/support/htdigest.c.htdigperms +++ httpd-2.0.52/support/htdigest.c @@ -211,7 +211,8 @@ if (argc == 5) { if (strcmp(argv[1], "-c")) usage(); - rv = apr_file_open(&f, argv[2], APR_WRITE | APR_CREATE, -1, cntxt); + rv = apr_file_open(&f, argv[2], APR_WRITE | APR_CREATE, + APR_OS_DEFAULT, cntxt); if (rv != APR_SUCCESS) { char errmsg[120]; @@ -241,7 +242,7 @@ exit(1); } - if (apr_file_open(&f, argv[1], APR_READ, -1, cntxt) != APR_SUCCESS) { + if (apr_file_open(&f, argv[1], APR_READ, APR_OS_DEFAULT, cntxt) != APR_SUCCESS) { apr_file_printf(errfile, "Could not open passwd file %s for reading.\n", argv[1]); apr_file_printf(errfile, "Use -c option to create new one.\n"); httpd-2.0.52-ssluser.patch: ssl_engine_kernel.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) --- NEW FILE httpd-2.0.52-ssluser.patch --- Set r->user from SSLUserName in access hook (upstream #31418). --- httpd-2.0.52/modules/ssl/ssl_engine_kernel.c.ssluser +++ httpd-2.0.52/modules/ssl/ssl_engine_kernel.c @@ -736,6 +736,20 @@ } } + /* If we're trying to have the user name set from a client + * certificate then we need to set it here. This should be safe as + * the user name probably isn't important from an auth checking point + * of view as the certificate supplied acts in that capacity. + * However, if FakeAuth is being used then this isn't the case so + * we need to postpone setting the username until later. + */ + if ((dc->nOptions & SSL_OPT_FAKEBASICAUTH) == 0 && dc->szUserName) { + char *val = ssl_var_lookup(r->pool, r->server, r->connection, + r, (char *)dc->szUserName); + if (val && val[0]) + r->user = val; + } + /* * Check SSLRequire boolean expressions */ @@ -1022,17 +1036,6 @@ } /* - * Set r->user if requested - */ - if (dc->szUserName) { - val = ssl_var_lookup(r->pool, r->server, r->connection, - r, (char *)dc->szUserName); - if (val && val[0]) { - r->user = val; - } - } - - /* * Annotate the SSI/CGI environment with standard SSL information */ /* the always present HTTPS (=HTTP over SSL) flag! */ --- NEW FILE httpd-2.0.53.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (Darwin) iD8DBQBCB6Q6FqlkleIiZ5URApz5AKDBM7B3Xpw4Iqh3OS3ZIDFJu+JYTQCggJkS xEKrVs/tPduwb+f14Vbub8k= =FYqJ -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/httpd/FC-3/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 13 Oct 2004 10:44:51 -0000 1.11 +++ .cvsignore 21 Mar 2005 12:24:05 -0000 1.12 @@ -1,3 +1,6 @@ -httpd-2.0.52.tar.gz +httpd-2.0.53.tar.gz +httpd-2.0.53 migration.html status.* +i386 +*.rpm httpd-2.0.40-apctl.patch: apachectl.in | 79 +++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 58 insertions(+), 21 deletions(-) Index: httpd-2.0.40-apctl.patch =================================================================== RCS file: /cvs/dist/rpms/httpd/FC-3/httpd-2.0.40-apctl.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- httpd-2.0.40-apctl.patch 13 Oct 2004 16:35:07 -0000 1.10 +++ httpd-2.0.40-apctl.patch 21 Mar 2005 12:24:05 -0000 1.11 @@ -2,13 +2,15 @@ - fail gracefully if a 1.3 config file is found - use links not lynx, and fail gracefully when neither is found - source sysconfig/httpd for custom env. vars etc. +- make httpd -t work even in SELinux +- refuse to restart into a bad config (done better on HEAD) Upstream-HEAD: vendor Upstream-2.0: vendor Upstream-Status: Vendor-specific changes for better initscript integration ---- httpd-2.0.49/support/apachectl.in.apctl -+++ httpd-2.0.49/support/apachectl.in +--- httpd-2.0.52/support/apachectl.in.apctl ++++ httpd-2.0.52/support/apachectl.in @@ -41,32 +41,27 @@ # # the path to your httpd binary, including options if necessary @@ -55,7 +57,7 @@ fi ERROR=0 -@@ -74,12 +69,33 @@ +@@ -74,23 +69,65 @@ ARGV="-h" fi @@ -78,8 +80,29 @@ +fi +} + ++function testconfig() { ++# httpd is denied terminal access in SELinux, so run in the ++# current context to get stdout from $HTTPD -t. ++if test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then ++ runcon -- `id -Z` $HTTPD -t ++else ++ $HTTPD -t ++fi ++ERROR=$? ++} ++ case $ARGV in - start|stop|restart|graceful) +-start|stop|restart|graceful) ++restart|graceful) ++ if $HTTPD -t >&/dev/null; then ++ $HTTPD -k $ARGV ++ ERROR=$? ++ else ++ echo "apachectl: Configuration syntax error, will not run \"$ARGV\":" ++ testconfig ++ fi ++ ;; ++start|stop) + check13 $HTTPD -k $ARGV ERROR=$? @@ -89,8 +112,10 @@ $HTTPD -k start -DSSL ERROR=$? ;; -@@ -88,9 +104,11 @@ - ERROR=$? + configtest) +- $HTTPD -t +- ERROR=$? ++ testconfig ;; status) + checklynx httpd-2.0.45-export.patch: Makefile.in | 4 ---- main.c | 22 ---------------------- 2 files changed, 26 deletions(-) Index: httpd-2.0.45-export.patch =================================================================== RCS file: /cvs/dist/rpms/httpd/FC-3/httpd-2.0.45-export.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- httpd-2.0.45-export.patch 13 Oct 2004 16:35:07 -0000 1.3 +++ httpd-2.0.45-export.patch 21 Mar 2005 12:24:05 -0000 1.4 @@ -6,9 +6,9 @@ Upstream-2.0: omit Upstream-Status: EXPORT_DIRS change is conditional on using shared apr ---- httpd-2.0.48/server/main.c.export -+++ httpd-2.0.48/server/main.c -@@ -669,28 +669,6 @@ +--- httpd-2.0.53/server/main.c.export ++++ httpd-2.0.53/server/main.c +@@ -627,28 +627,6 @@ return 0; /* Termination 'ok' */ } @@ -37,14 +37,16 @@ #ifdef AP_USING_AUTOCONF /* This ugly little hack pulls any function referenced in exports.c into * the web server. exports.c is generated during the build, and it ---- httpd-2.0.48/server/Makefile.in.export -+++ httpd-2.0.48/server/Makefile.in -@@ -30,7 +30,7 @@ +--- httpd-2.0.53/server/Makefile.in.export ++++ httpd-2.0.53/server/Makefile.in +@@ -59,10 +59,6 @@ + for dir in $(EXPORT_DIRS); do \ + ls $$dir/*.h >> $$tmp; \ + done; \ +- for dir in $(EXPORT_DIRS_APR); do \ +- ls $$dir/ap[ru].h >> $$tmp; \ +- ls $$dir/ap[ru]_*.h >> $$tmp; \ +- done; \ + sort -u $$tmp > $@; \ + rm -f $$tmp - util.lo: test_char.h - --EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http -+EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(top_srcdir)/modules/http - - # If export_files is a dependency here, but we remove it during this stage, - # when exports.c is generated, make will not detect that export_files is no Index: httpd.init =================================================================== RCS file: /cvs/dist/rpms/httpd/FC-3/httpd.init,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- httpd.init 9 Sep 2004 06:22:47 -0000 1.7 +++ httpd.init 21 Mar 2005 12:24:05 -0000 1.8 @@ -73,11 +73,16 @@ [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} } reload() { - echo -n $"Reloading $prog: " - check13 || exit 1 - killproc $httpd -HUP - RETVAL=$? - echo + echo -n $"Reloading $prog: " + if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then + RETVAL=$? + echo $"not reloading due to configuration syntax error" + failure $"not reloading $httpd due to configuration syntax error" + else + killproc $httpd -HUP + RETVAL=$? + fi + echo } # See how we were called. Index: httpd.spec =================================================================== RCS file: /cvs/dist/rpms/httpd/FC-3/httpd.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- httpd.spec 11 Nov 2004 15:22:11 -0000 1.53 +++ httpd.spec 21 Mar 2005 12:24:05 -0000 1.54 @@ -6,7 +6,7 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.0.52 +Version: 2.0.53 Release: 3.1 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -36,6 +36,7 @@ Patch5: httpd-2.0.47-pie.patch Patch6: httpd-2.0.45-syspcre.patch Patch8: httpd-2.0.48-vpathinc.patch +Patch9: httpd-2.0.52-apctlopts.patch # Bug fixes Patch20: httpd-2.0.45-encode.patch Patch21: httpd-2.0.45-davetag.patch @@ -49,6 +50,8 @@ Patch29: httpd-2.0.48-workerhup.patch Patch30: httpd-2.0.48-davmisc.patch Patch39: httpd-2.0.50-reclaim.patch +Patch40: httpd-2.0.52-ssluser.patch +Patch41: httpd-2.0.52-htdigperms.patch # Features/functional changes Patch70: httpd-2.0.48-release.patch Patch71: httpd-2.0.40-xfsz.patch @@ -68,9 +71,6 @@ Patch90: httpd-2.0.49-workerstack.patch Patch91: httpd-2.0.46-testhook.patch Patch92: httpd-2.0.46-dumpcerts.patch -# Security fixes -Patch120: httpd-2.0.52-CAN-2004-0885.patch -Patch121: httpd-2.0.52-CAN-2004-0942.patch License: Apache Software License Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-root @@ -148,6 +148,7 @@ %patch4 -p1 -b .deplibs %patch6 -p1 -b .syspcre %patch8 -p1 -b .vpathinc +%patch9 -p1 -b .apctlopts # no -b to prevent droplets in install root %patch20 -p1 @@ -162,6 +163,8 @@ %patch29 -p1 -b .workerhup %patch30 -p1 -b .davmisc %patch39 -p1 -b .reclaim +%patch40 -p1 -b .ssluser +%patch41 -p1 -b .htdigperms %patch71 -p0 -b .xfsz %patch72 -p1 -b .pod @@ -181,9 +184,6 @@ %patch91 -p1 -b .testhook %patch92 -p1 -b .dumpcerts -%patch120 -p1 -b .can0885 -%patch121 -p1 -b .can0942 - # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1 @@ -581,6 +581,14 @@ %{_mandir}/man8/suexec.8* %changelog +* Mon Mar 21 2005 Joe Orton 2.0.53-3.1 +- update to 2.0.53 +- apachectl: use runuser so "apachectl testconfig" produces output +- apachectl: restore use of $OPTIONS again (#115910) +- mod_ssl: set user from SSLUserName in access hook (upstream #31418) +- htdigest: fix permissions of created files (upstream #33765) +- httpd.init: refuse to restart if config syntax test fails + * Thu Nov 11 2004 Joe Orton 2.0.52-3.1 - add fix for memory consumption DoS, CAN-2004-0942 Index: sources =================================================================== RCS file: /cvs/dist/rpms/httpd/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 28 Sep 2004 13:49:37 -0000 1.9 +++ sources 21 Mar 2005 12:24:05 -0000 1.10 @@ -1 +1 @@ -eba528fa8613dc5bfb0615a69c11f053 httpd-2.0.52.tar.gz +b089bdc7065c3be166bcc516b0d92416 httpd-2.0.53.tar.gz --- httpd-2.0.52-CAN-2004-0885.patch DELETED --- --- httpd-2.0.52-CAN-2004-0942.patch DELETED --- --- httpd-2.0.52.tar.gz.asc DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 21 12:28:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 07:28:52 -0500 Subject: rpms/gcc/devel gcc4.spec,1.17,1.18 Message-ID: <200503211228.j2LCSqcK018497@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18485 Modified Files: gcc4.spec Log Message: 4.0.0-0.35 Index: gcc4.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc4.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gcc4.spec 21 Mar 2005 12:20:28 -0000 1.17 +++ gcc4.spec 21 Mar 2005 12:28:50 -0000 1.18 @@ -403,6 +403,8 @@ %patch9 -p0 -b .pr20126~ %patch10 -p0 -b .pr20249~ %patch11 -p0 -b .c++-pr20381~ +%patch12 -p0 -b .pr20290~ +%patch13 -p0 -b .rh151466~ perl -pi -e 's/4\.0\.0/4.0.0/' gcc/version.c perl -pi -e 's/"%{gcc_version}"/"%{gcc_version} \(release\)"/' gcc/version.c From fedora-cvs-commits at redhat.com Mon Mar 21 15:07:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 10:07:10 -0500 Subject: rpms/system-config-printer/FC-3 .cvsignore, 1.25, 1.26 printconf.spec, 1.26, 1.27 sources, 1.25, 1.26 Message-ID: <200503211507.j2LF7AFX025494@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-printer/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv25480 Modified Files: .cvsignore printconf.spec sources Log Message: * Mon Mar 21 2005 Tim Waugh 0.6.116.1.3-1 - 0.6.116.1.3: - One more instance of manged/demangled names confusion (bug #147330). - Fixes for bool handling (bug #151161). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-3/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 7 Feb 2005 13:47:01 -0000 1.25 +++ .cvsignore 21 Mar 2005 15:07:07 -0000 1.26 @@ -5,3 +5,4 @@ printconf-0.6.116.1.tar.bz2 printconf-0.6.116.1.1.tar.bz2 printconf-0.6.116.1.2.tar.bz2 +printconf-0.6.116.1.3.tar.bz2 Index: printconf.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-3/printconf.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- printconf.spec 7 Feb 2005 13:47:01 -0000 1.26 +++ printconf.spec 21 Mar 2005 15:07:07 -0000 1.27 @@ -1,6 +1,6 @@ Summary: A printer configuration backend/frontend combination. Name: system-config-printer -Version: 0.6.116.1.2 +Version: 0.6.116.1.3 Release: 1 License: GPL Group: System Environment/Daemons @@ -179,6 +179,11 @@ %changelog +* Mon Mar 21 2005 Tim Waugh 0.6.116.1.3-1 +- 0.6.116.1.3: + - One more instance of manged/demangled names confusion (bug #147330). + - Fixes for bool handling (bug #151161). + * Mon Feb 7 2005 Tim Waugh 0.6.116.1.2-1 - 0.6.116.1.2: - Fixes for printconf_tui mangled/demangled names (bug #147330). Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-3/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 7 Feb 2005 13:47:01 -0000 1.25 +++ sources 21 Mar 2005 15:07:07 -0000 1.26 @@ -1 +1 @@ -385941be6ea15fc821ac52129965a802 printconf-0.6.116.1.2.tar.bz2 +cadb5aed885b20e5511dfb52aef2d09b printconf-0.6.116.1.3.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 21 15:19:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 10:19:00 -0500 Subject: rpms/system-config-printer/devel .cvsignore, 1.31, 1.32 printconf.spec, 1.33, 1.34 sources, 1.32, 1.33 Message-ID: <200503211519.j2LFJ06a028775@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-printer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28761 Modified Files: .cvsignore printconf.spec sources Log Message: * Mon Mar 21 2005 Tim Waugh 0.6.126-1 - 0.6.126: - Add bn_IN translation. - Fixed bool handling (bug #151161). - Avoid gtk/TRUE/FALSE. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 9 Mar 2005 13:21:24 -0000 1.31 +++ .cvsignore 21 Mar 2005 15:18:58 -0000 1.32 @@ -11,3 +11,4 @@ printconf-0.6.123.tar.bz2 printconf-0.6.124.tar.bz2 printconf-0.6.125.tar.bz2 +printconf-0.6.126.tar.bz2 Index: printconf.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/printconf.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- printconf.spec 9 Mar 2005 13:21:24 -0000 1.33 +++ printconf.spec 21 Mar 2005 15:18:58 -0000 1.34 @@ -1,6 +1,6 @@ Summary: A printer configuration backend/frontend combination. Name: system-config-printer -Version: 0.6.125 +Version: 0.6.126 Release: 1 License: GPL Group: System Environment/Daemons @@ -172,6 +172,12 @@ %changelog +* Mon Mar 21 2005 Tim Waugh 0.6.126-1 +- 0.6.126: + - Add bn_IN translation. + - Fixed bool handling (bug #151161). + - Avoid gtk/TRUE/FALSE. + * Wed Mar 9 2005 Tim Waugh 0.6.125-1 - 0.6.125: - Don't require Omni. Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 9 Mar 2005 13:21:24 -0000 1.32 +++ sources 21 Mar 2005 15:18:58 -0000 1.33 @@ -1 +1 @@ -189b1a8fbeef8d6c6ae1095e719fc720 printconf-0.6.125.tar.bz2 +4022ecde4bc29c804db8e097770e99e0 printconf-0.6.126.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 21 15:25:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 10:25:59 -0500 Subject: rpms/oprofile/devel sources,1.9,1.10 oprofile.spec,1.24,1.25 Message-ID: <200503211525.j2LFPxKF007378@cvs.devel.redhat.com> Update of /cvs/dist/rpms/oprofile/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7364 Modified Files: sources oprofile.spec Log Message: Rebase on 0.8.2 release. Index: sources =================================================================== RCS file: /cvs/dist/rpms/oprofile/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Sep 2004 15:14:33 -0000 1.9 +++ sources 21 Mar 2005 15:25:55 -0000 1.10 @@ -1 +1 @@ -3019c776dbf5dd21696c05bf509dea1a oprofile-0.8.1.tar.gz +a08c696910911d1f14585456829590f2 oprofile-0.8.2.tar.gz Index: oprofile.spec =================================================================== RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- oprofile.spec 14 Mar 2005 22:35:25 -0000 1.24 +++ oprofile.spec 21 Mar 2005 15:25:55 -0000 1.25 @@ -1,9 +1,9 @@ -%define DATE 20041015 -%define oprofile_version 0.8.1 -%define oprofile_release 14 +%define DATE 20050321 +%define oprofile_version 0.8.2 +%define oprofile_release 1 Summary: System wide profiler Name: oprofile -Version: 0.8.1 +Version: 0.8.2 Release: %{oprofile_release} License: GPL Group: Development/System @@ -13,14 +13,8 @@ Patch10: oprofile-0.4-guess2.patch #The following patch should go away when newer binutils/libbfd is used #Patch35: oprofile-0.4-separatedebug.patch -Patch57: oprofile-0.5.2-module.patch -Patch58: oprofile-0.5.2-filepos.patch Patch63: oprofile-0.7-libs.patch -#Patch75: oprofile-0.8-oparchive.patch -Patch76: oprofile-0.8.1-libnames.patch -Patch77: oprofile-0.8.1-power45.patch -Patch78: oprofile-0.8.1-power45sign.patch -Patch79: oprofile-0.8.1-power970.patch +#Patch79: oprofile-0.8.1-power970.patch URL: http://oprofile.sf.net ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x @@ -56,14 +50,7 @@ %setup -q -n %{name}-%{version} %patch10 -p1 -b .guess2 #%patch35 -p1 -b .separate -#%patch57 -p1 -b .module -#%patch58 -p1 -b .filepos %patch63 -p1 -b .libs -#%patch75 -p1 -b .archive -%patch76 -p1 -b .libnames -%patch77 -p1 -b .power45 -%patch78 -p1 -b .power45sign -%patch79 -p1 -b .power970 ./autogen.sh @@ -203,6 +190,22 @@ /usr/share/oprofile/ppc64/970/event_mappings /usr/share/oprofile/ppc64/970/events /usr/share/oprofile/ppc64/970/unit_masks +/usr/share/oprofile/mips/r10000/events +/usr/share/oprofile/mips/r10000/unit_masks +/usr/share/oprofile/mips/r12000/events +/usr/share/oprofile/mips/r12000/unit_masks +/usr/share/oprofile/mips/rm7000/events +/usr/share/oprofile/mips/rm7000/unit_masks +/usr/share/oprofile/mips/rm9000/events +/usr/share/oprofile/mips/rm9000/unit_masks +/usr/share/oprofile/mips/sb1/events +/usr/share/oprofile/mips/sb1/unit_masks +/usr/share/oprofile/mips/vr5432/events +/usr/share/oprofile/mips/vr5432/unit_masks +/usr/share/oprofile/mips/vr5500/events +/usr/share/oprofile/mips/vr5500/unit_masks +/usr/share/oprofile/ppc/e500/events +/usr/share/oprofile/ppc/e500/unit_masks %files devel %defattr(-,root,root) @@ -223,6 +226,9 @@ %changelog +* Mon Mar 21 2005 Will Cohen +- Rebase on 0.8.2 release. + * Mon Mar 14 2005 Will Cohen - Bump rebuild with gcc4. From fedora-cvs-commits at redhat.com Mon Mar 21 15:27:58 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 10:27:58 -0500 Subject: rpms/oprofile/devel .cvsignore,1.8,1.9 Message-ID: <200503211527.j2LFRwJf007456@cvs.devel.redhat.com> Update of /cvs/dist/rpms/oprofile/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7444 Modified Files: .cvsignore Log Message: Rebase to 0.8.2 release. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/oprofile/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Sep 2004 15:10:04 -0000 1.8 +++ .cvsignore 21 Mar 2005 15:27:56 -0000 1.9 @@ -1,2 +1 @@ -oprofile-0.8.tar.gz -oprofile-0.8.1.tar.gz +oprofile-0.8.2.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 21 15:29:21 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 10:29:21 -0500 Subject: rpms/oprofile/devel oprofile.spec,1.25,1.26 Message-ID: <200503211529.j2LFTLB8007541@cvs.devel.redhat.com> Update of /cvs/dist/rpms/oprofile/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7529 Modified Files: oprofile.spec Log Message: Bump version. Index: oprofile.spec =================================================================== RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- oprofile.spec 21 Mar 2005 15:25:55 -0000 1.25 +++ oprofile.spec 21 Mar 2005 15:29:19 -0000 1.26 @@ -1,6 +1,6 @@ %define DATE 20050321 %define oprofile_version 0.8.2 -%define oprofile_release 1 +%define oprofile_release 2 Summary: System wide profiler Name: oprofile Version: 0.8.2 @@ -227,6 +227,7 @@ %changelog * Mon Mar 21 2005 Will Cohen +- Bump release. - Rebase on 0.8.2 release. * Mon Mar 14 2005 Will Cohen From fedora-cvs-commits at redhat.com Mon Mar 21 15:48:01 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 10:48:01 -0500 Subject: rpms/openoffice.org/devel openoffice.org-1.9.82.ooo45628.noznow.patch, NONE, 1.1 openoffice.org-1.9.87.ooo43538.sfx2.patch, NONE, 1.1 openoffice.org.spec, 1.103, 1.104 openoffice.org-1.9.82.NONE.noznow.patch, 1.2, NONE Message-ID: <200503211548.j2LFm1cT010881@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10869 Modified Files: openoffice.org.spec Added Files: openoffice.org-1.9.82.ooo45628.noznow.patch openoffice.org-1.9.87.ooo43538.sfx2.patch Removed Files: openoffice.org-1.9.82.NONE.noznow.patch Log Message: more changes openoffice.org-1.9.82.ooo45628.noznow.patch: desktop/util/makefile.mk | 0 sysui/desktop/util/makefile.mk | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE openoffice.org-1.9.82.ooo45628.noznow.patch --- Index: desktop/util/makefile.mk =================================================================== RCS file: /cvs/gsl/sysui/desktop/util/makefile.mk,v retrieving revision 1.6 diff -u -p -r1.6 makefile.mk --- openoffice.org.orig/sysui/desktop/util/makefile.mk 21 Jan 2005 11:26:03 -0000 1.6 +++ openoffice.org/sysui/desktop/util/makefile.mk 19 Mar 2005 10:04:38 -0000 @@ -80,7 +80,10 @@ LINKFLAGS+=-z nodefs .ENDIF # "$(OS)" == "SOLARIS" # Disable lazy binding of symbols -.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" +.IF "$(OS)" == "LINUX" +LINKFLAGS+=-Wl,-z,now +.ENDIF +.IF "$(OS)" == "SOLARIS" LINKFLAGS+=-z now .ENDIF openoffice.org-1.9.87.ooo43538.sfx2.patch: unoctitm.cxx | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) --- NEW FILE openoffice.org-1.9.87.ooo43538.sfx2.patch --- Index: source/control/unoctitm.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/control/unoctitm.cxx,v retrieving revision 1.41 retrieving revision 1.41.54.1 diff -u -r1.41 -r1.41.54.1 --- openoffice.org.orig/sfx2/source/control/unoctitm.cxx 2 Feb 2005 14:02:04 -0000 1.41 +++ openoffice.org/sfx2/source/control/unoctitm.cxx 28 Feb 2005 14:21:02 -0000 1.41.54.1 @@ -954,23 +954,30 @@ ::cppu::OInterfaceContainerHelper* pContnr = pDispatch->GetListeners().getContainer ( aDispatchURL.Complete ); if ( bNotify && pContnr ) { - // Retrieve metric from pool to have correct sub ID when calling QueryValue - USHORT nSubId( 0 ); - SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM ); + ::com::sun::star::uno::Any aState; + if ( ( eState >= SFX_ITEM_AVAILABLE ) && pState && !IsInvalidItem( pState ) && !pState->ISA(SfxVoidItem) ) + { + // Retrieve metric from pool to have correct sub ID when calling QueryValue + USHORT nSubId( 0 ); + SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM ); - // retrieve the core metric - // it's enough to check the objectshell, the only shell that does not use the pool of the document - // is SfxViewFrame, but it hasn't any metric parameters - // TODO/LATER: what about the FormShell? Does it use any metric data?! Perhaps it should use the Pool of the document! - if ( pSlotServ && pDispatcher ) - eMapUnit = GetCoreMetric( pDispatcher->GetShell( pSlotServ->GetShellLevel() )->GetPool(), nSID ); + // retrieve the core metric + // it's enough to check the objectshell, the only shell that does not use the pool of the document + // is SfxViewFrame, but it hasn't any metric parameters + // TODO/LATER: what about the FormShell? Does it use any metric data?! Perhaps it should use the Pool of the document! + if ( pSlotServ && pDispatcher ) + { + SfxShell* pShell = pDispatcher->GetShell( pSlotServ->GetShellLevel() ); + DBG_ASSERT( pShell, "Can't get core metric without shell!" ); + if ( pShell ) + eMapUnit = GetCoreMetric( pShell->GetPool(), nSID ); + } - if ( eMapUnit == SFX_MAPUNIT_TWIP ) - nSubId |= CONVERT_TWIPS; + if ( eMapUnit == SFX_MAPUNIT_TWIP ) + nSubId |= CONVERT_TWIPS; - ::com::sun::star::uno::Any aState; - if ( ( eState >= SFX_ITEM_AVAILABLE ) && pState && !IsInvalidItem( pState ) && !pState->ISA(SfxVoidItem) ) - pState->QueryValue( aState, (BYTE)nSubId ); + pState->QueryValue( aState, (BYTE)nSubId ); + } else if ( eState == SFX_ITEM_DONTCARE ) { // Use special uno struct to transport don't care state Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- openoffice.org.spec 20 Mar 2005 21:55:13 -0000 1.103 +++ openoffice.org.spec 21 Mar 2005 15:47:55 -0000 1.104 @@ -2,7 +2,8 @@ %define gccver 3.4.3 %define gcjver 4.0.0 %define _unpackaged_files_terminate_build 0 -%define langpacks 1 +#%define langpacks 1 +%define langpacks 0 ExclusiveArch: %{ix86} ppc Summary: OpenOffice.org comprehensive office suite. @@ -37,7 +38,7 @@ Patch5: openoffice.org-1.9.75.ooo41904.singleton.patch Patch6: openoffice.org-1.9.80.ooo43466.wmclass.patch Patch7: workspace-gccfour.patch -Patch8: openoffice.org-1.9.82.NONE.noznow.patch +Patch8: openoffice.org-1.9.82.ooo45628.noznow.patch Patch9: openoffice.org-1.9.83.ooo43995.wptypedetect.patch Patch10: openoffice.org-1.9.84.ooo44843.sdcasting.patch Patch11: openoffice.org-1.9.84.ooo44846.svxcasting.patch @@ -52,6 +53,7 @@ Patch20: openoffice.org-1.9.87.NONE.wizards.broken.patch Patch21: openoffice.org-1.9.87.warnnoterroronmissing.patch Patch22: openoffice.org-1.9.87.NONE.sysui.parallel.patch +Patch23: openoffice.org-1.9.87.ooo43538.sfx2.patch %define instdir %{_libdir}/openoffice.org%{version} @@ -162,6 +164,14 @@ %description xsltfilter xsltfilter module for %{name}, provides additional docbook and xhtml export transforms. +%package javafilter +Summary: extra javafilter module for %{name} +Group: Applications/Productivity +Requires: %{name}-core = %{epoch}:%{version}-%{release} + +%description javafilter +javafilter module for %{name}, provides additional aportisdoc, pocket excel and pocket word import filters. + %package testtools Summary: testtools for %{name} Group: Development/Libraries @@ -182,6 +192,7 @@ %package langpack-ar Summary: Arabic language pack for %{name} Group: Applications/Productivity +Requires: fonts-arabic Requires: %{name}-core = %{epoch}:%{version}-%{release} %description langpack-ar @@ -305,6 +316,7 @@ Summary: Hebrew language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: fonts-hebrew Obsoletes: openoffice.org-langpack-he %description langpack-he_IL @@ -314,6 +326,7 @@ Summary: Hindi language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: fonts-hindi Obsoletes: openoffice.org-langpack-hi-IN %description langpack-hi_IN @@ -340,6 +353,7 @@ Summary: Japanese language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: fonts-japanese Obsoletes: openoffice.org-langpack-ja %description langpack-ja_JP @@ -358,6 +372,7 @@ Summary: Korean language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: fonts-korean Obsoletes: openoffice.org-langpack-ko %description langpack-ko_KR @@ -490,6 +505,7 @@ Summary: Simplified Chinese language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: fonts-chinese Obsoletes: openoffice.org-langpack-zh-CN %description langpack-zh_CN @@ -499,6 +515,7 @@ Summary: Traditional Chinese language pack for %{name} Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: fonts-chinese Obsoletes: openoffice.org-langpack-zh-TW %description langpack-zh_TW @@ -538,6 +555,7 @@ %patch20 -p1 -b .wizards.broken.patch %patch21 -p1 -b .warnnoterroronmissing.patch %patch22 -p1 -b .sysui.parallel.patch +%patch23 -p1 -b .ooo43538.sfx2.patch cd solenv/bin tar xvzf %{SOURCE2} Archive-Zip-1.13/lib cd ../.. @@ -1290,7 +1308,33 @@ %{instdir}/program/bridgefac.uno.so %{instdir}/program/canvasfactory.uno.so %{instdir}/program/cde-open-url -%{instdir}/program/classes +%dir %{instdir}/program/classes +%{instdir}/program/classes/avmedia.jar +%{instdir}/program/classes/bsh.jar +%{instdir}/program/classes/classes.jar +%{instdir}/program/classes/commonwizards.jar +%{instdir}/program/classes/docbook.jar +%{instdir}/program/classes/hsqldb.jar +%{instdir}/program/classes/htmlsoff.jar +%{instdir}/program/classes/java_uno.jar +%{instdir}/program/classes/java_uno_accessbridge.jar +%{instdir}/program/classes/juh.jar +%{instdir}/program/classes/jurt.jar +%{instdir}/program/classes/jut.jar +%{instdir}/program/classes/officebean.jar +%{instdir}/program/classes/ridl.jar +%{instdir}/program/classes/sandbox.jar +%{instdir}/program/classes/sdbc_hsqldb.jar +%{instdir}/program/classes/unoil.jar +%{instdir}/program/classes/xalan.jar +%{instdir}/program/classes/xercesImpl.jar +%{instdir}/program/classes/XFlatXml.jar +%{instdir}/program/classes/xml-apis.jar +%{instdir}/program/classes/XMergeBridge.jar +%{instdir}/program/classes/xmerge.jar +%{instdir}/program/classes/XSLTFilter.jar +%{instdir}/program/classes/XSLTValidate.jar +%{instdir}/program/classes/xt.jar %{instdir}/program/cmdmail.uno.so %{instdir}/program/configimport %{instdir}/program/configimport.bin @@ -1300,7 +1344,6 @@ %{instdir}/program/deployment680*.uno.so %{instdir}/program/deploymentgui680*.uno.so %{instdir}/program/dlgprov680*.uno.so -%{instdir}/program/filter %{instdir}/program/gnome-open-url %{instdir}/program/gnome-open-url.bin %{instdir}/program/i18npool.uno.so @@ -1491,9 +1534,7 @@ %{instdir}/program/libxcr680*.so %{instdir}/program/libxmlfa680*.so %{instdir}/program/libxmlfd680*.so -%{instdir}/program/libxmlsec-nss.so -%{instdir}/program/libxmlsec.so -%{instdir}/program/libxmlsecurity.so +%{instdir}/program/libxmlsec* %{instdir}/program/libxmx680*.so %{instdir}/program/libxo680*.so %{instdir}/program/libxof680*.so @@ -2044,6 +2085,29 @@ %dir %{instdir}/share/xslt/export %{instdir}/share/xslt/export/xhtml +%files javafilter +%defattr(-,root,root) +%dir %{instdir} +%dir %{instdir}/program +%dir %{instdir}/program/classes +%{instdir}/program/classes/aportisdoc.jar +%{instdir}/program/classes/pexcel.jar +%{instdir}/program/classes/pocketword.jar +%dir %{instdir}/share +%dir %{instdir}/share/registry +%dir %{instdir}/share/registry/modules +%dir %{instdir}/share/registry/modules/org +%dir %{instdir}/share/registry/modules/org/openoffice +%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection +%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter +%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_palm_filters.xcu +%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketexcel_filters.xcu +%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketword_filters.xcu +%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types +%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_palm_types.xcu +%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketexcel_types.xcu +%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketword_types.xcu + %files testtools %defattr(-,root,root) %dir %{instdir} @@ -2089,6 +2153,10 @@ - openoffice.org-1.9.87.NONE.wizards.broken.patch wizards build with gcj, but don't register - reshuffle direct install to a simple warn not error on missing files, and hijack PKGFORMAT to transport direct install flags +- libxmlsec name changed +- java-filter subpackage like upstream now that they build with gcj +- backport openoffice.org-1.9.87.ooo43538.sfx2.patch for rh#151594# +- add requires on appropiate fonts for some langpacks * Tue Mar 15 2005 Caolan McNamara 1:1.9.85-1 - bump to latest version --- openoffice.org-1.9.82.NONE.noznow.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 21 16:18:27 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 11:18:27 -0500 Subject: rpms/libxklavier/devel .cvsignore, 1.4, 1.5 libxklavier.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200503211618.j2LGIRm4025368@cvs.devel.redhat.com> Update of /cvs/dist/rpms/libxklavier/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25354 Modified Files: .cvsignore libxklavier.spec sources Log Message: * Mon Mar 21 2005 David Zeuthen 2.0-1 - Update to latest upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libxklavier/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Feb 2005 16:16:03 -0000 1.4 +++ .cvsignore 21 Mar 2005 16:18:25 -0000 1.5 @@ -1,2 +1,3 @@ libxklavier-1.02.tar.gz libxklavier-1.14.tar.gz +libxklavier-2.0.tar.gz Index: libxklavier.spec =================================================================== RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libxklavier.spec 16 Mar 2005 19:42:42 -0000 1.8 +++ libxklavier.spec 21 Mar 2005 16:18:25 -0000 1.9 @@ -1,7 +1,7 @@ Summary: library providing high-level API for X Keyboard Extension Name: libxklavier -Version: 1.14 -Release: 2 +Version: 2.0 +Release: 1 License: LGPL Group: Development/Libraries Url: http://gswitchit.sourceforge.net/ @@ -65,6 +65,9 @@ %{_includedir}/* %changelog +* Mon Mar 21 2005 David Zeuthen 2.0-1 +- Update to latest upstream version + * Wed Mar 16 2005 David Zeuthen 1.14-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/libxklavier/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Feb 2005 16:16:03 -0000 1.4 +++ sources 21 Mar 2005 16:18:25 -0000 1.5 @@ -1 +1 @@ -218728a9b14d865888305194b5d5214f libxklavier-1.14.tar.gz +9257653ee3d194d9c8d669e969fe4332 libxklavier-2.0.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 21 16:21:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 11:21:43 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.104,1.105 Message-ID: <200503211621.j2LGLhVm025471@cvs.devel.redhat.com> Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25458 Modified Files: openoffice.org.spec Log Message: forgot langpacks Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- openoffice.org.spec 21 Mar 2005 15:47:55 -0000 1.104 +++ openoffice.org.spec 21 Mar 2005 16:21:41 -0000 1.105 @@ -2,8 +2,7 @@ %define gccver 3.4.3 %define gcjver 4.0.0 %define _unpackaged_files_terminate_build 0 -#%define langpacks 1 -%define langpacks 0 +%define langpacks 1 ExclusiveArch: %{ix86} ppc Summary: OpenOffice.org comprehensive office suite. From fedora-cvs-commits at redhat.com Mon Mar 21 16:39:09 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 11:39:09 -0500 Subject: rpms/system-config-printer/devel sources,1.33,1.34 Message-ID: <200503211639.j2LGd9Yp004217@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-printer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4204 Modified Files: sources Log Message: Respin Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 21 Mar 2005 15:18:58 -0000 1.33 +++ sources 21 Mar 2005 16:39:06 -0000 1.34 @@ -1 +1 @@ -4022ecde4bc29c804db8e097770e99e0 printconf-0.6.126.tar.bz2 +6ae5f40e7e073ebea6953f51d37f95aa printconf-0.6.126.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 21 16:55:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 11:55:43 -0500 Subject: rpms/rdesktop/devel .cvsignore, 1.5, 1.6 rdesktop-optflags.patch, 1.1, 1.2 rdesktop.spec, 1.12, 1.13 sources, 1.5, 1.6 rdesktop-1.3.1-fi-keymap.patch, 1.1, NONE rdesktop-1.3.1-fi-warning.patch, 1.1, NONE rdesktop-1.3.1-xembed.patch, 1.1, NONE Message-ID: <200503211655.j2LGthHA018446@cvs.devel.redhat.com> Update of /cvs/dist/rpms/rdesktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17337 Modified Files: .cvsignore rdesktop-optflags.patch rdesktop.spec sources Removed Files: rdesktop-1.3.1-fi-keymap.patch rdesktop-1.3.1-fi-warning.patch rdesktop-1.3.1-xembed.patch Log Message: * Mon Mar 21 2005 David Zeuthen 1.4.0-1 - New upstream version; drop some patches that is now upstream - Require xorg-x11-devel instead of XFree86-devel for building Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rdesktop/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Sep 2004 11:13:14 -0000 1.5 +++ .cvsignore 21 Mar 2005 16:55:39 -0000 1.6 @@ -1 +1,2 @@ rdesktop-1.3.1.tar.gz +rdesktop-1.4.0.tar.gz rdesktop-optflags.patch: configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: rdesktop-optflags.patch =================================================================== RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop-optflags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rdesktop-optflags.patch 9 Sep 2004 11:13:58 -0000 1.1 +++ rdesktop-optflags.patch 21 Mar 2005 16:55:39 -0000 1.2 @@ -1,11 +1,18 @@ ---- configure~ 2003-12-11 16:59:54.000000000 +0200 -+++ configure 2004-03-23 19:17:19.000000000 +0200 -@@ -115,7 +115,7 @@ - echo "CC = $cc" >>Makeconf - - if $cc -v 2>&1 |grep '^gcc' >/dev/null; then -- cflags="$cflags -Wall -O2" -+ cflags="$cflags -Wall $RPM_OPT_FLAGS" +--- configure.orig 2005-03-21 11:29:15.000000000 -0500 ++++ configure 2005-03-21 11:30:35.000000000 -0500 +@@ -1980,13 +1980,13 @@ + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++ CFLAGS="-g $RPM_OPT_FLAGS" + else + CFLAGS="-g" + fi else - cflags="$cflags -O" - fi + if test "$GCC" = yes; then +- CFLAGS="-O2" ++ CFLAGS="$RPM_OPT_FLAGS" + else + CFLAGS= + fi Index: rdesktop.spec =================================================================== RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- rdesktop.spec 2 Mar 2005 18:17:34 -0000 1.12 +++ rdesktop.spec 21 Mar 2005 16:55:39 -0000 1.13 @@ -1,20 +1,15 @@ Summary: X client for remote desktop into Windows Terminal Server Name: rdesktop -Version: 1.3.1 -Release: 7 +Version: 1.4.0 +Release: 1 URL: http://www.rdesktop.org/ Source0: %{name}-%{version}.tar.gz Patch0: %{name}-optflags.patch -## CVS backports or stuff that should be in the next version -Patch100: rdesktop-1.3.1-fi-keymap.patch -Patch101: rdesktop-1.3.1-fi-warning.patch -Patch102: rdesktop-1.3.1-xembed.patch - License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: openssl-devel, XFree86-devel +BuildRequires: openssl-devel, xorg-x11-devel %description rdesktop is an open source client for Windows NT Terminal Server and @@ -26,15 +21,10 @@ %setup -q %patch0 -p0 -## CVS backports -%patch100 -p0 -%patch101 -p2 -%patch102 -p0 - %build # Not autoconf, percentconfigure won't work ./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \ - --with-openssl + --with-openssl=%{_prefix} make LDFLAGS="-L/usr/X11R6/%{_lib} -lX11 -lcrypto" %{?_smp_mflags} %install @@ -52,6 +42,10 @@ %{_mandir}/man1/* %changelog +* Mon Mar 21 2005 David Zeuthen 1.4.0-1 +- New upstream version; drop some patches that is now upstream +- Require xorg-x11-devel instead of XFree86-devel for building + * Wed Mar 2 2005 Mark McLoughlin 1.3.1-7 - Rebuild with gcc4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/rdesktop/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Sep 2004 11:13:14 -0000 1.5 +++ sources 21 Mar 2005 16:55:39 -0000 1.6 @@ -1 +1 @@ -968a1e3f5161bab80c306df31c54cfb1 rdesktop-1.3.1.tar.gz +542cb9d9b4dd1ecaf3ed4ff753fea7b8 rdesktop-1.4.0.tar.gz --- rdesktop-1.3.1-fi-keymap.patch DELETED --- --- rdesktop-1.3.1-fi-warning.patch DELETED --- --- rdesktop-1.3.1-xembed.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 21 17:14:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 12:14:51 -0500 Subject: rpms/system-config-nfs/devel .cvsignore, 1.11, 1.12 sources, 1.13, 1.14 system-config-nfs.spec, 1.12, 1.13 Message-ID: <200503211714.j2LHEpo2018877@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-nfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18859 Modified Files: .cvsignore sources system-config-nfs.spec Log Message: warn user about parse errors in /etc/exports Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 19 Mar 2005 14:43:09 -0000 1.11 +++ .cvsignore 21 Mar 2005 17:14:49 -0000 1.12 @@ -1 +1 @@ -system-config-nfs-1.3.3.tar.bz2 +system-config-nfs-1.3.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 19 Mar 2005 14:43:09 -0000 1.13 +++ sources 21 Mar 2005 17:14:49 -0000 1.14 @@ -1 +1 @@ -5f0d174ebe80c68d272c33e238be65cb system-config-nfs-1.3.3.tar.bz2 +5d498a9004c06f29cda397b798bf071b system-config-nfs-1.3.4.tar.bz2 Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/system-config-nfs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- system-config-nfs.spec 19 Mar 2005 14:43:09 -0000 1.12 +++ system-config-nfs.spec 21 Mar 2005 17:14:49 -0000 1.13 @@ -1,6 +1,6 @@ Summary: NFS server configuration tool Name: system-config-nfs -Version: 1.3.3 +Version: 1.3.4 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -64,6 +64,9 @@ %changelog +* Mon Mar 21 2005 Nils Philippsen 1.3.4-1 +- warn user about parse errors in /etc/exports + * Sat Mar 19 2005 Nils Philippsen 1.3.3-1 - install python files as well... From fedora-cvs-commits at redhat.com Mon Mar 21 17:16:17 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 12:16:17 -0500 Subject: rpms/nautilus/devel .cvsignore, 1.24, 1.25 nautilus.spec, 1.64, 1.65 sources, 1.27, 1.28 Message-ID: <200503211716.j2LHGHmn022089@cvs.devel.redhat.com> Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22074 Modified Files: .cvsignore nautilus.spec sources Log Message: * Mon Mar 21 2005 David Zeuthen 2.10.0-1 - Update to latest upstream version; tweak requires Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 11 Feb 2005 17:01:57 -0000 1.24 +++ .cvsignore 21 Mar 2005 17:16:15 -0000 1.25 @@ -3,3 +3,4 @@ nautilus-2.8.1.tar.bz2 nautilus-2.9.90.tar.bz2 nautilus-2.9.91.tar.bz2 +nautilus-2.10.0.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- nautilus.spec 3 Mar 2005 07:51:57 -0000 1.64 +++ nautilus.spec 21 Mar 2005 17:16:15 -0000 1.65 @@ -1,23 +1,23 @@ %define glib2_version 2.6.0 %define pango_version 1.1.3 -%define gtk2_version 2.3.2 +%define gtk2_version 2.6.0 %define libgnomeui_version 2.6.0 -%define eel2_version 2.9.91 +%define eel2_version 2.10.0 %define gnome_icon_theme_version 1.1.5 %define libxml2_version 2.4.20 %define gail_version 0.17-2 %define desktop_backgrounds_version 2.0-4 %define desktop_file_utils_version 0.7 -%define gnome_desktop_version 2.3.0 +%define gnome_desktop_version 2.9.91 %define redhat_menus_version 0.25 %define redhat_artwork_version 0.41 -%define gnome_vfs2_version 2.7.90 -%define startup_notification_version 0.4 +%define gnome_vfs2_version 2.10.0 +%define startup_notification_version 0.5 Name: nautilus Summary: Nautilus is a file manager for GNOME. -Version: 2.9.91 -Release: 2 +Version: 2.10.0 +Release: 1 License: GPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2 @@ -164,6 +164,9 @@ %{_includedir}/nautilus %changelog +* Mon Mar 21 2005 David Zeuthen 2.10.0-1 +- Update to latest upstream version; tweak requires + * Thu Mar 3 2005 Alex Larsson 2.9.91-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 11 Feb 2005 17:01:57 -0000 1.27 +++ sources 21 Mar 2005 17:16:15 -0000 1.28 @@ -1 +1 @@ -430e3615efe75ff07d5cc3c109987675 nautilus-2.9.91.tar.bz2 +b29a02be8733a82e002179e2e0f3fe83 nautilus-2.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 21 17:22:14 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 12:22:14 -0500 Subject: rpms/mdadm/devel mdadm-1.9.0-static-make.patch, NONE, 1.1 mdadm.spec, 1.16, 1.17 Message-ID: <200503211722.j2LHMEAJ022208@cvs.devel.redhat.com> Update of /cvs/dist/rpms/mdadm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22194 Modified Files: mdadm.spec Added Files: mdadm-1.9.0-static-make.patch Log Message: Build a static version of mdadm in case we need it, also build the simpler mdassemble statically for initrd usage. mdadm-1.9.0-static-make.patch: Makefile | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) --- NEW FILE mdadm-1.9.0-static-make.patch --- Binary files mdadm-1.9.0/mdadm.static and mdadm-1.9.0/mdadm differ --- mdadm-1.9.0/Makefile.static 2005-03-21 12:05:30.000000000 -0500 +++ mdadm-1.9.0/Makefile 2005-03-21 12:07:28.000000000 -0500 @@ -116,11 +116,17 @@ $(OBJS) : mdadm.h install : mdadm mdadm.8 md.4 mdadm.conf.5 - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm + $(INSTALL) -D -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm $(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 +install.mdadmstatic: mdadm.static + $(INSTALL) -D -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm.static + +install.mdassemble: mdassemble + $(INSTALL) -D -m 755 mdassemble $(DESTDIR)$(BINDIR)/mdassemble + clean : rm -f mdadm $(OBJS) core *.man mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \ mdassemble mdassemble.static mdassemble.uclibc mdassemble.klibc Index: mdadm.spec =================================================================== RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mdadm.spec 9 Mar 2005 21:04:05 -0000 1.16 +++ mdadm.spec 21 Mar 2005 17:22:11 -0000 1.17 @@ -1,13 +1,14 @@ Summary: mdadm controls Linux md devices (software RAID arrays) Name: mdadm Version: 1.9.0 -Release: 1.EL4 +Release: 2.EL4 Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz Source1: mdmonitor.init Source2: mdmpd-0.4.tgz Source3: mdmpd.init Patch: mdadm-1.5.0-email.patch Patch2: mdadm-1.9.0-s390-build.patch +Patch3: mdadm-1.9.0-static-make.patch URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/ License: GPL Group: System Environment/Base @@ -26,13 +27,14 @@ %setup -q -a 2 %patch -p1 -b .email %patch2 -p1 -b .s390 +%patch3 -p1 -b .static %build -make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm +make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdadm.static mdassemble.static make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd %install -make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install +make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install.mdadmstatic install.mdassemble make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin -C mdmpd install install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd @@ -75,6 +77,10 @@ %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Mon Mar 21 2005 Doug Ledford 1.9.0-2 +- Build mdadm.static and mdassemble (static as well) to be used in initrd + images + * Wed Mar 09 2005 Doug Ledford 1.9.0-1 - Initial upgrade to 1.9.0 and update of doc files - Fix an s390 build error From fedora-cvs-commits at redhat.com Mon Mar 21 17:24:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 12:24:10 -0500 Subject: rpms/mdadm/devel mdadm.spec,1.17,1.18 Message-ID: <200503211724.j2LHOAgS022370@cvs.devel.redhat.com> Update of /cvs/dist/rpms/mdadm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22357 Modified Files: mdadm.spec Log Message: Update release for fc4 Index: mdadm.spec =================================================================== RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mdadm.spec 21 Mar 2005 17:22:11 -0000 1.17 +++ mdadm.spec 21 Mar 2005 17:24:08 -0000 1.18 @@ -1,7 +1,7 @@ Summary: mdadm controls Linux md devices (software RAID arrays) Name: mdadm Version: 1.9.0 -Release: 2.EL4 +Release: 2.fc4 Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz Source1: mdmonitor.init Source2: mdmpd-0.4.tgz From fedora-cvs-commits at redhat.com Mon Mar 21 17:26:35 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 12:26:35 -0500 Subject: rpms/xinitrc/devel .cvsignore, 1.38, 1.39 sources, 1.38, 1.39 xinitrc.spec, 1.39, 1.40 Message-ID: <200503211726.j2LHQZO4000931@cvs.devel.redhat.com> Update of /cvs/dist/rpms/xinitrc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv909/devel Modified Files: .cvsignore sources xinitrc.spec Log Message: auto-import xinitrc-4.0.15-1 on branch devel from xinitrc-4.0.15-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xinitrc/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 23 Dec 2004 02:14:58 -0000 1.38 +++ .cvsignore 21 Mar 2005 17:26:33 -0000 1.39 @@ -1 +1 @@ -xinitrc-3.20.1.tar.bz2 +xinitrc-4.0.15.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xinitrc/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 23 Dec 2004 02:14:58 -0000 1.38 +++ sources 21 Mar 2005 17:26:33 -0000 1.39 @@ -1 +1 @@ -ed29aa5bb4256090406f1f2e045efa4b xinitrc-3.20.1.tar.bz2 +99232e1c29fc0c191c2524212ca143ca xinitrc-4.0.15.tar.bz2 Index: xinitrc.spec =================================================================== RCS file: /cvs/dist/rpms/xinitrc/devel/xinitrc.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- xinitrc.spec 23 Dec 2004 02:14:58 -0000 1.39 +++ xinitrc.spec 21 Mar 2005 17:26:33 -0000 1.40 @@ -1,13 +1,37 @@ +#!/bin/bash + Summary: The default startup script for the X Window System. Name: xinitrc -Version: 3.20.1 +Version: 4.0.15 Release: 1 -License: GPL/XFree86 +License: GPLv2, MIT/X11 Group: User Interface/X Source: xinitrc-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-root -Requires: XFree86, /bin/sh, /bin/bash, switchdesk >= 3.7 -BuildArchitectures: noarch +# FIXME: XFree86 dep has been disabled, because that causes the package to +# be dependant on a specific X11 implementation. It isn't clear why this +# dependancy is here, so once we find out what breaks, we can add new +# dependancies here for them in a way that is not dependant on a specific +# implementation. That can be done either by using file/dir dependancies, +# or by using virtual provides/requires. +# Mar 16, 2004 - mharris at redhat.com +#Requires: XFree86 + +# sessreg - is used by "GiveConsole" and "TakeConsole" +Requires: /usr/X11R6/bin/sessreg + +# These are required by Xclients +Requires: which /usr/X11R6/bin/RunWM + +# Xsetup_0 requires pidof and xsetroot +Requires: /sbin/pidof /usr/X11R6/bin/xsetroot + +# The "failsafe" configuration requires xterm unconditionally, so we must +# hard depend on xterm. +Requires: xterm + +Requires: /bin/sh, /bin/bash, switchdesk >= 3.7 +BuildArch: noarch %description The xinitrc package contains the xinitrc file, a script which is used @@ -27,20 +51,235 @@ %files %defattr(-,root,root) %config(noreplace) /etc/X11/Xmodmap -%config /etc/X11/xinit/xinitrc +%config(noreplace) /etc/X11/Xresources +/etc/X11/xinit/xinitrc +/etc/X11/xinit/xinitrc-common %config(noreplace) /etc/X11/xinit/Xclients %dir /etc/X11/xinit/xinitrc.d -%config(noreplace) /etc/X11/xinit/xinitrc.d/* +/etc/X11/xinit/xinitrc.d/* %config(noreplace) /etc/X11/xdm/* -/usr/X11R6/bin/* +# FIXME: This should move to /usr/bin sometime, with a backward compatible +# symlink added back just prior to release, to help people to fix things to +# use /usr/bin instead. Then keep the symlink for a release or so. When +# this changes, X11BINDIR in the Makefile needs to be updated also. +/usr/X11R6/bin/RunWM %changelog -* Wed Dec 22 2001 Mike A. Harris 3.20.1-1 -- Created new "xinitrc-rhel21-branch" branch of xinitrc CVS specifically for - doing RHEL 2.1 erratum from. Added a third level to the xinitrc version - string to indicate this is now a branch from 3.20. -- Added bug fix for (#138909) -- s/Copyright/License/ in spec file to match 3.22 and later +* Mon Mar 21 2005 Mike A. Harris 4.0.15-1 +- Added fix for Xsession spawned ssh-agent continuing to run after user logs + out, which causes buildup of ssh-agent processes. (#138747,134494) + +* Mon Mar 7 2005 Mike A. Harris 4.0.14-2 +- Added Requires: xterm, because the "failsafe" configuration requires xterm + unconditionally. + +* Wed Oct 20 2004 Mike A. Harris 4.0.14-1 +- Fix permissions on Xaccess file (#101065) +- Modified the way ssh-agent is invoked, which greatly simplified the + xinitrc script, and removed the now unneeded SSH_AGENT variable (#134494) + +* Wed Oct 6 2004 Mike A. Harris 4.0.13-1 +- Fix xinitrc script, by making it source xinitrc-common via absolute path + instead of via relative path. Same fix as was done for Xsession in build + 4.0.11-1 for bug (#134785) + +* Wed Oct 6 2004 Mike A. Harris 4.0.12-1 +- Fix bug in ssh-agent support in Xsession which surfaced once common code + was factored out into the xinitrc-common script. Preston Brown's initial + implementation of ssh-agent support used "SSHAGENT" in Xsession, but used + "SSH_AGENT" in xinitrc. The new common code uses "SSH_AGENT", however the + Xsession script had some places remaining which still used "SSHAGENT", + causing ssh-agent to fail to start. + +* Wed Oct 6 2004 Mike A. Harris 4.0.11-1 +- Fix Xsession, by making it source xinitrc-common via absolute path + instead of via relative path (#134785) + +* Tue Oct 5 2004 Mike A. Harris 4.0.10-1 +- Fix unterminated if block in the Xclients script, which was introduced in + xinitrc-4.0.6-1 (#134673) + +* Tue Oct 5 2004 Mike A. Harris 4.0.9-1 +- Removed config flag from xinitrc script, as people should use xinitrc.d + instead. +- Added xinitrc-common script to file list as it was missing in 4.0.8-1 + +* Tue Oct 5 2004 Mike A. Harris 4.0.8-1 +- Factored out common code from Xsession and xinitrc into 'xinitrc-common' + to avoid code duplication and bug fix synchronization issues (#133485) +- Changed default xsetroot background colour to "#222e45" (#134417) + +* Tue Oct 5 2004 Mike A. Harris 4.0.7-1 +- Fix dbus invocation to quit with X session, by adding --exit-with-session + switch in Xsession and xinitrc. (#133557) +- Fix Xsession and xinitrc ssh-agent invocation to only start if ssh-agent + is not already running (#90158) + +* Tue Oct 5 2004 Mike A. Harris 4.0.6-1 +- Secondary wmakerectomy to prevent remission. + +* Thu Sep 24 2004 Mike A. Harris 4.0.5-1 +- fvwm2ectomy, and netscapectomy (#123284) +- Remove all references to the XF86Config file from all scripts in the package, + as these were all just ugly hacks, and all appear to be unneeded nowadays + anyway. (#133477) + +* Wed Sep 1 2004 Mike A. Harris 4.0.4-1 +- fvwmectomy + +* Wed Aug 25 2004 Colin Walters 4.0.3-1 +- Add DBus session to Xsession, xinitrc + +* Sat Aug 21 2004 Jens Petersen 4.0.2-1 +- bring back sourcing of lang.sh in xinput.sh so that it honours + i18n locale settings (#127746) +- add support for all locale fallback script "default" in xinput.d directory + +* Wed Jun 23 2004 Mike A. Harris 4.0.1-1 +- Added fix for switchdesk related bug in Xsession script (#125284) +- Integrated input.d modularization support implemented by Jens Petersen + based upon idea from Akira Tagoh: + - no need to source lang.sh + - do not look at LC_ALL + - initialize XIM, XIM_PROGRAM, XIM_ARGS, XMODIFIERS and GTK_IM_MODULE unset + for consistency and safety + - replace all specific locale and IM client config code with trying to + load ~/.xinput.d/ll_CC, then /etc/X11/xinit/xinput.d/ll_CC + (when they exist for ll_CC locale). Each script is expected to set + XIM_PROGRAM, XIM_ARGS, and either XIM or XMODIFIERS directly, and + optionally GTK_IM_MODULE if appropriate. + - export XMODIFIERS also if it was already initialized + +* Wed Jun 23 2004 Mike A. Harris 4.0.0-1 +- Created xinitrc-3-stable-branch in CVS for maintaining the 3.x branch of + xinitrc. New development will occur in the 4.x releases, intended for + Fedora Core 3 and Red Hat Enterprise Linux 4. +- Added back changes from 3.40-1 which were reverted in 3.42-1, as these were + intended for development. +- Renamed xinput script to xinput.sh to comply with new *.sh policy of scripts + in xinitrc.d directory +- Do not flag /etc/X11/xinit/xinitrc.d/* as config files, as they are scripts, + not config files. + +* Wed Jun 23 2004 Mike A. Harris 3.42-1 +- Reverted changes from 3.40-1, which were intended to be included in + Fedora Core 3 development, but accidentally made it into Fedora Core 2 + erratum. + +* Tue Jun 1 2004 Mike A. Harris 3.41-1 +- Fixed missing quote in xinput script (#123804) + +* Fri May 7 2004 Mike A. Harris 3.40-1 +- Modified xinitrc and Xsession scripts to only source files with .sh + extensions in /etc/X11/xinit/xinitrc.d/* so that backup files that are + created when hand editing the scripts, aren't executed. (FC2BLOCKER + #119241) + +* Tue Mar 30 2004 Mike A. Harris 3.39-1 +- Fix problem in xinput script caused due to a bit of over-quoting in recent + changes, which result in logged erros (FC2 BLOCKER #119529) + +* Mon Mar 29 2004 Mike A. Harris 3.38-1 +- xinput fixes: + - Fix missing ']' on elif test on line 25 (FC2 BLOCKER #119284) + - Change test for /etc/profile.d/lang.sh to test with -r instead of -f + - Change all non-null string tests to use -n instead of != "" + - Change broken test logic in KDE block to use -o instead of || + - Fixes for iiimf getting turned on even for European languages where it + is not useful. (Jens Petersen, FC2 BLOCKER #119240) +- Xsession cleanups: + - Update Xsession for new switchdesk (Than Ngo, FC2 BLOCKER #116164) + - Change all file existance tests using -f, to -r since we care if it is + readable rather than if it exists or not. + - Use new style $() command substitution rather than `` +- Updated the copyright messages of all script files, and added missing + GPLv2 notices where appropriate. Updated License: tag of spec file to be + "GPLv2, MIT/X11" + +* Tue Mar 16 2004 Mike A. Harris 3.37-1 +- Disable Requires: XFree86 dep, and add comment to spec file with reasoning, + so if anything breaks, we can fix it up in a better way later on +- Xclients cleanups: + - Check for existance of xclock and xterm binaries, both in /usr/bin, and + in /usr/X11R6/bin before trying to execute either in failsafe + - Check for executable existance of mozilla/fvwm/twm with -x, rather than + just checking for existance with -f, and then use the explicit path to + these binaries when executing them +- xinput cleanups: + - Change shebang to use /bin/bash instead of /bin/sh, as our OS is always + guaranteed to have /bin/bash installed on it because many other things + require it anyway. This makes it explicitly legal to use bashisms + everywhere, of which are usually already being used anyway without notice, + because /bin/sh is a link to /bin/bash by default. + - Replace old style usage of "test x$foo" with 'if [ "$foo"' as it is much + more readable. + - Test for the readability of /etc/sysconfig/i18n with -r, rather than + it's mere existance with -e + - Everywhere -e was used to test for the existance of a binary prior to + executing it, has been replaced with -x, which tests for executability +- Added "Requires: /usr/X11R6/bin/sessreg" for GiveConsole and TakeConsole +- Added "Requires: which /usr/X11R6/bin/RunWM" for Xclients +- Added "Requires: /sbin/pidof /usr/X11R6/bin/xsetroot" for Xsetup_0 + +* Tue Mar 16 2004 Jens Petersen 3.36-1 +- default input method to htt (im-iiim for gtk apps and httx for xim apps) + if htt is running when XIM is not set (#118382) +- default kinput2 to use canna if cannaserver running or wnn if jserver + running (Adrian Havill, #112631) when XIM_ARGS is not set +- add support for nabi (sangu, #112521) and uim +- do not set XIM to none (Eric Backus, #57876) +- ami no longer includes applet (Won-kyu Park, #61540) and so delayed-start + code is no longer needed + +* Thu Oct 23 2003 Mike A. Harris 3.35-1 +- Remove limitations forcing xcin to only work in UTF-8 mode (#97331) + +* Mon Oct 20 2003 Mike A. Harris 3.34-1 +- Changed the default background colour argument passed to xsetroot in both + the Xsession and Xsetup_0 scripts from "#5477A0" to "#20305A" + +* Thu Aug 28 2003 Mike A. Harris 3.33-1 +- Added Xsession update for new gdm for Cambridge (#103251) + +* Wed Feb 5 2003 Mike A. Harris 3.32-1 +- Rebuild + +* Tue Sep 10 2002 Bill Nottingham 3.30-1 +- unset TERM to avoid font wackiness when sourcing lang.sh + +* Thu Sep 5 2002 Owen Taylor 3.29-1 +- Add . /etc/profile.d/lang.sh to xinput (#73062) + +* Mon Sep 2 2002 Owen Taylor 3.28-1 +- Change default Xft hinting settings to hintmedium, not hintnone + +* Wed Aug 28 2002 Bill Nottingham 3.27-1 +- don't grep /etc/sysconfig/desktop; actually read it + +* Wed Jul 31 2002 Mike A. Harris 3.26-1 +- Added windowmaker support to Xclients for bug (#66225) + +* Sat Jul 20 2002 Mike A. Harris 3.25-1 +- Fix ssh-agent code added on Jun 27th to not start ssh-agent if it is + already running (#68626) + +* Fri Jun 28 2002 Owen Taylor 3.24-1 +- Add a Xresources file that sets Xft DPI to 96 +- Make Xsetup_0 load /etc/X11/Xresources + +* Thu Jun 27 2002 Preston Brown 3.23-1 +- use ssh-agent to start sessions if available. + +* Mon Apr 8 2002 Mike A. Harris 3.22-1 +- There were 3 different versions of 3.21 from different developers, which + had reverted some of my previous changes. I believe I have now fixed + these problems. +- Added Wnn7 support from Yukihiro Nakai (#61951) +- Made changes for Leon (removed debugging code from xinput, etc) + +* Wed Feb 27 2002 Mike A. Harris 3.21-1 +- Removed glidelink hack, as XFree86 4.2.0 now comes with code to load + the proper glide3 library automatically. * Thu Aug 23 2001 Mike A. Harris 3.20-1 - Removed tempfile vulnerability in xinput writing to /tmp/start.txt From fedora-cvs-commits at redhat.com Mon Mar 21 17:43:42 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 12:43:42 -0500 Subject: rpms/system-config-printer/FC-3 .cvsignore, 1.26, 1.27 printconf.spec, 1.27, 1.28 sources, 1.26, 1.27 Message-ID: <200503211743.j2LHhgW6001220@cvs.devel.redhat.com> Update of /cvs/dist/rpms/system-config-printer/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv1204 Modified Files: .cvsignore printconf.spec sources Log Message: * Mon Mar 21 2005 Tim Waugh 0.6.116.1.4-1 - 0.6.116.1.4: - Another attempt at fixing bool handling (bug #151161). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-3/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 21 Mar 2005 15:07:07 -0000 1.26 +++ .cvsignore 21 Mar 2005 17:43:37 -0000 1.27 @@ -6,3 +6,4 @@ printconf-0.6.116.1.1.tar.bz2 printconf-0.6.116.1.2.tar.bz2 printconf-0.6.116.1.3.tar.bz2 +printconf-0.6.116.1.4.tar.bz2 Index: printconf.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-3/printconf.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- printconf.spec 21 Mar 2005 15:07:07 -0000 1.27 +++ printconf.spec 21 Mar 2005 17:43:37 -0000 1.28 @@ -1,6 +1,6 @@ Summary: A printer configuration backend/frontend combination. Name: system-config-printer -Version: 0.6.116.1.3 +Version: 0.6.116.1.4 Release: 1 License: GPL Group: System Environment/Daemons @@ -179,6 +179,10 @@ %changelog +* Mon Mar 21 2005 Tim Waugh 0.6.116.1.4-1 +- 0.6.116.1.4: + - Another attempt at fixing bool handling (bug #151161). + * Mon Mar 21 2005 Tim Waugh 0.6.116.1.3-1 - 0.6.116.1.3: - One more instance of manged/demangled names confusion (bug #147330). Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-3/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 21 Mar 2005 15:07:07 -0000 1.26 +++ sources 21 Mar 2005 17:43:37 -0000 1.27 @@ -1 +1 @@ -cadb5aed885b20e5511dfb52aef2d09b printconf-0.6.116.1.3.tar.bz2 +034066c3039558e07de9e4460d438b07 printconf-0.6.116.1.4.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 21 20:05:22 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 15:05:22 -0500 Subject: rpms/mailman/FC-2 mailman-2.1-CAN-2004-1177.patch, NONE, 1.1 mailman.spec, 1.20, 1.21 Message-ID: <200503212005.j2LK5MIf009410@cvs.devel.redhat.com> Update of /cvs/dist/rpms/mailman/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv9401 Modified Files: mailman.spec Added Files: mailman-2.1-CAN-2004-1177.patch Log Message: fix bug 147833, CAN-2004-1177 mailman-2.1-CAN-2004-1177.patch: driver | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) --- NEW FILE mailman-2.1-CAN-2004-1177.patch --- --- mailman-2.1.5.orig/scripts/driver 2003-04-20 00:52:55.000000000 -0400 +++ /usr/src/local/mailman/mailman/scripts/driver 2004-12-27 19:38:22.000000000 -0500 @@ -1,6 +1,6 @@ # -*- python -*- -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2004 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,7 +28,11 @@ # comfortable with. By setting STEALTH_MODE to 1, you disable the printing of # this information to the web pages. This information is still, and always, # printed in the error logs. -STEALTH_MODE = 0 +STEALTH_MODE = 1 + +# This will be set to the entity escaper. +def websafe(s): + return s @@ -53,12 +57,22 @@ def run_main(): + global STEALTH_MODE, websafe + # These will ensure that even if something between now and the # creation of the real logger below fails, we can still get # *something* meaningful. logger = None try: import paths + # When running in non-stealth mode, we need to escape entities, + # otherwise we're vulnerable to cross-site scripting attacks. + try: + if not STEALTH_MODE: + from Mailman.Utils import websafe + except: + STEALTH_MODE = 1 + raise # Map stderr to a logger, if possible. from Mailman.Logging.StampedLogger import StampedLogger logger = StampedLogger('error', @@ -140,11 +154,13 @@ a description of what happened. Thanks!

Traceback:

'''
+        exc_info = sys.exc_info()
         if traceback:
-            traceback.print_exc(file=sys.stdout)
+            for line in traceback.format_exception(*exc_info):
+                print websafe(line),
         else:
             print '[failed to import module traceback]'
-            print '[exc: %s, var: %s]' % sys.exc_info()[0:2]
+            print '[exc: %s, var: %s]' % [websafe(x) for x in exc_info[0:2]]
         print '\n\n
' else: print '''

Please inform the webmaster for this site of this @@ -212,7 +228,9 @@ ''' if os: for k, v in os.environ.items(): - print '', k, '', v, '' + print '', websafe(k), \ + '', websafe(v), \ + '' print '' else: print '

[failed to import module os]' Index: mailman.spec =================================================================== RCS file: /cvs/dist/rpms/mailman/FC-2/mailman.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mailman.spec 14 Feb 2005 16:39:36 -0000 1.20 +++ mailman.spec 21 Mar 2005 20:05:18 -0000 1.21 @@ -42,7 +42,7 @@ Summary: Mailing list manager with built in Web access. Name: mailman Version: 2.1.5 -Release: 9.fc2 +Release: 10.fc2 Epoch: 3 Group: Applications/Internet Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz @@ -58,6 +58,7 @@ Patch3: mailman-2.1-mailmanctl-status.patch Patch4: mailman-2.1-CAN-2005-0202.patch Patch5: mailman-2.1.5-moderator-request.patch +Patch6: mailman-2.1-CAN-2004-1177.patch License: GPL URL: http://www.list.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -88,6 +89,7 @@ %patch3 -p1 -b .status %patch4 -p1 -b .CAN-2005-0202 %patch5 -p0 -b .moderator-request +%patch6 -p1 -b .CAN-2004-1177 cp $RPM_SOURCE_DIR/mailman-README.REDHAT README.REDHAT cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in @@ -334,6 +336,9 @@ %attr(0755 root root) /etc/rc.d/init.d/mailman %changelog +* Mon Mar 21 2005 John Dennis - 3:2.1.5-10.fc2 +- fix bug #147833, CAN-2004-1177 + * Mon Feb 14 2005 John Dennis - 3:2.1.5-9.fc2 - fix bug #147856, moderator -1 admin requests pending From fedora-cvs-commits at redhat.com Mon Mar 21 21:44:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 16:44:38 -0500 Subject: rpms/gnome-system-monitor/devel gnome-system-monitor.spec, 1.22, 1.23 Message-ID: <200503212144.j2LLicLg000952@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnome-system-monitor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv935 Modified Files: gnome-system-monitor.spec Log Message: * Mon Mar 21 2005 David Zeuthen 2.10.0-2 - Build with selinux support (#139896) Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gnome-system-monitor.spec 14 Mar 2005 16:02:12 -0000 1.22 +++ gnome-system-monitor.spec 21 Mar 2005 21:44:36 -0000 1.23 @@ -6,11 +6,12 @@ %define pango_version 1.2.0 %define gtk2_version 2.3.0 %define desktop_file_utils_version 0.2.90 +%define libselinux_version 1.23.2 Summary: Simple process monitor Name: gnome-system-monitor Version: 2.10.0 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2 @@ -18,6 +19,7 @@ Requires: libgnomeui >= %{libgnomeui_version} Requires: libgtop2 >= %{libgtop2_version} Requires: libwnck >= %{libwnck_version} +Requires: libselinux >= %{libselinux_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: libgtop2-devel >= %{libgtop2_version} BuildRequires: libwnck-devel >= %{libwnck_version} @@ -27,6 +29,7 @@ BuildRequires: startup-notification-devel BuildRequires: libtool autoconf automake16 BuildRequires: intltool scrollkeeper gettext +BuildRequires: libselinux-devel >= %{libselinux_version} Obsoletes: gtop @@ -39,7 +42,7 @@ %build autoconf -%configure +%configure --enable-selinux make %{?_smp_mflags} @@ -77,6 +80,9 @@ %{_datadir}/omf %changelog +* Mon Mar 21 2005 David Zeuthen 2.10.0-2 +- Build with selinux support (#139896) + * Mon Mar 14 2005 Matthias Clasen 2.10.0-1 - Update to 2.10.0 - Bump BuildRequires for libwnck From fedora-cvs-commits at redhat.com Mon Mar 21 21:50:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 16:50:59 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.77, 1.78 anaconda.spec, 1.192, 1.193 sources, 1.191, 1.192 Message-ID: <200503212150.j2LLoxiV004215@cvs.devel.redhat.com> Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4192/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.2.0.29-1 on branch devel from anaconda-10.2.0.29-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- .cvsignore 14 Mar 2005 21:35:34 -0000 1.77 +++ .cvsignore 21 Mar 2005 21:50:57 -0000 1.78 @@ -1 +1 @@ -anaconda-10.2.0.28.tar.bz2 +anaconda-10.2.0.29.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- anaconda.spec 14 Mar 2005 21:35:36 -0000 1.192 +++ anaconda.spec 21 Mar 2005 21:50:57 -0000 1.193 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.2.0.28 +Version: 10.2.0.29 Release: 1 License: GPL Summary: Graphical system installer @@ -69,6 +69,16 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Mar 21 2005 Jeremy Katz - 10.2.0.29-1 +- Fix beta nag translation +- Fix button growing (clumens, #151208) +- Add libstdc++ for images (clumens) +- Clean up congrats screen (clumens, #149526) +- Fix CD ejecting in loader (pnasrat, #151232) +- Exclude Xen kernels from everything install (#151490) +- Add reserve_size for ppc to leave room on disc1 (#151234) +- Add some more locales + * Mon Mar 14 2005 Jeremy Katz - 10.2.0.28-1 - fix swap detection on upgrade (pjones) - don't use os.read to make a buffer of '\x00' (pjones) @@ -76,7 +86,7 @@ - fix Xvnc parameters (clumens, #150498) - unmount loopback-mounted ISO images to free loop0 (clumens, #150887) - fix warnings about gtk.TRUE and gtk.FALSE, partly based on a patch - from Colin Walters. (pjones) + from Colin Charles. (pjones) - sqlite3->sqlite (pnasrat) - support longer package names in hdlist (pnasrat, #146820) - Fix handling of --debug (Ingo Pakleppa, #150920, #150925) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- sources 14 Mar 2005 21:35:36 -0000 1.191 +++ sources 21 Mar 2005 21:50:57 -0000 1.192 @@ -1 +1 @@ -080207d26a762b5f110107fed32c8e67 anaconda-10.2.0.28.tar.bz2 +63debc80ddd4dd2928e38b12fdf130d8 anaconda-10.2.0.29.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 21 22:33:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 17:33:43 -0500 Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.2,1.3 Message-ID: <200503212233.j2LMXhxA030337@cvs.devel.redhat.com> Update of /cvs/dist/rpms/krb5-auth-dialog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30324 Modified Files: krb5-auth-dialog.spec Log Message: * Mon Mar 21 2005 David Zeuthen 0.2-3 - Fix up BuildRequires and Requires (#134704) Index: krb5-auth-dialog.spec =================================================================== RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- krb5-auth-dialog.spec 4 Mar 2005 21:17:03 -0000 1.2 +++ krb5-auth-dialog.spec 21 Mar 2005 22:33:40 -0000 1.3 @@ -1,12 +1,19 @@ +%define libgnomeui_version 2.9.1 +%define krb5_version 1.4 + Summary: Kerberos 5 authentication dialog Name: krb5-auth-dialog Version: 0.2 -Release: 2 +Release: 3 License: GPL Group: User Interface/X URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: libgnomeui-devel >= %{libgnomeui_version} +BuildRequires: krb5-devel >= ${krb5_version} +Requires: libgnomeui >= %{libgnomeui_version} +Requires: krb5 >= ${krb5_version} %description This package contains a dialog that warns the user when their Kerberos @@ -36,6 +43,9 @@ %changelog +* Mon Mar 21 2005 David Zeuthen 0.2-3 +- Fix up BuildRequires and Requires (#134704) + * Fri Mar 4 2005 David Zeuthen 0.2-2 - Rebuild From fedora-cvs-commits at redhat.com Mon Mar 21 23:05:03 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 18:05:03 -0500 Subject: rpms/gnome-keyring-manager/devel gnome-keyring-manager.spec, 1.3, 1.4 Message-ID: <200503212305.j2LN534p016405@cvs.devel.redhat.com> Update of /cvs/dist/rpms/gnome-keyring-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16382 Modified Files: gnome-keyring-manager.spec Log Message: * Mon Mar 21 2005 David Zeuthen 0.0.4-3 - Fix Group tag for consistency (#147903) Index: gnome-keyring-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-keyring-manager.spec 2 Mar 2005 15:40:47 -0000 1.3 +++ gnome-keyring-manager.spec 21 Mar 2005 23:05:01 -0000 1.4 @@ -1,9 +1,9 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-keyring-manager Version: 0.0.4 -Release: 2 +Release: 3 License: GPL -Group: User Interface/Desktop +Group: User Interface/Desktops Source: gnome-keyring-manager-%{version}.tar.bz2 URL: http://www.gnome.org/ @@ -51,6 +51,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Mon Mar 21 2005 David Zeuthen 0.0.4-3 +- Fix Group tag for consistency (#147903) + * Wed Mar 2 2005 Alex Larsson 0.0.4-2 - Rebuild From fedora-cvs-commits at redhat.com Tue Mar 22 00:39:11 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 19:39:11 -0500 Subject: rpms/firefox/FC-3 firefox-1.0-pango-rounding.patch,NONE,1.1 Message-ID: <200503220039.j2M0dBNa027462@cvs.devel.redhat.com> Update of /cvs/dist/rpms/firefox/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv27448 Added Files: firefox-1.0-pango-rounding.patch Log Message: add rounding patch firefox-1.0-pango-rounding.patch: nsFontMetricsPango.cpp | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) --- NEW FILE firefox-1.0-pango-rounding.patch --- --- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo 2005-03-21 17:09:14.000000000 -0500 +++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2005-03-21 17:16:53.000000000 -0500 @@ -501,13 +501,11 @@ pango_layout_get_size(layout, &width, &height); - width /= PANGO_SCALE; - g_object_unref(layout); float f; f = mDeviceContext->DevUnitsToAppUnits(); - aWidth = NSToCoordRound(width * f); + aWidth = NSToCoordRound(width * f / PANGO_SCALE); // printf("GetWidth (char *) %d\n", aWidth); @@ -541,11 +539,9 @@ FixupSpaceWidths(layout, text); pango_layout_get_size(layout, &width, &height); - width /= PANGO_SCALE; - float f; f = mDeviceContext->DevUnitsToAppUnits(); - aWidth = NSToCoordRound(width * f); + aWidth = NSToCoordRound(width * f / PANGO_SCALE); // printf("GetWidth %d\n", aWidth); @@ -601,9 +597,9 @@ float P2T; P2T = mDeviceContext->DevUnitsToAppUnits(); - aDimensions.width = NSToCoordRound(rect.width / PANGO_SCALE * P2T); - aDimensions.ascent = NSToCoordRound(PANGO_ASCENT(rect) / PANGO_SCALE * P2T); - aDimensions.descent = NSToCoordRound(PANGO_DESCENT(rect) / PANGO_SCALE * P2T); + aDimensions.width = NSToCoordRound(rect.width * P2T / PANGO_SCALE); + aDimensions.ascent = NSToCoordRound(PANGO_ASCENT(rect) * P2T / PANGO_SCALE); + aDimensions.descent = NSToCoordRound(PANGO_DESCENT(rect) * P2T / PANGO_SCALE); // printf("GetTextDimensions %d %d %d\n", aDimensions.width, //aDimensions.ascent, aDimensions.descent); @@ -880,12 +876,12 @@ P2T = mDeviceContext->DevUnitsToAppUnits(); aBoundingMetrics.leftBearing = - NSToCoordRound(rect.x / PANGO_SCALE * P2T); + NSToCoordRound(rect.x * P2T / PANGO_SCALE); aBoundingMetrics.rightBearing = - NSToCoordRound(rect.width / PANGO_SCALE * P2T); - aBoundingMetrics.width = NSToCoordRound((rect.x + rect.width) / PANGO_SCALE * P2T); - aBoundingMetrics.ascent = NSToCoordRound(rect.y / PANGO_SCALE * P2T); - aBoundingMetrics.descent = NSToCoordRound(rect.height / PANGO_SCALE * P2T); + NSToCoordRound(rect.width * P2T / PANGO_SCALE); + aBoundingMetrics.width = NSToCoordRound((rect.x + rect.width) * P2T / PANGO_SCALE); + aBoundingMetrics.ascent = NSToCoordRound(rect.y * P2T / PANGO_SCALE); + aBoundingMetrics.descent = NSToCoordRound(rect.height * P2T / PANGO_SCALE); loser: g_free(text); @@ -1118,11 +1114,11 @@ // Convert the width into app units for (int i = 0; i < n_ranges; i++) { - aWidth += (ranges[(i * 2) + 1] - ranges[(i * 2)]) / PANGO_SCALE; + aWidth += (ranges[(i * 2) + 1] - ranges[(i * 2)]); } f = mDeviceContext-> DevUnitsToAppUnits(); - aWidth = nscoord(aWidth * f); + aWidth = nscoord(aWidth * f / PANGO_SCALE); loser: if (ranges) From fedora-cvs-commits at redhat.com Tue Mar 22 02:51:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 21:51:10 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1191, 1.1192 linux-2.6.3-printopen.patch, 1.1, 1.2 Message-ID: <200503220251.j2M2pAnd022949@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22933 Modified Files: kernel-2.6.spec linux-2.6.3-printopen.patch Log Message: fix up reject Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1191 retrieving revision 1.1192 diff -u -r1.1191 -r1.1192 --- kernel-2.6.spec 19 Mar 2005 04:14:19 -0000 1.1191 +++ kernel-2.6.spec 22 Mar 2005 02:51:07 -0000 1.1192 @@ -683,7 +683,7 @@ # the first 180 seconds after boot for debugging userspace startup # speeds # -# %patch2999 -p1 +%patch2999 -p1 # # External drivers that are about to get accepted upstream linux-2.6.3-printopen.patch: linux-2.6.11/include/linux/jiffies.h | 2 +- linux-2.6.3/fs/exec.c | 13 +++++++++++++ linux-2.6.3/fs/open.c | 18 ++++++++++++------ linux/fs/namei.c | 9 +++++++++ linux/fs/open.c | 7 +++++++ 5 files changed, 42 insertions(+), 7 deletions(-) Index: linux-2.6.3-printopen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-printopen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.3-printopen.patch 9 Sep 2004 13:53:35 -0000 1.1 +++ linux-2.6.3-printopen.patch 22 Mar 2005 02:51:07 -0000 1.2 @@ -41,9 +41,9 @@ fd = get_unused_fd(); if (fd >= 0) { struct file *f = filp_open(tmp, flags, mode); ---- linux-2.6.3/include/linux/time.h~ 2004-03-04 19:53:03.489533000 +0100 -+++ linux-2.6.3/include/linux/time.h 2004-03-04 19:53:03.489533000 +0100 -@@ -41,7 +41,7 @@ +--- linux-2.6.11/include/linux/jiffies.h~ 2005-03-21 21:26:11.000000000 -0500 ++++ linux-2.6.11/include/linux/jiffies.h 2005-03-21 21:26:26.000000000 -0500 +@@ -122,7 +122,7 @@ static inline u64 get_jiffies_64(void) * Have the 32 bit jiffies value wrap 5 minutes after boot * so jiffies wrap bugs show up earlier. */ From fedora-cvs-commits at redhat.com Tue Mar 22 03:13:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 Mar 2005 22:13:00 -0500 Subject: rpms/kernel/devel linux-2.6.3-printopen.patch,1.2,1.3 Message-ID: <200503220313.j2M3D0cu001643@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1629 Modified Files: linux-2.6.3-printopen.patch Log Message: fix up reject linux-2.6.3-printopen.patch: linux-2.6.11/fs/exec.c | 10 ++++++++++ linux-2.6.11/include/linux/jiffies.h | 2 +- linux-2.6.3/fs/open.c | 18 ++++++++++++------ linux/fs/namei.c | 9 +++++++++ linux/fs/open.c | 7 +++++++ 5 files changed, 39 insertions(+), 7 deletions(-) Index: linux-2.6.3-printopen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-printopen.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.3-printopen.patch 22 Mar 2005 02:51:07 -0000 1.2 +++ linux-2.6.3-printopen.patch 22 Mar 2005 03:12:56 -0000 1.3 @@ -94,25 +94,22 @@ } out: putname(tmp); ---- linux-2.6.3/fs/exec.c~ 2004-03-05 11:12:37.702338000 +0100 -+++ linux-2.6.3/fs/exec.c 2004-03-05 11:12:37.702338000 +0100 -@@ -1118,6 +1118,19 @@ - retval = PTR_ERR(file); - if (IS_ERR(file)) - return retval; -+ +--- linux-2.6.11/fs/exec.c~ 2005-03-21 22:02:08.000000000 -0500 ++++ linux-2.6.11/fs/exec.c 2005-03-21 22:12:16.000000000 -0500 +@@ -1157,6 +1157,16 @@ int do_execve(char * filename, + + sched_exec(); + + { + static unsigned long prev_jiffies; + static char buf[4096]; + char *p; + p = d_path(file->f_dentry, file->f_vfsmnt, buf, PAGE_SIZE - 1); + if (jiffies < 180 * HZ) -+ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ, -+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, -+ p); ++ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s\n", jiffies / HZ, jiffies+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, p); + prev_jiffies = jiffies; + } -+ ++ + bprm->p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *); - bprm.p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *); - memset(bprm.page, 0, MAX_ARG_PAGES*sizeof(bprm.page[0])); + bprm->file = file; From fedora-cvs-commits at redhat.com Tue Mar 22 05:31:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 Mar 2005 00:31:38 -0500 Subject: rpms/kernel/devel linux-2.6.3-printopen.patch,1.3,1.4 Message-ID: <200503220531.j2M5Vcu6009350@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9321 Modified Files: linux-2.6.3-printopen.patch Log Message: fix stack usage. linux-2.6.3-printopen.patch: linux-2.6.11/fs/exec.c | 10 ++++++++++ linux-2.6.11/include/linux/jiffies.h | 2 +- linux-2.6.3/fs/open.c | 18 ++++++++++++------ linux/fs/namei.c | 9 +++++++++ linux/fs/open.c | 7 +++++++ 5 files changed, 39 insertions(+), 7 deletions(-) Index: linux-2.6.3-printopen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-printopen.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.3-printopen.patch 22 Mar 2005 03:12:56 -0000 1.3 +++ linux-2.6.3-printopen.patch 22 Mar 2005 05:31:30 -0000 1.4 @@ -81,10 +81,10 @@ fd_install(fd, f); + { + static unsigned long prev_jiffies; -+ static char buf[4096]; ++ static char buf[1024]; + char *p; + p = d_path(f->f_dentry, f->f_vfsmnt, -+ buf, PAGE_SIZE - 1); ++ buf, 1023); + if (jiffies < 180 * HZ) + printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ, + (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, @@ -102,11 +102,11 @@ + { + static unsigned long prev_jiffies; -+ static char buf[4096]; ++ static char buf[1024]; + char *p; -+ p = d_path(file->f_dentry, file->f_vfsmnt, buf, PAGE_SIZE - 1); ++ p = d_path(file->f_dentry, file->f_vfsmnt, buf, 1023); + if (jiffies < 180 * HZ) -+ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s\n", jiffies / HZ, jiffies+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, p); ++ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s\n", jiffies / HZ, jiffies+(jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, p); + prev_jiffies = jiffies; + } + From fedora-cvs-commits at redhat.com Tue Mar 22 05:32:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 Mar 2005 00:32:10 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1192,1.1193 Message-ID: <200503220532.j2M5WAul009395@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9378 Modified Files: kernel-2.6.spec Log Message: rebuild Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1192 retrieving revision 1.1193 diff -u -r1.1192 -r1.1193 --- kernel-2.6.spec 22 Mar 2005 02:51:07 -0000 1.1192 +++ kernel-2.6.spec 22 Mar 2005 05:32:05 -0000 1.1193 @@ -1078,6 +1078,9 @@ %endif %changelog +* Tue Mar 22 2005 Dave Jones +- rebuild. + * Fri Mar 18 2005 Dave Jones - kjournald release race. (#146344) - 2.6.12rc1 From fedora-cvs-commits at redhat.com Tue Mar 22 05:32:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 Mar 2005 00:32:47 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1193,1.1194 Message-ID: <200503220532.j2M5Wldv009484@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9469 Modified Files: kernel-2.6.spec Log Message: just do an x86 build for now Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1193 retrieving revision 1.1194 diff -u -r1.1193 -r1.1194 --- kernel-2.6.spec 22 Mar 2005 05:32:05 -0000 1.1193 +++ kernel-2.6.spec 22 Mar 2005 05:32:44 -0000 1.1194 @@ -157,7 +157,8 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ppc64iseries sparc sparc64 ppc s390 s390x ia64 -ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ppc64iseries ppc +#ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ppc64iseries ppc +ExclusiveArch: noarch %{all_x86} ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -1078,9 +1079,6 @@ %endif %changelog -* Tue Mar 22 2005 Dave Jones -- rebuild. - * Fri Mar 18 2005 Dave Jones - kjournald release race. (#146344) - 2.6.12rc1 From fedora-cvs-commits at redhat.com Tue Mar 22 05:38:30 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 Mar 2005 00:38:30 -0500 Subject: rpms/kernel/devel linux-2.6.3-printopen.patch,1.4,1.5 Message-ID: <200503220538.j2M5cULW009789@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9763 Modified Files: linux-2.6.3-printopen.patch Log Message: print culprit. linux-2.6.3-printopen.patch: linux-2.6.11/fs/exec.c | 10 ++++++++++ linux-2.6.11/include/linux/jiffies.h | 2 +- linux-2.6.3/fs/open.c | 18 ++++++++++++------ linux/fs/namei.c | 9 +++++++++ linux/fs/open.c | 7 +++++++ 5 files changed, 39 insertions(+), 7 deletions(-) Index: linux-2.6.3-printopen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-printopen.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6.3-printopen.patch 22 Mar 2005 05:31:30 -0000 1.4 +++ linux-2.6.3-printopen.patch 22 Mar 2005 05:38:27 -0000 1.5 @@ -86,9 +86,9 @@ + p = d_path(f->f_dentry, f->f_vfsmnt, + buf, 1023); + if (jiffies < 180 * HZ) -+ printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ, ++ printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s open()'d %s\n", jiffies / HZ, jiffies % HZ, + (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, -+ p); ++ current->comm, p); + prev_jiffies = jiffies; + } } @@ -106,7 +106,7 @@ + char *p; + p = d_path(file->f_dentry, file->f_vfsmnt, buf, 1023); + if (jiffies < 180 * HZ) -+ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s\n", jiffies / HZ, jiffies+(jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, p); ++ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s exec'd %s\n", jiffies / HZ, jiffies+(jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, current->comm, p); + prev_jiffies = jiffies; + } + From fedora-cvs-commits at redhat.com Tue Mar 22 06:56:14 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 Mar 2005 01:56:14 -0500 Subject: rpms/kernel/FC-2 kernel-2.6.spec, 1.127, 1.128 linux-2.6.9-ieee80211.patch, 1.2, 1.3 Message-ID: <200503220656.j2M6uEk1022007@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv21992 Modified Files: kernel-2.6.spec linux-2.6.9-ieee80211.patch Log Message: - Fix swapped parameters to memset in ieee802.11 code. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-2/kernel-2.6.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- kernel-2.6.spec 26 Feb 2005 00:06:20 -0000 1.127 +++ kernel-2.6.spec 22 Mar 2005 06:56:10 -0000 1.128 @@ -1000,6 +1000,9 @@ %endif %changelog +* Tue Mar 22 2005 Dave Jones +- Fix swapped parameters to memset in ieee802.11 code. + * Thu Feb 24 2005 Dave Jones - Use old scheme first when probing USB. (#145273) linux-2.6.9-ieee80211.patch: Makefile | 1 ieee80211/LICENSE | 339 ++++++++++ ieee80211/Makefile | 23 ieee80211/ieee80211.h | 861 +++++++++++++++++++++++++++ ieee80211/ieee80211_crypt.c | 253 ++++++++ ieee80211/ieee80211_crypt.h | 104 +++ ieee80211/ieee80211_crypt_ccmp.c | 493 +++++++++++++++ ieee80211/ieee80211_crypt_tkip.c | 734 +++++++++++++++++++++++ ieee80211/ieee80211_crypt_wep.c | 285 ++++++++- ieee80211/ieee80211_module.c | 254 ++++++++ ieee80211/ieee80211_rx.c | 1225 +++++++++++++++++++++++++++++++++++++-- ieee80211/ieee80211_tx.c | 576 ++++++++++++++++-- ieee80211/ieee80211_wx.c | 610 +++++++++++++++++-- 13 files changed, 5587 insertions(+), 171 deletions(-) Index: linux-2.6.9-ieee80211.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-2/linux-2.6.9-ieee80211.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.9-ieee80211.patch 1 Jan 2005 23:12:48 -0000 1.2 +++ linux-2.6.9-ieee80211.patch 22 Mar 2005 06:56:10 -0000 1.3 @@ -2723,7 +2723,7 @@ + if (!txb) + return NULL; + -+ memset(txb, sizeof(struct ieee80211_txb), 0); ++ memset(txb, 0, sizeof(struct ieee80211_txb)); + txb->nr_frags = nr_frags; + txb->frag_size = txb_size; + From fedora-cvs-commits at redhat.com Tue Mar 22 06:57:58 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 Mar 2005 01:57:58 -0500 Subject: rpms/kernel/FC-3/configs config-generic,1.2,1.3 Message-ID: <200503220657.j2M6vwMd022078@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/FC-3/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv22047/configs Modified Files: config-generic Log Message: swapped args Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/configs/config-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-generic 10 Mar 2005 22:32:34 -0000 1.2 +++ config-generic 22 Mar 2005 06:57:56 -0000 1.3 @@ -1688,7 +1688,7 @@ CONFIG_DVB_VES1X93=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_BT8XX=m -# CONFIG_DVB_TDA1004X is not set +CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m # From fedora-cvs-commits at redhat.com Tue Mar 22 06:58:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 Mar 2005 01:58:00 -0500 Subject: rpms/kernel/FC-3 kernel-2.6.spec, 1.791, 1.792 linux-2.6.10-xen.patch, 1.1, 1.2 linux-2.6.9-ieee80211.patch, 1.3, 1.4 Message-ID: <200503220658.j2M6w0C3022067@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv22047 Modified Files: kernel-2.6.spec linux-2.6.10-xen.patch linux-2.6.9-ieee80211.patch Log Message: swapped args Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v retrieving revision 1.791 retrieving revision 1.792 diff -u -r1.791 -r1.792 --- kernel-2.6.spec 20 Mar 2005 00:55:12 -0000 1.791 +++ kernel-2.6.spec 22 Mar 2005 06:57:56 -0000 1.792 @@ -900,6 +900,9 @@ %endif %changelog +* Tue Mar 22 2005 Dave Jones +- Fix up several calls to memset with swapped arguments. + * Sat Mar 19 2005 Dave Jones - Update to 2.6.11.5 linux-2.6.10-xen.patch: arch/xen/Kconfig | 174 ++ arch/xen/Kconfig.drivers | 55 arch/xen/Makefile | 70 arch/xen/boot/Makefile | 8 arch/xen/configs/xen0_defconfig | 1078 ++++++++++++ arch/xen/configs/xenU_defconfig | 513 ++++++ arch/xen/i386/Kconfig | 954 +++++++++++ arch/xen/i386/Makefile | 102 + arch/xen/i386/kernel/Makefile | 91 + arch/xen/i386/kernel/cpu/Makefile | 31 arch/xen/i386/kernel/cpu/common.c | 601 +++++++ arch/xen/i386/kernel/cpu/mtrr/Makefile | 16 arch/xen/i386/kernel/cpu/mtrr/main.c | 165 + arch/xen/i386/kernel/entry.S | 1080 +++++++++++++ arch/xen/i386/kernel/head.S | 185 ++ arch/xen/i386/kernel/i386_ksyms.c | 196 ++ arch/xen/i386/kernel/ioport.c | 51 arch/xen/i386/kernel/irq.c | 258 +++ arch/xen/i386/kernel/ldt.c | 270 +++ arch/xen/i386/kernel/microcode.c | 163 + arch/xen/i386/kernel/pci-dma.c | 232 ++ arch/xen/i386/kernel/process.c | 769 +++++++++ arch/xen/i386/kernel/setup.c | 1550 ++++++++++++++++++ arch/xen/i386/kernel/signal.c | 664 +++++++ arch/xen/i386/kernel/smp.c | 599 +++++++ arch/xen/i386/kernel/smpboot.c | 1364 ++++++++++++++++ arch/xen/i386/kernel/time.c | 811 +++++++++ arch/xen/i386/kernel/timers/Makefile | 17 arch/xen/i386/kernel/timers/timer_tsc.c | 379 ++++ arch/xen/i386/kernel/traps.c | 993 +++++++++++ arch/xen/i386/kernel/vsyscall.S | 15 arch/xen/i386/kernel/vsyscall.lds | 69 arch/xen/i386/mm/Makefile | 24 arch/xen/i386/mm/fault.c | 558 ++++++ arch/xen/i386/mm/highmem.c | 137 + arch/xen/i386/mm/hypervisor.c | 467 +++++ arch/xen/i386/mm/init.c | 800 +++++++++ arch/xen/i386/mm/ioremap.c | 440 +++++ arch/xen/i386/mm/pageattr.c | 215 ++ arch/xen/i386/mm/pgtable.c | 430 +++++ arch/xen/i386/pci/Makefile | 31 arch/xen/i386/pci/direct.c | 83 arch/xen/i386/pci/irq.c | 153 + arch/xen/kernel/Makefile | 15 arch/xen/kernel/ctrl_if.c | 564 ++++++ arch/xen/kernel/devmem.c | 158 + arch/xen/kernel/evtchn.c | 585 +++++++ arch/xen/kernel/fixup.c | 86 + arch/xen/kernel/gnttab.c | 163 + arch/xen/kernel/reboot.c | 262 +++ arch/xen/kernel/skbuff.c | 47 arch/xen/kernel/smp.c | 19 arch/xen/kernel/xen_proc.c | 18 drivers/Makefile | 1 drivers/char/mem.c | 11 drivers/char/tty_io.c | 23 drivers/xen/Makefile | 13 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 441 +++++ drivers/xen/blkback/Makefile | 2 drivers/xen/blkback/blkback.c | 621 +++++++ drivers/xen/blkback/common.h | 123 + drivers/xen/blkback/control.c | 87 + drivers/xen/blkback/interface.c | 249 ++ drivers/xen/blkback/vbd.c | 576 ++++++ drivers/xen/blkfront/Kconfig | 6 drivers/xen/blkfront/Makefile | 3 drivers/xen/blkfront/blkfront.c | 1410 ++++++++++++++++ drivers/xen/blkfront/block.h | 115 + drivers/xen/blkfront/vbd.c | 563 ++++++ drivers/xen/blktap/Makefile | 3 drivers/xen/blktap/blktap.c | 87 + drivers/xen/blktap/blktap.h | 242 ++ drivers/xen/blktap/blktap_controlmsg.c | 517 ++++++ drivers/xen/blktap/blktap_datapath.c | 481 +++++ drivers/xen/blktap/blktap_userdev.c | 470 +++++ drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 772 +++++++++ drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 430 +++++ drivers/xen/netback/Makefile | 2 drivers/xen/netback/common.h | 103 + drivers/xen/netback/control.c | 70 drivers/xen/netback/interface.c | 380 ++++ drivers/xen/netback/netback.c | 800 +++++++++ drivers/xen/netfront/Kconfig | 6 drivers/xen/netfront/Makefile | 2 drivers/xen/netfront/netfront.c | 1310 +++++++++++++++ drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 218 ++ drivers/xen/usbback/common.h | 85 + drivers/xen/usbback/control.c | 77 drivers/xen/usbback/interface.c | 252 +++ drivers/xen/usbback/usbback.c | 1070 ++++++++++++ drivers/xen/usbfront/usbfront.c | 1661 ++++++++++++++++++++ drivers/xen/usbfront/xhci.h | 180 ++ include/asm-generic/pgtable.h | 10 include/asm-xen/asm-i386/desc.h | 133 + include/asm-xen/asm-i386/dma-mapping.h | 177 ++ include/asm-xen/asm-i386/fixmap.h | 169 ++ include/asm-xen/asm-i386/floppy.h | 222 ++ include/asm-xen/asm-i386/highmem.h | 72 include/asm-xen/asm-i386/io.h | 425 +++++ include/asm-xen/asm-i386/mach-xen/irq_vectors.h | 137 + include/asm-xen/asm-i386/mach-xen/setup_arch_post.h | 46 include/asm-xen/asm-i386/mach-xen/setup_arch_pre.h | 5 include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h | 59 include/asm-xen/asm-i386/mmu_context.h | 74 include/asm-xen/asm-i386/page.h | 207 ++ include/asm-xen/asm-i386/param.h | 23 include/asm-xen/asm-i386/pci.h | 117 + include/asm-xen/asm-i386/pgalloc.h | 55 include/asm-xen/asm-i386/pgtable-2level-defs.h | 21 include/asm-xen/asm-i386/pgtable-2level.h | 148 + include/asm-xen/asm-i386/pgtable.h | 501 ++++++ include/asm-xen/asm-i386/processor.h | 676 ++++++++ include/asm-xen/asm-i386/ptrace.h | 67 include/asm-xen/asm-i386/segment.h | 96 + include/asm-xen/asm-i386/setup.h | 66 include/asm-xen/asm-i386/spinlock.h | 224 ++ include/asm-xen/asm-i386/synch_bitops.h | 83 include/asm-xen/asm-i386/system.h | 520 ++++++ include/asm-xen/asm-i386/tlbflush.h | 114 + include/asm-xen/asm-i386/vga.h | 20 include/asm-xen/balloon.h | 51 include/asm-xen/ctrl_if.h | 160 + include/asm-xen/evtchn.h | 106 + include/asm-xen/foreign_page.h | 30 include/asm-xen/gnttab.h | 35 include/asm-xen/hypervisor.h | 594 +++++++ include/asm-xen/linux-public/privcmd.h | 88 + include/asm-xen/linux-public/suspend.h | 43 include/asm-xen/multicall.h | 115 + include/asm-xen/queues.h | 81 include/asm-xen/xen-public/COPYING | 28 include/asm-xen/xen-public/arch-ia64.h | 98 + include/asm-xen/xen-public/arch-x86_32.h | 160 + include/asm-xen/xen-public/arch-x86_64.h | 211 ++ include/asm-xen/xen-public/dom0_ops.h | 455 +++++ include/asm-xen/xen-public/event_channel.h | 176 ++ include/asm-xen/xen-public/grant_table.h | 251 +++ include/asm-xen/xen-public/io/blkif.h | 101 + include/asm-xen/xen-public/io/domain_controller.h | 811 +++++++++ include/asm-xen/xen-public/io/ioreq.h | 61 include/asm-xen/xen-public/io/netif.h | 92 + include/asm-xen/xen-public/io/ring.h | 254 +++ include/asm-xen/xen-public/io/usbif.h | 67 include/asm-xen/xen-public/physdev.h | 88 + include/asm-xen/xen-public/sched_ctl.h | 70 include/asm-xen/xen-public/trace.h | 33 include/asm-xen/xen-public/xen.h | 445 +++++ include/asm-xen/xen_proc.h | 13 include/linux/gfp.h | 6 include/linux/irq.h | 1 kernel/irq/manage.c | 83 mm/memory.c | 4 mm/page_alloc.c | 6 157 files changed, 41496 insertions(+), 36 deletions(-) Index: linux-2.6.10-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.10-xen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.10-xen.patch 6 Mar 2005 22:37:13 -0000 1.1 +++ linux-2.6.10-xen.patch 22 Mar 2005 06:57:56 -0000 1.2 @@ -31136,7 +31136,7 @@ + /* Stick something in the shared communications ring. */ + req = RING_GET_REQUEST(USBIF_RING, usb_ring, usb_ring->req_prod_pvt); + -+ memset(req, sizeof(*req), 0); ++ memset(req, 0, sizeof(*req)); + + req->operation = USBIF_OP_PROBE; + req->port = port; @@ -31164,7 +31164,7 @@ + /* Stick something in the shared communications ring. */ + req = RING_GET_REQUEST(USBIF_RING, usb_ring, usb_ring->req_prod_pvt); + -+ memset(req, sizeof(*req), 0); ++ memset(req, 0, sizeof(*req)); + + req->operation = USBIF_OP_RESET; + req->port = port; linux-2.6.9-ieee80211.patch: Makefile | 1 ieee80211/LICENSE | 339 ++++++++ ieee80211/Makefile | 23 ieee80211/ieee80211.h | 1073 +++++++++++++++++++++++++-- ieee80211/ieee80211_crypt.c | 253 ++++++ ieee80211/ieee80211_crypt.h | 104 ++ ieee80211/ieee80211_crypt_ccmp.c | 493 ++++++++++++ ieee80211/ieee80211_crypt_tkip.c | 734 ++++++++++++++++++ ieee80211/ieee80211_crypt_wep.c | 285 +++++++ ieee80211/ieee80211_module.c | 306 +++++++ ieee80211/ieee80211_rx.c | 1521 ++++++++++++++++++++++++++++++++++----- ieee80211/ieee80211_tx.c | 762 +++++++++++++++---- ieee80211/ieee80211_wx.c | 640 ++++++++++++++-- 13 files changed, 6019 insertions(+), 515 deletions(-) Index: linux-2.6.9-ieee80211.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-ieee80211.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.9-ieee80211.patch 6 Mar 2005 22:35:14 -0000 1.3 +++ linux-2.6.9-ieee80211.patch 22 Mar 2005 06:57:56 -0000 1.4 @@ -2723,7 +2723,7 @@ + if (!txb) + return NULL; + -+ memset(txb, sizeof(struct ieee80211_txb), 0); ++ memset(txb, 0, sizeof(struct ieee80211_txb)); + txb->nr_frags = nr_frags; + txb->frag_size = txb_size; + From fedora-cvs-commits at redhat.com Tue Mar 22 07:00:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 Mar 2005 02:00:47 -0500 Subject: rpms/kernel/devel/scripts rediffall.pl,1.1,1.2 Message-ID: <200503220700.j2M70lI0022164@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel/scripts In directory cvs.devel.redhat.com:/tmp/cvs-serv22110/scripts Modified Files: rediffall.pl Log Message: rediff Index: rediffall.pl =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/scripts/rediffall.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rediffall.pl 6 Feb 2005 05:36:50 -0000 1.1 +++ rediffall.pl 22 Mar 2005 07:00:42 -0000 1.2 @@ -9,9 +9,9 @@ # Note that both $workdir and $origdir must be absolute path names. # Suggestion: create a /kernel symbolic link to the top of your CVS tree. -my $workdir = "/tmp/redifftree"; -my $origdir = "/kernel/rh-rpms/kernel/devel"; -my $kernver = "linux-2.6.8"; +my $workdir = "/dev/shm/redifftree"; +my $origdir = "/dev/shm/devel"; +my $kernver = "linux-2.6.11"; my $datestrip = "s/^\\(\\(+++\\|---\\) [^[:blank:]]\\+\\)[[:blank:]].*/\\1/"; my $patchindex = 0; my @patchlist; @@ -55,7 +55,7 @@ system("rm -f `find -name \"*orig\"`"); if ($patchlist[$patchindex] =~ /bz2/) { } else { - system("diff -urNp linux-$oldindex linux-$patchindex | sed '$datestrip' > $patchlist[$patchindex]"); + system("diff -urNp --exclude-from=/home/davej/.exclude linux-$oldindex linux-$patchindex | sed '$datestrip' > $patchlist[$patchindex]"); } system("rm -rf linux-$oldindex"); } From fedora-cvs-commits at redhat.com Tue Mar 22 07:00:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 Mar 2005 02:00:44 -0500 Subject: rpms/kernel/devel linux-2.4.0-nonintconfig.patch, 1.13, 1.14 linux-2.4.0-test11-vidfail.patch, 1.5, 1.6 linux-2.6.0-compile.patch, 1.147, 1.148 linux-2.6.0-must_check.patch, 1.18, 1.19 linux-2.6.0-sleepon.patch, 1.12, 1.13 linux-2.6.1-s390-compile.patch, 1.12, 1.13 linux-2.6.10-compile-fixes.patch, 1.7, 1.8 linux-2.6.10-crashdump-common.patch, 1.3, 1.4 linux-2.6.10-diskdump.patch, 1.1, 1.2 linux-2.6.10-netdump.patch, 1.2, 1.3 linux-2.6.10-periodic-slab-debug.patch, 1.2, 1.3 linux-2.6.10-ppc-headerabuse.patch, 1.1, 1.2 linux-2.6.10-revert-module-invalidparam.patch, 1.1, 1.2 linux-2.6.10-usb-use_both_schemes.patch, 1.3, 1.4 linux-2.6.10-x86-tune-p4.patch, 1.1, 1.2 linux-2.6.11-compile-fixes.patch, 1.8, 1.9 linux-2.6.11-devmem.patch, 1.1, 1.2 linux-2.6.11-execshield.patch, 1.2, 1.3 linux-2.6.11-ext3-release-race.patch, 1.1, 1.2 linux-2.6.11-tux.patch, 1.2, 1.3 linux-2.6.11-vm-taint.patch, 1.8, 1.9 linux-2.6.2-ppc64-build.patch, 1.9, 1.10 linux-2.6.3-crash-driver.patch, 1.4, 1.5 linux-2.6.3-ia64-build.patch, 1.1, 1.2! linux-2.6.3-printopen.patch, 1.5, 1.6 linux-2.6.3-sparc-addbzimage.patch, 1.1, 1.2 linux-2.6.4-stackusage.patch, 1.5, 1.6 linux-2.6.7-modsign-core.patch, 1.7, 1.8 linux-2.6.7-modsign-crypto.patch, 1.3, 1.4 linux-2.6.7-modsign-include.patch, 1.1, 1.2 linux-2.6.7-modsign-ksign.patch, 1.12, 1.13 linux-2.6.7-modsign-mpilib.patch, 1.2, 1.3 linux-2.6.7-modsign-script.patch, 1.6, 1.7 linux-2.6.8-lockd-racewarn2.patch, 1.1, 1.2 linux-2.6.8-netconsole.patch, 1.3, 1.4 linux-2.6.9-NFSD-non-null-getxattr.patch, 1.2, 1.3 linux-2.6.9-ide-cd-early-EOF.patch, 1.4, 1.5 linux-2.6.9-ieee80211.patch, 1.3, 1.4 linux-2.6.9-ipw2100.patch, 1.3, 1.4 linux-2.6.9-ipw2200.patch, 1.3, 1.4 linux-2.6.9-lockd-block-nosleep.patch, 1.1, 1.2 linux-2.6.9-lockd-reclaims.patch, 1.2, 1.3 linux-2.6.9-module_version.patch, 1.10, 1.11 linux-2.6.9-net-airo-nullptr.patch, 1.1, 1.2 linux-2.6.9-net-tr-irqlock-fix.patch, 1.1, 1.2 linux-2.6.9-s390-autoraid.patch, 1.1, 1.2 linux-2.6.9-s390-qeth_hipersocket-fix.patch, 1.1, 1.2 linux-2.6.9-s390-zfcp_port-fix.patch, 1.1! ,1.2 linux-2.6.9-scsi-advansys-enabler.patch,1.1,1.2 linux-2.6! .9-scsi- Message-ID: <200503220700.j2M70iAk022154@cvs.devel.redhat.com> Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22110 Modified Files: linux-2.4.0-nonintconfig.patch linux-2.4.0-test11-vidfail.patch linux-2.6.0-compile.patch linux-2.6.0-must_check.patch linux-2.6.0-sleepon.patch linux-2.6.1-s390-compile.patch linux-2.6.10-compile-fixes.patch linux-2.6.10-crashdump-common.patch linux-2.6.10-diskdump.patch linux-2.6.10-netdump.patch linux-2.6.10-periodic-slab-debug.patch linux-2.6.10-ppc-headerabuse.patch linux-2.6.10-revert-module-invalidparam.patch linux-2.6.10-usb-use_both_schemes.patch linux-2.6.10-x86-tune-p4.patch linux-2.6.11-compile-fixes.patch linux-2.6.11-devmem.patch linux-2.6.11-execshield.patch linux-2.6.11-ext3-release-race.patch linux-2.6.11-tux.patch linux-2.6.11-vm-taint.patch linux-2.6.2-ppc64-build.patch linux-2.6.3-crash-driver.patch linux-2.6.3-ia64-build.patch linux-2.6.3-printopen.patch linux-2.6.3-sparc-addbzimage.patch linux-2.6.4-stackusage.patch linux-2.6.7-modsign-core.patch linux-2.6.7-modsign-crypto.patch linux-2.6.7-modsign-include.patch linux-2.6.7-modsign-ksign.patch linux-2.6.7-modsign-mpilib.patch linux-2.6.7-modsign-script.patch linux-2.6.8-lockd-racewarn2.patch linux-2.6.8-netconsole.patch linux-2.6.9-NFSD-non-null-getxattr.patch linux-2.6.9-ide-cd-early-EOF.patch linux-2.6.9-ieee80211.patch linux-2.6.9-ipw2100.patch linux-2.6.9-ipw2200.patch linux-2.6.9-lockd-block-nosleep.patch linux-2.6.9-lockd-reclaims.patch linux-2.6.9-module_version.patch linux-2.6.9-net-airo-nullptr.patch linux-2.6.9-net-tr-irqlock-fix.patch linux-2.6.9-s390-autoraid.patch linux-2.6.9-s390-qeth_hipersocket-fix.patch linux-2.6.9-s390-zfcp_port-fix.patch linux-2.6.9-scsi-advansys-enabler.patch linux-2.6.9-scsi-megaraid-legacy.patch linux-2.6.9-spinlock-debug-panic.patch linux-2.6.9-vm-oomkiller-debugging.patch Log Message: rediff linux-2.4.0-nonintconfig.patch: Makefile | 4 ++++ conf.c | 26 +++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) Index: linux-2.4.0-nonintconfig.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.4.0-nonintconfig.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- linux-2.4.0-nonintconfig.patch 25 Dec 2004 05:22:15 -0000 1.13 +++ linux-2.4.0-nonintconfig.patch 22 Mar 2005 07:00:20 -0000 1.14 @@ -1,6 +1,6 @@ -diff -urNp linux-1/scripts/kconfig/conf.c linux-500/scripts/kconfig/conf.c ---- linux-1/scripts/kconfig/conf.c -+++ linux-500/scripts/kconfig/conf.c +diff -urNp --exclude-from=/home/davej/.exclude linux-600/scripts/kconfig/conf.c linux-800/scripts/kconfig/conf.c +--- linux-600/scripts/kconfig/conf.c ++++ linux-800/scripts/kconfig/conf.c @@ -20,6 +20,7 @@ enum { ask_all, ask_new, @@ -9,7 +9,7 @@ set_default, set_yes, set_mod, -@@ -37,6 +37,8 @@ static struct menu *rootEntry; +@@ -36,6 +37,8 @@ static struct menu *rootEntry; static char nohelp_text[] = "Sorry, no help available for this option yet.\n"; @@ -32,8 +32,8 @@ printf("%s\n", def); return; @@ -337,6 +346,10 @@ static int conf_choice(struct menu *menu - printf("?"); - printf("]: "); + printf("?"); + printf("]: "); switch (input_mode) { + case dont_ask: + cnt = def; @@ -85,9 +85,10 @@ - return 0; + return return_value; } ---- linux-2.6.3/scripts/kconfig/Makefile.orig 2004-02-25 16:59:55.934625904 +0100 -+++ linux-2.6.3/scripts/kconfig/Makefile 2004-02-25 17:02:37.076128672 +0100 -@@ -23,6 +23,10 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-600/scripts/kconfig/Makefile linux-800/scripts/kconfig/Makefile +--- linux-600/scripts/kconfig/Makefile ++++ linux-800/scripts/kconfig/Makefile +@@ -23,6 +23,10 @@ oldconfig: $(obj)/conf silentoldconfig: $(obj)/conf $< -s arch/$(ARCH)/Kconfig @@ -98,4 +99,3 @@ .PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig randconfig: $(obj)/conf - linux-2.4.0-test11-vidfail.patch: video.S | 4 ++++ 1 files changed, 4 insertions(+) Index: linux-2.4.0-test11-vidfail.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.4.0-test11-vidfail.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.4.0-test11-vidfail.patch 9 Sep 2004 13:05:21 -0000 1.5 +++ linux-2.4.0-test11-vidfail.patch 22 Mar 2005 07:00:21 -0000 1.6 @@ -1,6 +1,6 @@ -diff -urNp linux-1000/arch/i386/boot/video.S linux-1010/arch/i386/boot/video.S ---- linux-1000/arch/i386/boot/video.S 2001-07-05 20:28:16.000000000 +0200 -+++ linux-1010/arch/i386/boot/video.S +diff -urNp --exclude-from=/home/davej/.exclude linux-910/arch/i386/boot/video.S linux-1000/arch/i386/boot/video.S +--- linux-910/arch/i386/boot/video.S ++++ linux-1000/arch/i386/boot/video.S @@ -126,8 +126,12 @@ video: pushw %ds # We use different seg call mode_set # Set the mode jc vid1 linux-2.6.0-compile.patch: arch/i386/Makefile | 4 ++-- arch/i386/kernel/Makefile | 6 +++--- arch/i386/kernel/nmi.c | 2 +- arch/ppc64/Makefile | 2 +- arch/ppc64/boot/Makefile | 3 +++ arch/x86_64/ia32/sys_ia32.c | 1 - arch/x86_64/mm/init.c | 2 -- drivers/acpi/ec.c | 2 +- drivers/md/raid5.c | 2 ++ drivers/net/3c59x.c | 2 +- drivers/net/acenic.c | 2 +- drivers/pci/search.c | 2 +- drivers/scsi/ide-scsi.c | 6 ++++++ drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/storage/scsiglue.c | 2 +- drivers/usb/storage/usb.c | 2 +- fs/open.c | 1 - fs/proc/generic.c | 2 +- include/linux/config.h | 4 +++- include/linux/delay.h | 17 ++++++++--------- include/linux/gfp.h | 2 +- include/linux/namei.h | 2 +- init/Kconfig | 2 +- init/main.c | 3 ++- kernel/pid.c | 2 +- scripts/reference_discarded.pl | 3 ++- scripts/reference_init.pl | 1 + sound/core/oss/pcm_oss.c | 7 +++++++ sound/pci/intel8x0.c | 18 ++++++++++++++++++ 29 files changed, 71 insertions(+), 34 deletions(-) Index: linux-2.6.0-compile.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.0-compile.patch,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- linux-2.6.0-compile.patch 28 Feb 2005 23:31:53 -0000 1.147 +++ linux-2.6.0-compile.patch 22 Mar 2005 07:00:21 -0000 1.148 @@ -1,25 +1,25 @@ -diff -urNp linux-1130/arch/i386/kernel/Makefile linux-10000/arch/i386/kernel/Makefile ---- linux-1130/arch/i386/kernel/Makefile +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/kernel/Makefile linux-10000/arch/i386/kernel/Makefile +--- linux-3022/arch/i386/kernel/Makefile +++ linux-10000/arch/i386/kernel/Makefile -@@ -33,7 +33,7 @@ obj-$(CONFIG_EFI) += efi.o efi_stub.o +@@ -33,7 +33,7 @@ obj-$(CONFIG_HPET_TIMER) += time_hpet.o + obj-$(CONFIG_EFI) += efi.o efi_stub.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o - obj-$(CONFIG_X86_STD_RESOURCES) += std_resources.o -EXTRA_AFLAGS := -traditional +EXTRA_AFLAGS := -traditional -m32 obj-$(CONFIG_SCx200) += scx200.o -@@ -48,7 +48,7 @@ quiet_cmd_syscall = SYSCALL $@ - cmd_syscall = $(CC) -nostdlib $(SYSCFLAGS_$(@F)) \ - -Wl,-T,$(filter-out FORCE,$^) -o $@ +@@ -51,7 +51,7 @@ quiet_cmd_syscall = SYSCALL $@ + + export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH) -vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 +vsyscall-flags = -m32 -shared -s -Wl,-soname=linux-gate.so.1 SYSCFLAGS_vsyscall-sysenter.so = $(vsyscall-flags) SYSCFLAGS_vsyscall-int80.so = $(vsyscall-flags) -@@ -63,6 +63,6 @@ extra-y += vsyscall-syms.o +@@ -66,6 +66,6 @@ extra-y += vsyscall-syms.o $(obj)/built-in.o: $(obj)/vsyscall-syms.o $(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o @@ -27,19 +27,31 @@ +SYSCFLAGS_vsyscall-syms.o = -m32 -r $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds $(obj)/vsyscall-sysenter.o FORCE $(call if_changed,syscall) -diff -urNp linux-1130/arch/i386/Makefile linux-10000/arch/i386/Makefile ---- linux-1130/arch/i386/Makefile +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/kernel/nmi.c linux-10000/arch/i386/kernel/nmi.c +--- linux-3022/arch/i386/kernel/nmi.c ++++ linux-10000/arch/i386/kernel/nmi.c +@@ -491,7 +491,7 @@ void nmi_watchdog_tick (struct pt_regs * + * wait a few IRQs (5 seconds) before doing the oops ... + */ + alert_counter[cpu]++; +- if (alert_counter[cpu] == 5*nmi_hz) ++ if (alert_counter[cpu] == 30*nmi_hz) + die_nmi(regs, "NMI Watchdog detected LOCKUP"); + } else { + last_irq_sums[cpu] = sum; +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/Makefile linux-10000/arch/i386/Makefile +--- linux-3022/arch/i386/Makefile +++ linux-10000/arch/i386/Makefile -@@ -19,7 +19,7 @@ LDFLAGS := -m elf_i386 - OBJCOPYFLAGS := -O binary -R .note -R .comment -S +@@ -22,7 +22,7 @@ OBJCOPYFLAGS := -O binary -R .note -R .c LDFLAGS_vmlinux := + CHECKFLAGS += -D__i386__ -CFLAGS += -pipe -msoft-float +CFLAGS += -pipe -msoft-float -m32 -fno-builtin-sprintf -fno-builtin-log2 -fno-builtin-puts # prevent gcc from keeping the stack 16 byte aligned - CFLAGS += $(call check_gcc,-mpreferred-stack-boundary=2,) -@@ -111,7 +111,7 @@ drivers-$(CONFIG_OPROFILE) += arch/i386 + CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2) +@@ -118,7 +118,7 @@ drivers-$(CONFIG_OPROFILE) += arch/i386 drivers-$(CONFIG_PM) += arch/i386/power/ CFLAGS += $(mflags-y) @@ -48,19 +60,55 @@ boot := arch/i386/boot -diff -urNp linux-1130/arch/x86_64/ia32/sys_ia32.c linux-10000/arch/x86_64/ia32/sys_ia32.c ---- linux-1130/arch/x86_64/ia32/sys_ia32.c +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/ppc64/boot/Makefile linux-10000/arch/ppc64/boot/Makefile +--- linux-3022/arch/ppc64/boot/Makefile ++++ linux-10000/arch/ppc64/boot/Makefile +@@ -98,6 +98,9 @@ $(obj)/zImage: obj-boot += $(call obj-se + $(obj)/zImage: $(call obj-sec, $(required)) $(obj-boot) $(obj)/addnote FORCE + $(call if_changed,addnote) + ++$(obj)/zImage.stub: $(obj-boot) FORCE ++ $(BOOTLD) -r $(BOOTLFLAGS) -o $@ $(obj-boot) ++ + $(obj)/zImage.initrd: obj-boot += $(call obj-sec, $(required) $(initrd)) + $(obj)/zImage.initrd: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(obj)/addnote FORCE + $(call if_changed,addnote) +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/ppc64/Makefile linux-10000/arch/ppc64/Makefile +--- linux-3022/arch/ppc64/Makefile ++++ linux-10000/arch/ppc64/Makefile +@@ -82,7 +82,7 @@ boot := arch/ppc64/boot + bzImage: vmlinux + cp vmlinux arch/ppc64/boot/bzImage + +-boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd ++boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd zImage.stub + boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd + boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm + $(boottarget-y): vmlinux +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/x86_64/ia32/sys_ia32.c linux-10000/arch/x86_64/ia32/sys_ia32.c +--- linux-3022/arch/x86_64/ia32/sys_ia32.c +++ linux-10000/arch/x86_64/ia32/sys_ia32.c -@@ -1355,4 +1355,3 @@ static int __init ia32_init (void) +@@ -1048,4 +1048,3 @@ static int __init ia32_init (void) __initcall(ia32_init); extern unsigned long ia32_sys_call_table[]; -EXPORT_SYMBOL(ia32_sys_call_table); - if (ei->type == E820_RAM) { -diff -urNp linux-1130/drivers/acpi/ec.c linux-10000/drivers/acpi/ec.c ---- linux-1130/drivers/acpi/ec.c +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/x86_64/mm/init.c linux-10000/arch/x86_64/mm/init.c +--- linux-3022/arch/x86_64/mm/init.c ++++ linux-10000/arch/x86_64/mm/init.c +@@ -461,8 +461,6 @@ void __init mem_init(void) + int tmp; + + #ifdef CONFIG_SWIOTLB +- if (swiotlb_force) +- swiotlb = 1; + if (!iommu_aperture && + (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu)) + swiotlb = 1; +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/acpi/ec.c linux-10000/drivers/acpi/ec.c +--- linux-3022/drivers/acpi/ec.c +++ linux-10000/drivers/acpi/ec.c -@@ -600,7 +600,7 @@ acpi_ec_add ( +@@ -640,7 +640,7 @@ acpi_ec_add ( acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit, &acpi_ec_gpe_handler); @@ -69,8 +117,33 @@ } /* Get GPE bit assignment (EC events). */ ---- linux-2.6.9/drivers/net/acenic.c~ 2004-12-24 01:59:02.420451656 -0500 -+++ linux-2.6.9/drivers/net/acenic.c 2004-12-24 01:59:20.755664280 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/md/raid5.c linux-10000/drivers/md/raid5.c +--- linux-3022/drivers/md/raid5.c ++++ linux-10000/drivers/md/raid5.c +@@ -1352,6 +1352,8 @@ static void raid5_unplug_device(request_ + raid5_conf_t *conf = mddev_to_conf(mddev); + unsigned long flags; + ++ if (!conf) return; ++ + spin_lock_irqsave(&conf->device_lock, flags); + + if (blk_remove_plug(q)) +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/net/3c59x.c linux-10000/drivers/net/3c59x.c +--- linux-3022/drivers/net/3c59x.c ++++ linux-10000/drivers/net/3c59x.c +@@ -1836,7 +1836,7 @@ vortex_timer(unsigned long data) + struct net_device *dev = (struct net_device *)data; + struct vortex_private *vp = netdev_priv(dev); + long ioaddr = dev->base_addr; +- int next_tick = 60*HZ; ++ int next_tick = 10*HZ; + int ok = 0; + int media_status, mii_status, old_window; + +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/net/acenic.c linux-10000/drivers/net/acenic.c +--- linux-3022/drivers/net/acenic.c ++++ linux-10000/drivers/net/acenic.c @@ -443,7 +443,7 @@ MODULE_PARM_DESC(max_rx_desc, "AceNIC/3C MODULE_PARM_DESC(tx_ratio, "AceNIC/3C985/GA620 ratio of NIC memory used for TX/RX descriptors (range 0-63)"); @@ -80,10 +153,10 @@ "acenic.c: v0.92 08/05/2002 Jes Sorensen, linux-acenic at SunSITE.dk\n" " http://home.cern.ch/~jes/gige/acenic.html\n"; -diff -urNp linux-1130/drivers/pci/search.c linux-10000/drivers/pci/search.c ---- linux-1130/drivers/pci/search.c +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/pci/search.c linux-10000/drivers/pci/search.c +--- linux-3022/drivers/pci/search.c +++ linux-10000/drivers/pci/search.c -@@ -164,7 +164,7 @@ pci_find_subsys(unsigned int vendor, uns +@@ -166,7 +166,7 @@ static struct pci_dev * pci_find_subsys( struct list_head *n; struct pci_dev *dev; @@ -92,10 +165,41 @@ spin_lock(&pci_bus_lock); n = from ? from->global_list.next : pci_devices.next; -diff -urNp linux-1130/drivers/usb/storage/scsiglue.c linux-10000/drivers/usb/storage/scsiglue.c ---- linux-1130/drivers/usb/storage/scsiglue.c +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/scsi/ide-scsi.c linux-10000/drivers/scsi/ide-scsi.c +--- linux-3022/drivers/scsi/ide-scsi.c ++++ linux-10000/drivers/scsi/ide-scsi.c +@@ -737,10 +737,16 @@ static ide_driver_t idescsi_driver = { + .drives = LIST_HEAD_INIT(idescsi_driver.drives), + }; + ++static int ide_scsi_warned; ++ + static int idescsi_ide_open(struct inode *inode, struct file *filp) + { + ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; + drive->usage++; ++ if (!ide_scsi_warned++) { ++ printk(KERN_WARNING "ide-scsi: Warning this device driver is only intended for specialist devices.\n"); ++ printk(KERN_WARNING "ide-scsi: Do not use for cd burning, use /dev/hdX directly instead.\n"); ++ } + return 0; + } + +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/usb/host/ehci-hcd.c linux-10000/drivers/usb/host/ehci-hcd.c +--- linux-3022/drivers/usb/host/ehci-hcd.c ++++ linux-10000/drivers/usb/host/ehci-hcd.c +@@ -363,6 +363,7 @@ static int ehci_hc_reset (struct usb_hcd + dbg_hcc_params (ehci, "reset"); + + #ifdef CONFIG_PCI ++ writel(0, &ehci->regs->intr_enable); + /* EHCI 0.96 and later may have "extended capabilities" */ + if (hcd->self.controller->bus == &pci_bus_type) { + struct pci_dev *pdev = to_pci_dev(hcd->self.controller); +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/usb/storage/scsiglue.c linux-10000/drivers/usb/storage/scsiglue.c +--- linux-3022/drivers/usb/storage/scsiglue.c +++ linux-10000/drivers/usb/storage/scsiglue.c -@@ -398,7 +398,7 @@ struct scsi_host_template usb_stor_host_ +@@ -469,7 +469,7 @@ struct scsi_host_template usb_stor_host_ .sg_tablesize = SG_ALL, /* limit the total size of a transfer to 120 KB */ @@ -104,10 +208,22 @@ /* merge commands... this seems to help performance, but * periodically someone should test to see which setting is more -diff -urNp linux-1130/fs/open.c linux-10000/fs/open.c ---- linux-1130/fs/open.c +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/usb/storage/usb.c linux-10000/drivers/usb/storage/usb.c +--- linux-3022/drivers/usb/storage/usb.c ++++ linux-10000/drivers/usb/storage/usb.c +@@ -288,7 +288,7 @@ static int usb_stor_control_thread(void + */ + daemonize("usb-storage"); + +- current->flags |= PF_NOFREEZE; ++ current->flags |= PF_NOFREEZE|PF_MEMALLOC; + + unlock_kernel(); + +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/fs/open.c linux-10000/fs/open.c +--- linux-3022/fs/open.c +++ linux-10000/fs/open.c -@@ -967,7 +967,6 @@ out_error: +@@ -976,7 +976,6 @@ out_error: fd = error; goto out; } @@ -115,10 +231,10 @@ #ifndef __alpha__ -diff -urNp linux-1130/fs/proc/generic.c linux-10000/fs/proc/generic.c ---- linux-1130/fs/proc/generic.c +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/fs/proc/generic.c linux-10000/fs/proc/generic.c +--- linux-3022/fs/proc/generic.c +++ linux-10000/fs/proc/generic.c -@@ -675,7 +675,7 @@ void remove_proc_entry(const char *name, +@@ -690,7 +690,7 @@ void remove_proc_entry(const char *name, parent->nlink--; proc_kill_inodes(de); de->nlink = 0; @@ -127,8 +243,8 @@ if (!atomic_read(&de->count)) free_proc_entry(de); else { -diff -urNp linux-1130/include/linux/config.h linux-10000/include/linux/config.h ---- linux-1130/include/linux/config.h +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/config.h linux-10000/include/linux/config.h +--- linux-3022/include/linux/config.h +++ linux-10000/include/linux/config.h @@ -2,5 +2,7 @@ #define _LINUX_CONFIG_H @@ -139,8 +255,8 @@ +#error including kernel header in userspace; use the glibc headers instead! +#endif #endif -diff -urNp linux-1130/include/linux/delay.h linux-10000/include/linux/delay.h ---- linux-1130/include/linux/delay.h +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/delay.h linux-10000/include/linux/delay.h +--- linux-3022/include/linux/delay.h +++ linux-10000/include/linux/delay.h @@ -10,7 +10,7 @@ extern unsigned long loops_per_jiffy; @@ -173,10 +289,10 @@ #ifndef ndelay #define ndelay(x) udelay(((x)+999)/1000) -diff -urNp linux-1130/include/linux/gfp.h linux-10000/include/linux/gfp.h ---- linux-1130/include/linux/gfp.h +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/gfp.h linux-10000/include/linux/gfp.h +--- linux-3022/include/linux/gfp.h +++ linux-10000/include/linux/gfp.h -@@ -46,7 +46,7 @@ struct vm_area_struct; +@@ -47,7 +47,7 @@ struct vm_area_struct; __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \ __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP) @@ -185,70 +301,42 @@ #define GFP_NOIO (__GFP_WAIT) #define GFP_NOFS (__GFP_WAIT | __GFP_IO) #define GFP_KERNEL (__GFP_WAIT | __GFP_IO | __GFP_FS) -diff -urNp linux-1130/init/Kconfig linux-10000/init/Kconfig ---- linux-1130/init/Kconfig +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/namei.h linux-10000/include/linux/namei.h +--- linux-3022/include/linux/namei.h ++++ linux-10000/include/linux/namei.h +@@ -10,7 +10,7 @@ struct open_intent { + int create_mode; + }; + +-enum { MAX_NESTED_LINKS = 5 }; ++enum { MAX_NESTED_LINKS = 8 }; + + struct nameidata { + struct dentry *dentry; +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/init/Kconfig linux-10000/init/Kconfig +--- linux-3022/init/Kconfig +++ linux-10000/init/Kconfig -@@ -264,7 +264,7 @@ config EPOLL - source "drivers/block/Kconfig.iosched" +@@ -291,7 +291,7 @@ config EPOLL + support for epoll family of system calls. config CC_OPTIMIZE_FOR_SIZE - bool "Optimize for size" if EMBEDDED + bool "Optimize for size" default y if ARM || H8300 - default n help ---- linux-2.6.6/drivers/net/3c59x.c~ 2004-06-11 17:44:15.678397999 +0200 -+++ linux-2.6.6/drivers/net/3c59x.c 2004-06-11 17:44:15.679397880 +0200 -@@ -1789,7 +1789,7 @@ - struct net_device *dev = (struct net_device *)data; - struct vortex_private *vp = netdev_priv(dev); - long ioaddr = dev->base_addr; -- int next_tick = 60*HZ; -+ int next_tick = 10*HZ; - int ok = 0; - int media_status, mii_status, old_window; - -diff -purN linux-2.6.7/scripts/reference_discarded.pl linux/scripts/reference_discarded.pl ---- linux-2.6.7/scripts/reference_discarded.pl 2004-06-16 07:19:22.000000000 +0200 -+++ linux/scripts/reference_discarded.pl 2004-06-17 15:06:31.554823071 +0200 -@@ -106,4 +106,4 @@ foreach $object (keys(%object)) { - } - # printf("Done\n"); - --exit(0); -+exit($errorcount); -diff -purN linux-2.6.7/scripts/reference_init.pl linux/scripts/reference_init.pl ---- linux-2.6.7/scripts/reference_init.pl 2004-06-16 07:19:43.000000000 +0200 -+++ linux/scripts/reference_init.pl 2004-06-17 15:06:10.230376584 +0200 -@@ -90,6 +90,7 @@ foreach $object (sort(keys(%object))) { - if (($line =~ /\.init$/ || $line =~ /\.init\./) && - ($from !~ /\.init$/ && - $from !~ /\.init\./ && -+ $from !~ /\.eh_frame$/ && - $from !~ /\.stab$/ && - $from !~ /\.rodata$/ && - $from !~ /\.text\.lock$/ && ---- linux-2.6.7/drivers/usb/host/ehci-hcd.c~ 2004-06-20 12:05:24.653760319 +0200 -+++ linux-2.6.7/drivers/usb/host/ehci-hcd.c 2004-06-20 12:05:24.653760319 +0200 -@@ -344,6 +344,7 @@ - dbg_hcc_params (ehci, "reset"); - - #ifdef CONFIG_PCI -+ writel(0, &ehci->regs->intr_enable); - /* EHCI 0.96 and later may have "extended capabilities" */ - if (hcd->self.controller->bus == &pci_bus_type) - temp = HCC_EXT_CAPS (readl (&ehci->caps->hcc_params)); ---- linux-2.6.7/init/main.c.acpi 2004-06-28 11:31:10.000000000 -0700 -+++ linux-2.6.7/init/main.c 2004-07-01 13:18:09.556088191 -0700 -@@ -665,7 +665,6 @@ static int init(void * unused) + Enabling this option will pass "-Os" instead of "-O2" to gcc +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/init/main.c linux-10000/init/main.c +--- linux-3022/init/main.c ++++ linux-10000/init/main.c +@@ -657,7 +657,6 @@ static int init(void * unused) fixup_cpu_present_map(); smp_init(); - sched_init_smp(); - /* - * Do this before initcalls, because some drivers want to access -@@ -675,6 +674,8 @@ static int init(void * unused) + cpuset_init_smp(); + +@@ -669,6 +668,8 @@ static int init(void * unused) do_basic_setup(); @@ -257,31 +345,50 @@ /* * check if there is an early userspace init. If yes, let it do all * the work ---- linux-2.6.7/kernel/pid.c~ 2004-07-13 10:09:45.303329314 +0200 -+++ linux-2.6.7/kernel/pid.c 2004-07-13 10:09:45.303329314 +0200 -@@ -273,7 +273,7 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/kernel/pid.c linux-10000/kernel/pid.c +--- linux-3022/kernel/pid.c ++++ linux-10000/kernel/pid.c +@@ -257,7 +257,7 @@ void __init pidhash_init(void) int i, j, pidhash_size; - unsigned long megabytes = max_pfn >> (20 - PAGE_SHIFT); + unsigned long megabytes = nr_kernel_pages >> (20 - PAGE_SHIFT); - pidhash_shift = max(4, fls(megabytes * 4)); + pidhash_shift = max(10, fls(megabytes * 4)); pidhash_shift = min(12, pidhash_shift); pidhash_size = 1 << pidhash_shift; ---- linux-2.6.7/include/linux/namei.h~ 2004-07-29 13:24:31.255858922 +0200 -+++ linux-2.6.7/include/linux/namei.h 2004-07-29 13:24:31.256858801 +0200 -@@ -10,7 +10,7 @@ - int create_mode; - }; - --enum { MAX_NESTED_LINKS = 5 }; -+enum { MAX_NESTED_LINKS = 8 }; +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/scripts/reference_discarded.pl linux-10000/scripts/reference_discarded.pl +--- linux-3022/scripts/reference_discarded.pl ++++ linux-10000/scripts/reference_discarded.pl +@@ -88,6 +88,7 @@ foreach $object (keys(%object)) { + ($from !~ /\.text\.exit$/ && + $from !~ /\.exit\.text$/ && + $from !~ /\.data\.exit$/ && ++ $from !~ /\.opd$/ && + $from !~ /\.exit\.data$/ && + $from !~ /\.altinstructions$/ && + $from !~ /\.pdr$/ && +@@ -107,4 +108,4 @@ foreach $object (keys(%object)) { + } + # printf("Done\n"); - struct nameidata { - struct dentry *dentry; ---- linux-2.6.7/sound/core/oss/pcm_oss.c.orig 2004-08-04 11:21:32.364458304 -0400 -+++ linux-2.6.7/sound/core/oss/pcm_oss.c 2004-08-04 13:09:08.118034584 -0400 -@@ -1807,6 +1807,13 @@ static int snd_pcm_oss_open(struct inode +-exit(0); ++exit($errorcount); +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/scripts/reference_init.pl linux-10000/scripts/reference_init.pl +--- linux-3022/scripts/reference_init.pl ++++ linux-10000/scripts/reference_init.pl +@@ -90,6 +90,7 @@ foreach $object (sort(keys(%object))) { + if (($line =~ /\.init$/ || $line =~ /\.init\./) && + ($from !~ /\.init$/ && + $from !~ /\.init\./ && ++ $from !~ /\.eh_frame$/ && + $from !~ /\.stab$/ && + $from !~ /\.rodata$/ && + $from !~ /\.text\.lock$/ && +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/sound/core/oss/pcm_oss.c linux-10000/sound/core/oss/pcm_oss.c +--- linux-3022/sound/core/oss/pcm_oss.c ++++ linux-10000/sound/core/oss/pcm_oss.c +@@ -1815,6 +1815,13 @@ static int snd_pcm_oss_open(struct inode snd_pcm_oss_setup_t *psetup = NULL, *csetup = NULL; int nonblock; wait_queue_t wait; @@ -295,29 +402,10 @@ snd_assert(cardnum >= 0 && cardnum < SNDRV_CARDS, return -ENXIO); device = SNDRV_MINOR_OSS_DEVICE(minor) == SNDRV_MINOR_OSS_PCM1 ? ---- linux-2.6.7/drivers/scsi/ide-scsi.c~ 2004-08-09 21:30:24.480420957 +0200 -+++ linux-2.6.7/drivers/scsi/ide-scsi.c 2004-08-09 21:30:24.480420957 +0200 -@@ -717,10 +717,16 @@ - .drives = LIST_HEAD_INIT(idescsi_driver.drives), - }; - -+static int ide_scsi_warned; -+ - static int idescsi_ide_open(struct inode *inode, struct file *filp) - { - ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; - drive->usage++; -+ if (!ide_scsi_warned++) { -+ printk(KERN_WARNING "ide-scsi: Warning this device driver is only intended for specialist devices.\n"); -+ printk(KERN_WARNING "ide-scsi: Do not use for cd burning, use /dev/hdX directly instead.\n"); -+ } - return 0; - } - -diff -urNp linux-2.6.8.orig/sound/pci/intel8x0.c linux-2.6.8/sound/pci/intel8x0.c ---- linux-2.6.8.orig/sound/pci/intel8x0.c 2004-08-14 01:37:15.000000000 -0400 -+++ linux-2.6.8/sound/pci/intel8x0.c 2004-08-16 10:45:22.018793582 -0400 -@@ -1823,6 +1823,24 @@ static struct ac97_quirk ac97_quirks[] _ +diff -urNp --exclude-from=/home/davej/.exclude linux-3022/sound/pci/intel8x0.c linux-10000/sound/pci/intel8x0.c +--- linux-3022/sound/pci/intel8x0.c ++++ linux-10000/sound/pci/intel8x0.c +@@ -1948,6 +1948,24 @@ static struct ac97_quirk ac97_quirks[] _ .type = AC97_TUNE_HP_ONLY }, #endif @@ -342,80 +430,3 @@ { } /* terminator */ }; ---- linux-2.6.8/scripts/reference_discarded.pl~ 2004-08-18 17:37:24.469640739 +0200 -+++ linux-2.6.8/scripts/reference_discarded.pl 2004-08-18 17:37:24.469640739 +0200 -@@ -88,6 +88,7 @@ - ($from !~ /\.text\.exit$/ && - $from !~ /\.exit\.text$/ && - $from !~ /\.data\.exit$/ && -+ $from !~ /\.opd$/ && - $from !~ /\.exit\.data$/ && - $from !~ /\.altinstructions$/ && - $from !~ /\.debug_info$/ && ---- linux-2.6.8-rc4-mm1/drivers/usb/storage/usb.c 2004-08-16 12:13:06.000000000 -0700 -+++ linux-2.6.8-rc4-mm1-ub/drivers/usb/storage/usb.c 2004-08-18 23:48:09.335107648 -0700 -@@ -285,7 +285,7 @@ static int usb_stor_control_thread(void - */ - daemonize("usb-storage"); - -- current->flags |= PF_NOFREEZE; -+ current->flags |= PF_NOFREEZE|PF_MEMALLOC; - - unlock_kernel(); - ---- linux-2.6.8/arch/i386/kernel/nmi.c~ 2004-08-27 12:43:10.995416336 +0200 -+++ linux-2.6.8/arch/i386/kernel/nmi.c 2004-08-27 12:43:10.995416336 +0200 -@@ -481,7 +481,7 @@ - * wait a few IRQs (5 seconds) before doing the oops ... - */ - alert_counter[cpu]++; -- if (alert_counter[cpu] == 5*nmi_hz) -+ if (alert_counter[cpu] == 30*nmi_hz) - die_nmi(regs, "NMI Watchdog detected LOCKUP"); - } else { - last_irq_sums[cpu] = sum; ---- linux-2.6.8/arch/x86_64/mm/init.c~ 2004-08-27 13:34:47.565301620 +0200 -+++ linux-2.6.8/arch/x86_64/mm/init.c 2004-08-27 13:34:47.565301620 +0200 -@@ -434,8 +434,6 @@ - int tmp; - - #ifdef CONFIG_SWIOTLB -- if (swiotlb_force) -- swiotlb = 1; - if (!iommu_aperture && - (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu)) - swiotlb = 1; ---- linux-2.6.9/arch/ppc64/Makefile~ 2004-12-24 02:09:42.912082128 -0500 -+++ linux-2.6.9/arch/ppc64/Makefile 2004-12-24 02:10:02.289136368 -0500 -@@ -57,7 +57,7 @@ boot := arch/ppc64/boot - bzImage: vmlinux - cp vmlinux arch/ppc64/boot/bzImage - --boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd -+boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd zImage.stub - boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd - boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm - $(boottarget-y): vmlinux ---- linux-2.6.8/arch/ppc64/boot/Makefile~ 2004-10-12 14:57:52.746516104 -0400 -+++ linux-2.6.8/arch/ppc64/boot/Makefile 2004-10-12 14:59:06.726269472 -0400 -@@ -113,6 +113,9 @@ $(obj)/zImage: obj-boot += $(call obj-se - $(obj)/zImage: $(call obj-sec, $(required)) $(obj-boot) $(obj)/addnote FORCE - $(call if_changed,addnote) - -+$(obj)/zImage.stub: $(obj-boot) FORCE -+ $(BOOTLD) -r $(BOOTLFLAGS) -o $@ $(obj-boot) -+ - $(obj)/zImage.initrd: obj-boot += $(call obj-sec, $(required) $(initrd)) - $(obj)/zImage.initrd: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(obj)/addnote FORCE - $(call if_changed,addnote) ---- linux-2.6.9/drivers/md/raid5.c~ 2004-10-29 00:16:42.000000000 -0400 -+++ linux-2.6.9/drivers/md/raid5.c 2004-10-29 00:17:11.000000000 -0400 -@@ -1329,6 +1329,8 @@ static void raid5_unplug_device(request_ - raid5_conf_t *conf = mddev_to_conf(mddev); - unsigned long flags; - -+ if (!conf) return; -+ - spin_lock_irqsave(&conf->device_lock, flags); - - if (blk_remove_plug(q)) linux-2.6.0-must_check.patch: pci.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.0-must_check.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.0-must_check.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- linux-2.6.0-must_check.patch 25 Dec 2004 05:22:15 -0000 1.18 +++ linux-2.6.0-must_check.patch 22 Mar 2005 07:00:21 -0000 1.19 @@ -1,7 +1,7 @@ -diff -urNp linux-520/include/linux/pci.h linux-530/include/linux/pci.h ---- linux-520/include/linux/pci.h -+++ linux-530/include/linux/pci.h -@@ -726,9 +726,9 @@ int pci_enable_device_bars(struct pci_de +diff -urNp --exclude-from=/home/davej/.exclude linux-800/include/linux/pci.h linux-801/include/linux/pci.h +--- linux-800/include/linux/pci.h ++++ linux-801/include/linux/pci.h +@@ -808,9 +808,9 @@ void pci_set_master(struct pci_dev *dev) #define HAVE_PCI_SET_MWI int pci_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); @@ -12,4 +12,4 @@ +int __must_check pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); int pci_assign_resource(struct pci_dev *dev, int i); - /* Power management related routines */ + /* ROM control related routines */ linux-2.6.0-sleepon.patch: drivers/block/DAC960.c | 12 +++++++++++- drivers/net/tokenring/ibmtr.c | 9 ++++++++- fs/lockd/clntlock.c | 1 + include/linux/wait.h | 6 +++--- kernel/sched.c | 28 +++++++++++++++------------- net/sunrpc/clnt.c | 9 ++++++++- 6 files changed, 46 insertions(+), 19 deletions(-) Index: linux-2.6.0-sleepon.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.0-sleepon.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6.0-sleepon.patch 18 Mar 2005 21:54:20 -0000 1.12 +++ linux-2.6.0-sleepon.patch 22 Mar 2005 07:00:21 -0000 1.13 @@ -1,7 +1,7 @@ -diff -urNp linux-1050/drivers/block/DAC960.c linux-1070/drivers/block/DAC960.c ---- linux-1050/drivers/block/DAC960.c +diff -urNp --exclude-from=/home/davej/.exclude linux-1060/drivers/block/DAC960.c linux-1070/drivers/block/DAC960.c +--- linux-1060/drivers/block/DAC960.c +++ linux-1070/drivers/block/DAC960.c -@@ -6125,6 +6125,9 @@ static boolean DAC960_V2_ExecuteUserComm +@@ -6132,6 +6132,9 @@ static boolean DAC960_V2_ExecuteUserComm unsigned long flags; unsigned char Channel, TargetID, LogicalDriveNumber; unsigned short LogicalDeviceNumber; @@ -11,7 +11,7 @@ spin_lock_irqsave(&Controller->queue_lock, flags); while ((Command = DAC960_AllocateCommand(Controller)) == NULL) -@@ -6307,11 +6310,18 @@ static boolean DAC960_V2_ExecuteUserComm +@@ -6314,11 +6317,18 @@ static boolean DAC960_V2_ExecuteUserComm .SegmentByteCount = CommandMailbox->ControllerInfo.DataTransferSize; DAC960_ExecuteCommand(Command); @@ -31,10 +31,10 @@ DAC960_UserCritical("Discovery Completed\n", Controller); } } -diff -urNp linux-1050/drivers/net/tokenring/ibmtr.c linux-1070/drivers/net/tokenring/ibmtr.c ---- linux-1050/drivers/net/tokenring/ibmtr.c +diff -urNp --exclude-from=/home/davej/.exclude linux-1060/drivers/net/tokenring/ibmtr.c linux-1070/drivers/net/tokenring/ibmtr.c +--- linux-1060/drivers/net/tokenring/ibmtr.c +++ linux-1070/drivers/net/tokenring/ibmtr.c -@@ -848,6 +848,8 @@ static int tok_init_card(struct net_devi +@@ -850,6 +850,8 @@ static int tok_init_card(struct net_devi struct tok_info *ti; short PIOaddr; unsigned long i; @@ -43,7 +43,7 @@ PIOaddr = dev->base_addr; ti = (struct tok_info *) dev->priv; -@@ -860,13 +862,18 @@ static int tok_init_card(struct net_devi +@@ -862,13 +864,18 @@ static int tok_init_card(struct net_devi current->state=TASK_UNINTERRUPTIBLE; schedule_timeout(TR_RST_TIME); /* wait 50ms */ @@ -63,8 +63,8 @@ return i? 0 : -EAGAIN; } -diff -urNp linux-1050/fs/lockd/clntlock.c linux-1070/fs/lockd/clntlock.c ---- linux-1050/fs/lockd/clntlock.c +diff -urNp --exclude-from=/home/davej/.exclude linux-1060/fs/lockd/clntlock.c linux-1070/fs/lockd/clntlock.c +--- linux-1060/fs/lockd/clntlock.c +++ linux-1070/fs/lockd/clntlock.c @@ -70,6 +70,7 @@ nlmclnt_block(struct nlm_host *host, str * nlmclnt_lock for an explanation. @@ -74,10 +74,27 @@ for (head = &nlm_blocked; *head; head = &(*head)->b_next) { if (*head == &block) { -diff -urNp linux-1050/kernel/sched.c linux-1070/kernel/sched.c ---- linux-1050/kernel/sched.c +diff -urNp --exclude-from=/home/davej/.exclude linux-1060/include/linux/wait.h linux-1070/include/linux/wait.h +--- linux-1060/include/linux/wait.h ++++ linux-1070/include/linux/wait.h +@@ -364,10 +364,10 @@ static inline void remove_wait_queue_loc + * They are racy. DO NOT use them, use the wait_event* interfaces above. + * We plan to remove these interfaces during 2.7. + */ +-extern void FASTCALL(sleep_on(wait_queue_head_t *q)); +-extern long FASTCALL(sleep_on_timeout(wait_queue_head_t *q, ++extern void __deprecated FASTCALL(sleep_on(wait_queue_head_t *q)); ++extern long __deprecated FASTCALL(sleep_on_timeout(wait_queue_head_t *q, + signed long timeout)); +-extern void FASTCALL(interruptible_sleep_on(wait_queue_head_t *q)); ++extern void __deprecated FASTCALL(interruptible_sleep_on(wait_queue_head_t *q)); + extern long FASTCALL(interruptible_sleep_on_timeout(wait_queue_head_t *q, + signed long timeout)); + +diff -urNp --exclude-from=/home/davej/.exclude linux-1060/kernel/sched.c linux-1070/kernel/sched.c +--- linux-1060/kernel/sched.c +++ linux-1070/kernel/sched.c -@@ -1907,10 +1907,21 @@ EXPORT_SYMBOL(wait_for_completion); +@@ -3118,10 +3118,21 @@ EXPORT_SYMBOL(wait_for_completion_interr __remove_wait_queue(q, &wait); \ spin_unlock_irqrestore(&q->lock, flags); @@ -99,7 +116,7 @@ current->state = TASK_INTERRUPTIBLE; SLEEP_ON_HEAD -@@ -1924,6 +1935,8 @@ long interruptible_sleep_on_timeout(wait +@@ -3135,6 +3146,8 @@ long fastcall __sched interruptible_slee { SLEEP_ON_VAR @@ -108,7 +125,7 @@ current->state = TASK_INTERRUPTIBLE; SLEEP_ON_HEAD -@@ -1935,23 +1948,12 @@ long interruptible_sleep_on_timeout(wait +@@ -3146,23 +3159,12 @@ long fastcall __sched interruptible_slee EXPORT_SYMBOL(interruptible_sleep_on_timeout); @@ -134,10 +151,10 @@ current->state = TASK_UNINTERRUPTIBLE; SLEEP_ON_HEAD -diff -urNp linux-1050/net/sunrpc/clnt.c linux-1070/net/sunrpc/clnt.c ---- linux-1050/net/sunrpc/clnt.c +diff -urNp --exclude-from=/home/davej/.exclude linux-1060/net/sunrpc/clnt.c linux-1070/net/sunrpc/clnt.c +--- linux-1060/net/sunrpc/clnt.c +++ linux-1070/net/sunrpc/clnt.c -@@ -214,17 +214,24 @@ out_no_clnt: +@@ -223,17 +223,24 @@ out_no_clnt: int rpc_shutdown_client(struct rpc_clnt *clnt) { @@ -163,30 +180,3 @@ if (atomic_read(&clnt->cl_users) < 0) { printk(KERN_ERR "RPC: rpc_shutdown_client clnt %p tasks=%d\n", -diff -urNp linux-1130/include/linux/wait.h linux-10000/include/linux/wait.h ---- linux-1130/include/linux/wait.h -+++ linux-10000/include/linux/wait.h -@@ -225,10 +225,10 @@ static inline void remove_wait_queue_loc - * They are racy. DO NOT use them, use the wait_event* interfaces above. - * We plan to remove these interfaces during 2.7. - */ --extern void FASTCALL(sleep_on(wait_queue_head_t *q)); -+extern void __deprecated FASTCALL(sleep_on(wait_queue_head_t *q)); - extern long FASTCALL(sleep_on_timeout(wait_queue_head_t *q, - signed long timeout)); --extern void FASTCALL(interruptible_sleep_on(wait_queue_head_t *q)); -+extern void __deprecated FASTCALL(interruptible_sleep_on(wait_queue_head_t *q)); - extern long FASTCALL(interruptible_sleep_on_timeout(wait_queue_head_t *q, - signed long timeout)); - ---- linux-2.6.8/include/linux/wait.h~ 2004-08-31 12:32:39.246305996 +0200 -+++ linux-2.6.8/include/linux/wait.h 2004-08-31 12:32:39.246305996 +0200 -@@ -253,7 +253,7 @@ - * We plan to remove these interfaces during 2.7. - */ - extern void __deprecated FASTCALL(sleep_on(wait_queue_head_t *q)); --extern long FASTCALL(sleep_on_timeout(wait_queue_head_t *q, -+extern long __deprecated FASTCALL(sleep_on_timeout(wait_queue_head_t *q, - signed long timeout)); - extern void __deprecated FASTCALL(interruptible_sleep_on(wait_queue_head_t *q)); - extern long FASTCALL(interruptible_sleep_on_timeout(wait_queue_head_t *q, linux-2.6.1-s390-compile.patch: arch/s390/Makefile | 5 +++++ drivers/s390/cio/qdio.c | 12 +++++++++--- drivers/s390/cio/qdio.h | 2 ++ drivers/s390/net/qeth_main.c | 4 ++++ 4 files changed, 20 insertions(+), 3 deletions(-) Index: linux-2.6.1-s390-compile.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.1-s390-compile.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6.1-s390-compile.patch 25 Dec 2004 05:22:15 -0000 1.12 +++ linux-2.6.1-s390-compile.patch 22 Mar 2005 07:00:21 -0000 1.13 @@ -1,7 +1,7 @@ -diff -ur -X dontdiff linux-2.6.1-1.153/arch/s390/Makefile linux-2.6.1-1.153.z1/arch/s390/Makefile ---- linux-2.6.1-1.153/arch/s390/Makefile 2004-01-09 01:59:10.000000000 -0500 -+++ linux-2.6.1-1.153.z1/arch/s390/Makefile 2004-01-30 14:41:22.000000000 -0500 -@@ -52,6 +52,11 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-400/arch/s390/Makefile linux-500/arch/s390/Makefile +--- linux-400/arch/s390/Makefile ++++ linux-500/arch/s390/Makefile +@@ -91,6 +91,11 @@ boot := arch/$(ARCH)/boot all: image @@ -13,10 +13,10 @@ install: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ -diff -ur -X dontdiff linux-2.6.5-1.345/drivers/s390/cio/qdio.c linux-2.6.5-1.345.z4/drivers/s390/cio/qdio.c ---- linux-2.6.5-1.345/drivers/s390/cio/qdio.c 2004-05-18 14:14:44.000000000 -0400 -+++ linux-2.6.5-1.345.z4/drivers/s390/cio/qdio.c 2004-05-26 22:07:37.000000000 -0400 -@@ -1301,7 +1301,7 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-400/drivers/s390/cio/qdio.c linux-500/drivers/s390/cio/qdio.c +--- linux-400/drivers/s390/cio/qdio.c ++++ linux-500/drivers/s390/cio/qdio.c +@@ -1352,7 +1352,7 @@ next: } kfree(irq_ptr->qdr); @@ -25,7 +25,7 @@ } static void -@@ -2565,6 +2565,8 @@ +@@ -2608,6 +2608,8 @@ qdio_initialize(struct qdio_initialize * int qdio_allocate(struct qdio_initialize *init_data) { @@ -34,7 +34,7 @@ struct qdio_irq *irq_ptr; char dbf_text[15]; -@@ -2586,17 +2588,21 @@ +@@ -2629,17 +2631,21 @@ qdio_allocate(struct qdio_initialize *in qdio_allocate_do_dbf(init_data); /* create irq */ @@ -58,10 +58,10 @@ init_MUTEX(&irq_ptr->setting_up_sema); -diff -ur -X dontdiff linux-2.6.5-1.345/drivers/s390/cio/qdio.h linux-2.6.5-1.345.z4/drivers/s390/cio/qdio.h ---- linux-2.6.5-1.345/drivers/s390/cio/qdio.h 2004-04-03 22:36:26.000000000 -0500 -+++ linux-2.6.5-1.345.z4/drivers/s390/cio/qdio.h 2004-05-26 22:02:43.000000000 -0400 -@@ -644,5 +644,7 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-400/drivers/s390/cio/qdio.h linux-500/drivers/s390/cio/qdio.h +--- linux-400/drivers/s390/cio/qdio.h ++++ linux-500/drivers/s390/cio/qdio.h +@@ -644,5 +644,7 @@ struct qdio_irq { struct qdio_q *input_qs[QDIO_MAX_QUEUES_PER_IRQ]; struct qdio_q *output_qs[QDIO_MAX_QUEUES_PER_IRQ]; struct semaphore setting_up_sema; @@ -69,20 +69,18 @@ + char *actual_alloc; }; #endif -Very minimal fix to have qeth working without IPv6 - -diff -urN -X dontdiff linux-2.6.7-1.459/drivers/s390/net/qeth_main.c linux-2.6.7-1.459.z1/drivers/s390/net/qeth_main.c ---- linux-2.6.7-1.459/drivers/s390/net/qeth_main.c 2004-06-16 01:19:23.000000000 -0400 -+++ linux-2.6.7-1.459.z1/drivers/s390/net/qeth_main.c 2004-06-28 23:45:23.373535525 -0400 -@@ -4673,6 +4673,7 @@ - in_dev_put(in_dev); +diff -urNp --exclude-from=/home/davej/.exclude linux-400/drivers/s390/net/qeth_main.c linux-500/drivers/s390/net/qeth_main.c +--- linux-400/drivers/s390/net/qeth_main.c ++++ linux-500/drivers/s390/net/qeth_main.c +@@ -4942,6 +4942,7 @@ out: + rcu_read_unlock(); } +#ifdef CONFIG_QETH_IPV6 static void qeth_free_vlan_addresses6(struct qeth_card *card, unsigned short vid) { -@@ -4699,6 +4700,9 @@ +@@ -4968,6 +4969,9 @@ qeth_free_vlan_addresses6(struct qeth_ca } in6_dev_put(in6_dev); } @@ -91,4 +89,4 @@ +#endif static void - qeth_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) + qeth_layer2_send_setdelvlan(struct qeth_card *card, __u16 i, linux-2.6.10-compile-fixes.patch: arch/ppc/Makefile | 1 + arch/ppc/kernel/head.S | 2 +- arch/ppc/kernel/misc.S | 2 +- arch/ppc/kernel/time.c | 12 ++++++------ arch/ppc/mm/hashtable.S | 4 ++-- arch/ppc/platforms/pmac_sleep.S | 2 +- arch/ppc/syslib/open_pic_defs.h | 2 -- arch/ppc64/Makefile | 2 +- arch/ppc64/boot/main.c | 1 + crypto/Makefile | 2 ++ drivers/md/Makefile | 2 ++ include/asm-ppc/ppc_asm.h | 2 +- include/asm-ppc/prom.h | 3 --- include/asm-ppc64/paca.h | 3 ++- include/linux/config.h | 2 +- scripts/kconfig/Makefile | 2 +- scripts/reference_discarded.pl | 1 + sound/core/oss/Makefile | 1 + 18 files changed, 25 insertions(+), 21 deletions(-) Index: linux-2.6.10-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-compile-fixes.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6.10-compile-fixes.patch 18 Mar 2005 21:54:20 -0000 1.7 +++ linux-2.6.10-compile-fixes.patch 22 Mar 2005 07:00:21 -0000 1.8 @@ -1,114 +1,85 @@ -diff -urNp linux-1130/arch/ppc/Makefile linux-10000/arch/ppc/Makefile ---- linux-1130/arch/ppc/Makefile -+++ linux-10000/arch/ppc/Makefile -@@ -54,6 +54,7 @@ AFLAGS_vmlinux.lds.o := -Upowerpc - - # All the instructions talk about "make bzImage". - bzImage: zImage -+ cp vmlinux arch/ppc/boot/bzImage - - boot := arch/$(ARCH)/boot - -diff -urNp linux-1130/scripts/kconfig/Makefile linux-10000/scripts/kconfig/Makefile ---- linux-1130/scripts/kconfig/Makefile -+++ linux-10000/scripts/kconfig/Makefile -@@ -118,7 +118,7 @@ QTLIBPATH = $(QTDIR)/lib +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/kernel/head.S linux-10001/arch/ppc/kernel/head.S +--- linux-10000/arch/ppc/kernel/head.S ++++ linux-10001/arch/ppc/kernel/head.S +@@ -1512,7 +1512,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B + flush_tlbs: + lis r10, 0x40 + 1: addic. r10, r10, -0x1000 +- tlbie r10 ++ tlbie r10,0 + blt 1b + sync + blr +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/kernel/misc.S linux-10001/arch/ppc/kernel/misc.S +--- linux-10000/arch/ppc/kernel/misc.S ++++ linux-10001/arch/ppc/kernel/misc.S +@@ -565,7 +565,7 @@ _GLOBAL(_tlbie) + SYNC_601 + isync + #else /* CONFIG_SMP */ +- tlbie r3 ++ tlbie r3,0 + sync + #endif /* CONFIG_SMP */ + #endif /* ! CONFIG_40x */ +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/kernel/time.c linux-10001/arch/ppc/kernel/time.c +--- linux-10000/arch/ppc/kernel/time.c ++++ linux-10001/arch/ppc/kernel/time.c +@@ -89,7 +89,7 @@ unsigned long tb_to_ns_scale; - # QT needs some extra effort... - $(obj)/.tmp_qtcheck: -- @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \ -+ @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt* /usr/lib64/qt* ; do \ - if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \ - done; \ - if [ -z "$$DIR" ]; then \ -diff -urNp linux-1130/sound/core/oss/Makefile linux-10000/sound/core/oss/Makefile ---- linux-1130/sound/core/oss/Makefile -+++ linux-10000/sound/core/oss/Makefile -@@ -3,6 +3,7 @@ - # Copyright (c) 1999 by Jaroslav Kysela - # + extern unsigned long wall_jiffies; -+CFLAGS_pcm_plugin.o += -g0 - snd-mixer-oss-objs := mixer_oss.o +-static long time_offset; ++static long rtc_time_offset; - snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \ - ---- linux-2.6.6/drivers/md/Makefile~ 2004-06-11 12:03:17.099216018 +0200 -+++ linux-2.6.6/drivers/md/Makefile 2004-06-11 12:03:17.099216018 +0200 -@@ -10,6 +10,8 @@ raid6-objs := raid6main.o raid6algos.o r - raid6mmx.o raid6sse1.o raid6sse2.o - host-progs := mktables + DEFINE_SPINLOCK(rtc_lock); -+CFLAGS_raid6int8.o += -O2 -+ - # Note: link order is important. All raid personalities - # and xor.o must come before md.o, as they each initialise - # themselves, and md.o may use the personalities when it ---- linux-2.6.8/crypto/Makefile~ 2004-08-18 15:41:44.562809502 +0200 -+++ linux-2.6.8/crypto/Makefile 2004-08-18 15:41:44.562809502 +0200 -@@ -32,3 +32,5 @@ +@@ -172,7 +172,7 @@ void timer_interrupt(struct pt_regs * re + xtime.tv_sec - last_rtc_update >= 659 && + abs((xtime.tv_nsec / 1000) - (1000000-1000000/HZ)) < 500000/HZ && + jiffies - wall_jiffies == 1) { +- if (ppc_md.set_rtc_time(xtime.tv_sec+1 + time_offset) == 0) ++ if (ppc_md.set_rtc_time(xtime.tv_sec+1 + rtc_time_offset) == 0) + last_rtc_update = xtime.tv_sec+1; + else + /* Try again one minute later */ +@@ -289,7 +289,7 @@ void __init time_init(void) + unsigned old_stamp, stamp, elapsed; - obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/ - obj-$(CONFIG_CRYPTO_MPILIB) += mpi/ -+ -+CFLAGS_twofish.o += -fno-schedule-insns - ---- linux-2.6.8/arch/ppc64/Makefile~ 2004-09-02 17:25:26.731269075 +0200 -+++ linux-2.6.8/arch/ppc64/Makefile 2004-09-02 17:25:26.731269075 +0200 -@@ -37,7 +37,7 @@ + if (ppc_md.time_init != NULL) +- time_offset = ppc_md.time_init(); ++ rtc_time_offset = ppc_md.time_init(); - # Enable unit-at-a-time mode when possible. It shrinks the - # kernel considerably. --CFLAGS += $(call cc-option,-funit-at-a-time) -+CFLAGS += $(call cc-option,-fno-unit-at-a-time) + if (__USE_RTC()) { + /* 601 processor: dec counts down by 128 every 128ns */ +@@ -334,10 +334,10 @@ void __init time_init(void) + set_dec(tb_ticks_per_jiffy); - head-y := arch/ppc64/kernel/head.o + /* If platform provided a timezone (pmac), we correct the time */ +- if (time_offset) { +- sys_tz.tz_minuteswest = -time_offset / 60; ++ if (rtc_time_offset) { ++ sys_tz.tz_minuteswest = -rtc_time_offset / 60; + sys_tz.tz_dsttime = 0; +- xtime.tv_sec -= time_offset; ++ xtime.tv_sec -= rtc_time_offset; + } + set_normalized_timespec(&wall_to_monotonic, + -xtime.tv_sec, -xtime.tv_nsec); +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/Makefile linux-10001/arch/ppc/Makefile +--- linux-10000/arch/ppc/Makefile ++++ linux-10001/arch/ppc/Makefile +@@ -78,6 +78,7 @@ CPPFLAGS_vmlinux.lds := -Upowerpc ---- linux-2.6.8/arch/ppc64/boot/main.c.netboot 2004-09-09 23:04:31.412027568 -0400 -+++ linux-2.6.8/arch/ppc64/boot/main.c 2004-09-09 23:04:39.576786336 -0400 -@@ -8,6 +8,7 @@ - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ -+#define __KERNGLUE__ - #include "ppc32-types.h" - #include "zlib.h" - #include ---- linux-2.6.8/include/linux/config.h.netboot 2004-09-09 23:04:49.190324856 -0400 -+++ linux-2.6.8/include/linux/config.h 2004-09-09 23:05:13.045698288 -0400 -@@ -2,7 +2,7 @@ - #define _LINUX_CONFIG_H + # All the instructions talk about "make bzImage". + bzImage: zImage ++ cp vmlinux arch/ppc/boot/bzImage - #include --#ifndef __KERNEL__ -+#if !defined (__KERNEL__) && !defined(__KERNGLUE__) - #error including kernel header in userspace; use the glibc headers instead! - #endif - #endif ---- linux-2.6.8/include/asm-ppc/ppc_asm.h~ 2004-08-14 06:36:14.000000000 +0100 -+++ linux-2.6.8/include/asm-ppc/ppc_asm.h 2004-10-07 17:44:45.321291752 +0100 -@@ -116,7 +116,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) - li r4,1024; \ - mtctr r4; \ - lis r4,KERNELBASE at h; \ --0: tlbie r4; \ -+0: tlbie r4, 0; \ - addi r4,r4,0x1000; \ - bdnz 0b - #endif ---- linux-2.6.8/arch/ppc/platforms/pmac_sleep.S~ 2004-08-14 06:36:16.000000000 +0100 -+++ linux-2.6.8/arch/ppc/platforms/pmac_sleep.S 2004-10-07 17:47:29.867276960 +0100 -@@ -339,7 +339,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B - /* Flush all TLBs */ - lis r4,0x1000 - 1: addic. r4,r4,-0x1000 -- tlbie r4 -+ tlbie r4, 0 - blt 1b - sync + boot := arch/$(ARCH)/boot ---- linux-2.6.8/arch/ppc/mm/hashtable.S~ 2004-08-14 06:37:39.000000000 +0100 -+++ linux-2.6.8/arch/ppc/mm/hashtable.S 2004-10-07 17:48:17.797990384 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/mm/hashtable.S linux-10001/arch/ppc/mm/hashtable.S +--- linux-10000/arch/ppc/mm/hashtable.S ++++ linux-10001/arch/ppc/mm/hashtable.S @@ -375,7 +375,7 @@ _GLOBAL(hash_page_patch_A) */ andi. r6,r6,_PAGE_HASHPTE @@ -127,49 +98,21 @@ sync 8: ble cr1,9f /* if all ptes checked */ - - ---- linux-2.6.8/arch/ppc/kernel/misc.S~ 2004-10-11 17:24:47.654242928 -0400 -+++ linux-2.6.8/arch/ppc/kernel/misc.S 2004-10-11 17:24:59.787398408 -0400 -@@ -565,7 +565,7 @@ _GLOBAL(_tlbie) - SYNC_601 - isync - #else /* CONFIG_SMP */ -- tlbie r3 -+ tlbie r3,0 - sync - #endif /* CONFIG_SMP */ - #endif /* ! CONFIG_40x */ ---- linux-2.6.8/arch/ppc/kernel/head.S~ 2004-10-11 18:07:27.809040240 -0400 -+++ linux-2.6.8/arch/ppc/kernel/head.S 2004-10-11 18:07:36.999643056 -0400 -@@ -1512,7 +1512,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B - flush_tlbs: - lis r10, 0x40 - 1: addic. r10, r10, -0x1000 -- tlbie r10 -+ tlbie r10,0 +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/platforms/pmac_sleep.S linux-10001/arch/ppc/platforms/pmac_sleep.S +--- linux-10000/arch/ppc/platforms/pmac_sleep.S ++++ linux-10001/arch/ppc/platforms/pmac_sleep.S +@@ -340,7 +340,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B + /* Flush all TLBs */ + lis r4,0x1000 + 1: addic. r4,r4,-0x1000 +- tlbie r4 ++ tlbie r4, 0 blt 1b sync - blr ---- linux-2.6.10/include/asm-ppc64/paca.h~ 2005-03-01 08:48:20.000000000 +0000 -+++ linux-2.6.10/include/asm-ppc64/paca.h 2005-03-01 08:54:47.662044104 +0000 -@@ -22,7 +22,6 @@ - #include - #include --extern struct paca_struct paca[]; - register struct paca_struct *local_paca asm("r13"); - #define get_paca() local_paca - -@@ -115,4 +114,6 @@ - #endif - }; - -+extern struct paca_struct paca[]; -+ - #endif /* _PPC64_PACA_H */ ---- linux-2.6.10-ppc/arch/ppc/syslib/open_pic_defs.h~ 2005-03-01 09:20:34.000000000 +0000 -+++ linux-2.6.10-ppc/arch/ppc/syslib/open_pic_defs.h 2005-03-01 09:39:22.776010608 +0000 +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/syslib/open_pic_defs.h linux-10001/arch/ppc/syslib/open_pic_defs.h +--- linux-10000/arch/ppc/syslib/open_pic_defs.h ++++ linux-10001/arch/ppc/syslib/open_pic_defs.h @@ -172,8 +172,6 @@ struct OpenPIC { OpenPIC_Processor Processor[OPENPIC_MAX_PROCESSORS]; }; @@ -179,8 +122,65 @@ /* * Current Task Priority Register ---- linux-2.6.10-ppc/include/asm-ppc/prom.h~ 2004-12-24 21:35:23.000000000 +0000 -+++ linux-2.6.10-ppc/include/asm-ppc/prom.h 2005-03-01 09:36:01.350016664 +0000 +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc64/boot/main.c linux-10001/arch/ppc64/boot/main.c +--- linux-10000/arch/ppc64/boot/main.c ++++ linux-10001/arch/ppc64/boot/main.c +@@ -8,6 +8,7 @@ + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ ++#define __KERNGLUE__ + #include "ppc32-types.h" + #include "zlib.h" + #include +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc64/Makefile linux-10001/arch/ppc64/Makefile +--- linux-10000/arch/ppc64/Makefile ++++ linux-10001/arch/ppc64/Makefile +@@ -68,7 +68,7 @@ endif + + # Enable unit-at-a-time mode when possible. It shrinks the + # kernel considerably. +-CFLAGS += $(call cc-option,-funit-at-a-time) ++CFLAGS += $(call cc-option,-fno-unit-at-a-time) + + head-y := arch/ppc64/kernel/head.o + +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/crypto/Makefile linux-10001/crypto/Makefile +--- linux-10000/crypto/Makefile ++++ linux-10001/crypto/Makefile +@@ -35,3 +35,5 @@ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o + + obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/ + obj-$(CONFIG_CRYPTO_MPILIB) += mpi/ ++ ++CFLAGS_twofish.o += -fno-schedule-insns +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/drivers/md/Makefile linux-10001/drivers/md/Makefile +--- linux-10000/drivers/md/Makefile ++++ linux-10001/drivers/md/Makefile +@@ -15,6 +15,8 @@ raid6-objs := raid6main.o raid6algos.o r + raid6mmx.o raid6sse1.o raid6sse2.o + hostprogs-y := mktables + ++CFLAGS_raid6int8.o += -O2 ++ + # Note: link order is important. All raid personalities + # and xor.o must come before md.o, as they each initialise + # themselves, and md.o may use the personalities when it +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/include/asm-ppc/ppc_asm.h linux-10001/include/asm-ppc/ppc_asm.h +--- linux-10000/include/asm-ppc/ppc_asm.h ++++ linux-10001/include/asm-ppc/ppc_asm.h +@@ -116,7 +116,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) + li r4,1024; \ + mtctr r4; \ + lis r4,KERNELBASE at h; \ +-0: tlbie r4; \ ++0: tlbie r4, 0; \ + addi r4,r4,0x1000; \ + bdnz 0b + #endif +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/include/asm-ppc/prom.h linux-10001/include/asm-ppc/prom.h +--- linux-10000/include/asm-ppc/prom.h ++++ linux-10001/include/asm-ppc/prom.h @@ -13,9 +13,6 @@ typedef void *phandle; typedef void *ihandle; @@ -191,51 +191,51 @@ struct address_range { unsigned int space; unsigned int address; ---- linux-2.6.10-ppc/arch/ppc/kernel/time.c~ 2005-03-01 09:20:34.000000000 +0000 -+++ linux-2.6.10-ppc/arch/ppc/kernel/time.c 2005-03-01 09:53:47.293085192 +0000 -@@ -89,7 +89,7 @@ unsigned long tb_to_ns_scale; - - extern unsigned long wall_jiffies; - --static long time_offset; -+static long rtc_time_offset; +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/include/asm-ppc64/paca.h linux-10001/include/asm-ppc64/paca.h +--- linux-10000/include/asm-ppc64/paca.h ++++ linux-10001/include/asm-ppc64/paca.h +@@ -22,7 +22,6 @@ + #include + #include - DEFINE_SPINLOCK(rtc_lock); +-extern struct paca_struct paca[]; + register struct paca_struct *local_paca asm("r13"); + #define get_paca() local_paca -@@ -172,7 +172,7 @@ void timer_interrupt(struct pt_regs * re - xtime.tv_sec - last_rtc_update >= 659 && - abs((xtime.tv_nsec / 1000) - (1000000-1000000/HZ)) < 500000/HZ && - jiffies - wall_jiffies == 1) { -- if (ppc_md.set_rtc_time(xtime.tv_sec+1 + time_offset) == 0) -+ if (ppc_md.set_rtc_time(xtime.tv_sec+1 + rtc_time_offset) == 0) - last_rtc_update = xtime.tv_sec+1; - else - /* Try again one minute later */ -@@ -289,7 +289,7 @@ void __init time_init(void) - unsigned old_stamp, stamp, elapsed; +@@ -115,4 +114,6 @@ struct paca_struct { + #endif + }; - if (ppc_md.time_init != NULL) -- time_offset = ppc_md.time_init(); -+ rtc_time_offset = ppc_md.time_init(); ++extern struct paca_struct paca[]; ++ + #endif /* _PPC64_PACA_H */ +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/include/linux/config.h linux-10001/include/linux/config.h +--- linux-10000/include/linux/config.h ++++ linux-10001/include/linux/config.h +@@ -2,7 +2,7 @@ + #define _LINUX_CONFIG_H - if (__USE_RTC()) { - /* 601 processor: dec counts down by 128 every 128ns */ -@@ -334,10 +334,10 @@ void __init time_init(void) - set_dec(tb_ticks_per_jiffy); + #include +-#ifndef __KERNEL__ ++#if !defined (__KERNEL__) && !defined(__KERNGLUE__) + #error including kernel header in userspace; use the glibc headers instead! + #endif + #endif +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/scripts/kconfig/Makefile linux-10001/scripts/kconfig/Makefile +--- linux-10000/scripts/kconfig/Makefile ++++ linux-10001/scripts/kconfig/Makefile +@@ -126,7 +126,7 @@ QTLIBPATH = $(QTDIR)/lib - /* If platform provided a timezone (pmac), we correct the time */ -- if (time_offset) { -- sys_tz.tz_minuteswest = -time_offset / 60; -+ if (rtc_time_offset) { -+ sys_tz.tz_minuteswest = -rtc_time_offset / 60; - sys_tz.tz_dsttime = 0; -- xtime.tv_sec -= time_offset; -+ xtime.tv_sec -= rtc_time_offset; - } - set_normalized_timespec(&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); ---- linux-2.6.10/scripts/reference_discarded.pl~ 2005-03-01 09:20:50.000000000 +0000 -+++ linux-2.6.10/scripts/reference_discarded.pl 2005-03-01 10:13:00.424105232 +0000 + # QT needs some extra effort... + $(obj)/.tmp_qtcheck: +- @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \ ++ @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt* /usr/lib64/qt* ; do \ + if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \ + done; \ + if [ -z "$$DIR" ]; then \ +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/scripts/reference_discarded.pl linux-10001/scripts/reference_discarded.pl +--- linux-10000/scripts/reference_discarded.pl ++++ linux-10001/scripts/reference_discarded.pl @@ -96,6 +96,7 @@ foreach $object (keys(%object)) { $from !~ /\.debug_aranges$/ && $from !~ /\.debug_ranges$/ && @@ -244,3 +244,14 @@ $from !~ /\.debug_frame$/ && $from !~ /\.exitcall\.exit$/ && $from !~ /\.eh_frame$/ && +diff -urNp --exclude-from=/home/davej/.exclude linux-10000/sound/core/oss/Makefile linux-10001/sound/core/oss/Makefile +--- linux-10000/sound/core/oss/Makefile ++++ linux-10001/sound/core/oss/Makefile +@@ -3,6 +3,7 @@ + # Copyright (c) 1999 by Jaroslav Kysela + # + ++CFLAGS_pcm_plugin.o += -g0 + snd-mixer-oss-objs := mixer_oss.o + + snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \ linux-2.6.10-crashdump-common.patch: Documentation/sysrq.txt | 8 + arch/i386/kernel/nmi.c | 1 arch/i386/kernel/process.c | 2 arch/i386/kernel/smp.c | 47 +++++-- arch/i386/kernel/traps.c | 3 arch/i386/mm/init.c | 47 +++++++ arch/i386/mm/pgtable.c | 3 arch/ia64/kernel/process.c | 30 ++++ arch/ia64/kernel/smp.c | 52 +++++--- arch/ia64/kernel/traps.c | 6 arch/ia64/mm/contig.c | 3 arch/ia64/mm/discontig.c | 3 arch/ia64/mm/init.c | 90 +++++++++++++- arch/ppc64/kernel/process.c | 1 arch/ppc64/kernel/smp.c | 53 +++++--- arch/ppc64/kernel/traps.c | 3 arch/ppc64/mm/init.c | 29 ++++ arch/s390/kernel/traps.c | 6 arch/x86_64/kernel/process.c | 2 arch/x86_64/kernel/smp.c | 50 +++++--- arch/x86_64/kernel/traps.c | 6 arch/x86_64/mm/fault.c | 1 arch/x86_64/mm/init.c | 33 +++++ drivers/char/sysrq.c | 13 +- include/asm-generic/crashdump.h | 47 +++++++ include/asm-i386/crashdump.h | 123 ++++++++++++++++++++ include/asm-i386/kmap_types.h | 4 include/asm-ia64/crashdump.h | 72 +++++++++++ include/asm-ppc64/crashdump.h | 61 +++++++++ include/asm-x86_64/crashdump.h | 86 +++++++++++++ include/linux/kernel.h | 18 ++ kernel/Makefile | 2 kernel/dump.c | 246 ++++++++++++++++++++++++++++++++++++++++ kernel/panic.c | 2 kernel/printk.c | 20 +++ kernel/sched.c | 2 36 files changed, 1095 insertions(+), 80 deletions(-) Index: linux-2.6.10-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-crashdump-common.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.10-crashdump-common.patch 18 Mar 2005 21:54:20 -0000 1.3 +++ linux-2.6.10-crashdump-common.patch 22 Mar 2005 07:00:21 -0000 1.4 @@ -1,40 +1,15 @@ -diff -uprN linux-2.6.10.orig/Documentation/sysrq.txt linux-2.6.10.crashdumpcommon/Documentation/sysrq.txt ---- linux-2.6.10.orig/Documentation/sysrq.txt 2004-12-24 16:34:45.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/Documentation/sysrq.txt 2005-01-18 11:56:34.000000000 -0500 -@@ -53,6 +53,10 @@ On all - write a character to /proc/sys - 'b' - Will immediately reboot the system without syncing or unmounting - your disks. - -+'c' - Intentionally crash the system without syncing or unmounting -+ your disks. This is most useful if the NETDUMP client package -+ and/or the DISKDUMP package have been installed. -+ - 'o' - Will shut your system off (if configured and supported). - - 's' - Will attempt to sync all mounted filesystems. -@@ -101,6 +105,10 @@ useful when you want to exit a program t - re'B'oot is good when you're unable to shut down. But you should also 'S'ync - and 'U'mount first. - -+'C'rash immediately crashes your system. This is most useful if the machine -+has been configured as a NETDUMP client because an OOPS report is generated -+and a kernel crash dump is sent to the NETDUMP server. -+ - 'S'ync is great when your system is locked up, it allows you to sync your - disks and will certainly lessen the chance of data loss and fscking. Note - that the sync hasn't taken place until you see the "OK" and "Done" appear -diff -uprN linux-2.6.10.orig/arch/i386/kernel/nmi.c linux-2.6.10.crashdumpcommon/arch/i386/kernel/nmi.c ---- linux-2.6.10.orig/arch/i386/kernel/nmi.c 2005-01-18 13:12:04.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/i386/kernel/nmi.c 2005-01-18 11:56:34.000000000 -0500 -@@ -564,3 +564,4 @@ EXPORT_SYMBOL(reserve_lapic_nmi); +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/kernel/nmi.c linux-1500/arch/i386/kernel/nmi.c +--- linux-1400/arch/i386/kernel/nmi.c ++++ linux-1500/arch/i386/kernel/nmi.c +@@ -568,3 +568,4 @@ EXPORT_SYMBOL(reserve_lapic_nmi); EXPORT_SYMBOL(release_lapic_nmi); EXPORT_SYMBOL(disable_timer_nmi_watchdog); EXPORT_SYMBOL(enable_timer_nmi_watchdog); +EXPORT_SYMBOL_GPL(touch_nmi_watchdog); -diff -uprN linux-2.6.10.orig/arch/i386/kernel/process.c linux-2.6.10.crashdumpcommon/arch/i386/kernel/process.c ---- linux-2.6.10.orig/arch/i386/kernel/process.c 2005-01-18 13:12:04.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/i386/kernel/process.c 2005-01-18 11:56:34.000000000 -0500 -@@ -277,6 +277,8 @@ void show_regs(struct pt_regs * regs) +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/kernel/process.c linux-1500/arch/i386/kernel/process.c +--- linux-1400/arch/i386/kernel/process.c ++++ linux-1500/arch/i386/kernel/process.c +@@ -276,6 +276,8 @@ void show_regs(struct pt_regs * regs) show_trace(NULL, ®s->esp); } @@ -43,10 +18,10 @@ /* * This gets run with %ebx containing the * function to call, and %edx containing -diff -uprN linux-2.6.10.orig/arch/i386/kernel/smp.c linux-2.6.10.crashdumpcommon/arch/i386/kernel/smp.c ---- linux-2.6.10.orig/arch/i386/kernel/smp.c 2004-12-24 16:33:52.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/i386/kernel/smp.c 2005-01-18 12:17:09.000000000 -0500 -@@ -505,7 +505,10 @@ int smp_call_function (void (*func) (voi +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/kernel/smp.c linux-1500/arch/i386/kernel/smp.c +--- linux-1400/arch/i386/kernel/smp.c ++++ linux-1500/arch/i386/kernel/smp.c +@@ -508,7 +508,10 @@ int smp_call_function (void (*func) (voi * The function to run. This must be fast and non-blocking. * An arbitrary pointer to pass to the function. * currently unused. @@ -58,7 +33,7 @@ * [RETURNS] 0 on success, else a negative status code. Does not return until * remote CPUs are nearly ready to execute <> or are or have executed. * -@@ -513,35 +516,49 @@ int smp_call_function (void (*func) (voi +@@ -516,35 +519,49 @@ int smp_call_function (void (*func) (voi * hardware interrupt handler or from a bottom half handler. */ { @@ -122,9 +97,9 @@ cpu_relax(); spin_unlock(&call_lock); -diff -uprN linux-2.6.10.orig/arch/i386/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/i386/kernel/traps.c ---- linux-2.6.10.orig/arch/i386/kernel/traps.c 2005-01-18 13:12:04.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/i386/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/kernel/traps.c linux-1500/arch/i386/kernel/traps.c +--- linux-1400/arch/i386/kernel/traps.c ++++ linux-1500/arch/i386/kernel/traps.c @@ -334,6 +334,7 @@ void die(const char * str, struct pt_reg printk("\n"); notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV); @@ -140,11 +115,11 @@ + if (netdump_func) + netdump_func = NULL; printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(5 * HZ); -diff -uprN linux-2.6.10.orig/arch/i386/mm/init.c linux-2.6.10.crashdumpcommon/arch/i386/mm/init.c ---- linux-2.6.10.orig/arch/i386/mm/init.c 2005-01-18 13:12:04.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/i386/mm/init.c 2005-01-18 11:56:34.000000000 -0500 + ssleep(5); + panic("Fatal exception"); +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/mm/init.c linux-1500/arch/i386/mm/init.c +--- linux-1400/arch/i386/mm/init.c ++++ linux-1500/arch/i386/mm/init.c @@ -229,6 +229,53 @@ static inline int page_is_ram(unsigned l return 0; } @@ -199,9 +174,9 @@ /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address is * valid. The argument is a physical page number. -diff -uprN linux-2.6.10.orig/arch/i386/mm/pgtable.c linux-2.6.10.crashdumpcommon/arch/i386/mm/pgtable.c ---- linux-2.6.10.orig/arch/i386/mm/pgtable.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/i386/mm/pgtable.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/mm/pgtable.c linux-1500/arch/i386/mm/pgtable.c +--- linux-1400/arch/i386/mm/pgtable.c ++++ linux-1500/arch/i386/mm/pgtable.c @@ -13,6 +13,7 @@ #include #include @@ -219,18 +194,18 @@ /* * Associate a virtual page frame with a given physical page frame * and protection flags for that frame. -diff -uprN linux-2.6.10.orig/arch/ia64/kernel/process.c linux-2.6.10.crashdumpcommon/arch/ia64/kernel/process.c ---- linux-2.6.10.orig/arch/ia64/kernel/process.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ia64/kernel/process.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/kernel/process.c linux-1500/arch/ia64/kernel/process.c +--- linux-1400/arch/ia64/kernel/process.c ++++ linux-1500/arch/ia64/kernel/process.c @@ -39,6 +39,7 @@ #include #include #include +#include - #ifdef CONFIG_PERFMON - # include -@@ -150,6 +151,8 @@ show_regs (struct pt_regs *regs) + #include "entry.h" + +@@ -152,6 +153,8 @@ show_regs (struct pt_regs *regs) show_stack(NULL, NULL); } @@ -239,7 +214,7 @@ void do_notify_resume_user (sigset_t *oldset, struct sigscratch *scr, long in_syscall) { -@@ -576,11 +579,13 @@ do_dump_task_fpu (struct task_struct *ta +@@ -578,11 +581,13 @@ do_dump_task_fpu (struct task_struct *ta } void @@ -254,7 +229,7 @@ void do_dump_fpu (struct unw_frame_info *info, void *arg) { -@@ -593,7 +598,7 @@ dump_task_regs(struct task_struct *task, +@@ -595,7 +600,7 @@ dump_task_regs(struct task_struct *task, struct unw_frame_info tcore_info; if (current == task) { @@ -263,7 +238,7 @@ } else { memset(&tcore_info, 0, sizeof(tcore_info)); unw_init_from_blocked_task(&tcore_info, task); -@@ -605,7 +610,7 @@ dump_task_regs(struct task_struct *task, +@@ -607,7 +612,7 @@ dump_task_regs(struct task_struct *task, void ia64_elf_core_copy_regs (struct pt_regs *pt, elf_gregset_t dst) { @@ -272,7 +247,7 @@ } int -@@ -796,3 +801,22 @@ machine_power_off (void) +@@ -798,3 +803,22 @@ machine_power_off (void) } EXPORT_SYMBOL(machine_power_off); @@ -295,9 +270,9 @@ +} + +EXPORT_SYMBOL_GPL(ia64_start_dump); -diff -uprN linux-2.6.10.orig/arch/ia64/kernel/smp.c linux-2.6.10.crashdumpcommon/arch/ia64/kernel/smp.c ---- linux-2.6.10.orig/arch/ia64/kernel/smp.c 2004-12-24 16:35:40.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ia64/kernel/smp.c 2005-01-19 13:26:15.155435784 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/kernel/smp.c linux-1500/arch/ia64/kernel/smp.c +--- linux-1400/arch/ia64/kernel/smp.c ++++ linux-1500/arch/ia64/kernel/smp.c @@ -62,7 +62,7 @@ struct call_data_struct { atomic_t finished; }; @@ -307,7 +282,7 @@ #define IPI_CALL_FUNC 0 #define IPI_CPU_STOP 1 -@@ -313,7 +313,10 @@ EXPORT_SYMBOL(smp_call_function_single); +@@ -312,7 +312,10 @@ EXPORT_SYMBOL(smp_call_function_single); * The function to run. This must be fast and non-blocking. * An arbitrary pointer to pass to the function. * currently unused. @@ -319,7 +294,7 @@ * [RETURNS] 0 on success, else a negative status code. * * Does not return until remote CPUs are nearly ready to execute or are or have -@@ -325,36 +328,51 @@ EXPORT_SYMBOL(smp_call_function_single); +@@ -324,36 +327,51 @@ EXPORT_SYMBOL(smp_call_function_single); int smp_call_function (void (*func) (void *info), void *info, int nonatomic, int wait) { @@ -386,9 +361,9 @@ spin_unlock(&call_lock); return 0; -diff -uprN linux-2.6.10.orig/arch/ia64/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/ia64/kernel/traps.c ---- linux-2.6.10.orig/arch/ia64/kernel/traps.c 2004-12-24 16:35:39.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ia64/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/kernel/traps.c linux-1500/arch/ia64/kernel/traps.c +--- linux-1400/arch/ia64/kernel/traps.c ++++ linux-1500/arch/ia64/kernel/traps.c @@ -92,6 +92,12 @@ die (const char *str, struct pt_regs *re } else printk(KERN_ERR "Recursive die() failure, output suppressed\n"); @@ -402,9 +377,9 @@ bust_spinlocks(0); die.lock_owner = -1; spin_unlock_irq(&die.lock); -diff -uprN linux-2.6.10.orig/arch/ia64/mm/contig.c linux-2.6.10.crashdumpcommon/arch/ia64/mm/contig.c ---- linux-2.6.10.orig/arch/ia64/mm/contig.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ia64/mm/contig.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/mm/contig.c linux-1500/arch/ia64/mm/contig.c +--- linux-1400/arch/ia64/mm/contig.c ++++ linux-1500/arch/ia64/mm/contig.c @@ -19,6 +19,7 @@ #include #include @@ -413,7 +388,7 @@ #include #include -@@ -63,6 +64,8 @@ show_mem (void) +@@ -64,6 +65,8 @@ show_mem (void) printk("%ld pages in page table cache\n", pgtable_cache_size); } @@ -422,10 +397,10 @@ /* physical address where the bootmem map is located */ unsigned long bootmap_start; -diff -uprN linux-2.6.10.orig/arch/ia64/mm/discontig.c linux-2.6.10.crashdumpcommon/arch/ia64/mm/discontig.c ---- linux-2.6.10.orig/arch/ia64/mm/discontig.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ia64/mm/discontig.c 2005-01-18 12:30:09.000000000 -0500 -@@ -17,6 +17,7 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/mm/discontig.c linux-1500/arch/ia64/mm/discontig.c +--- linux-1400/arch/ia64/mm/discontig.c ++++ linux-1500/arch/ia64/mm/discontig.c +@@ -21,6 +21,7 @@ #include #include #include @@ -433,7 +408,7 @@ #include #include #include -@@ -557,6 +558,8 @@ void show_mem(void) +@@ -586,6 +587,8 @@ void show_mem(void) printk("%d free buffer pages\n", nr_free_buffer_pages()); } @@ -442,9 +417,9 @@ /** * call_pernode_memory - use SRAT to call callback functions with node info * @start: physical start of range -diff -uprN linux-2.6.10.orig/arch/ia64/mm/init.c linux-2.6.10.crashdumpcommon/arch/ia64/mm/init.c ---- linux-2.6.10.orig/arch/ia64/mm/init.c 2005-01-18 13:12:04.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ia64/mm/init.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/mm/init.c linux-1500/arch/ia64/mm/init.c +--- linux-1400/arch/ia64/mm/init.c ++++ linux-1500/arch/ia64/mm/init.c @@ -230,12 +230,94 @@ free_initrd_mem (unsigned long start, un } } @@ -544,10 +519,10 @@ /* * This installs a clean page in the kernel's page table. -diff -uprN linux-2.6.10.orig/arch/ppc64/kernel/process.c linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/process.c ---- linux-2.6.10.orig/arch/ppc64/kernel/process.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/process.c 2005-01-18 11:56:34.000000000 -0500 -@@ -246,6 +246,7 @@ static void show_instructions(struct pt_ +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ppc64/kernel/process.c linux-1500/arch/ppc64/kernel/process.c +--- linux-1400/arch/ppc64/kernel/process.c ++++ linux-1500/arch/ppc64/kernel/process.c +@@ -264,6 +264,7 @@ static void show_instructions(struct pt_ printk("\n"); } @@ -555,10 +530,10 @@ void show_regs(struct pt_regs * regs) { -diff -uprN linux-2.6.10.orig/arch/ppc64/kernel/smp.c linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/smp.c ---- linux-2.6.10.orig/arch/ppc64/kernel/smp.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/smp.c 2005-01-18 11:56:34.000000000 -0500 -@@ -223,7 +223,10 @@ static struct call_data_struct { +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ppc64/kernel/smp.c linux-1500/arch/ppc64/kernel/smp.c +--- linux-1400/arch/ppc64/kernel/smp.c ++++ linux-1500/arch/ppc64/kernel/smp.c +@@ -222,7 +222,10 @@ static struct call_data_struct { * The function to run. This must be fast and non-blocking. * An arbitrary pointer to pass to the function. * currently unused. @@ -570,7 +545,7 @@ * [RETURNS] 0 on success, else a negative status code. Does not return until * remote CPUs are nearly ready to execute <> or are or have executed. * -@@ -233,21 +236,32 @@ static struct call_data_struct { +@@ -232,21 +235,32 @@ static struct call_data_struct { int smp_call_function (void (*func) (void *info), void *info, int nonatomic, int wait) { @@ -612,7 +587,7 @@ /* Must grab online cpu count with preempt disabled, otherwise * it can change. */ cpus = num_online_cpus() - 1; -@@ -256,34 +270,35 @@ int smp_call_function (void (*func) (voi +@@ -255,34 +269,35 @@ int smp_call_function (void (*func) (voi goto out; } @@ -657,10 +632,10 @@ debugger(NULL); goto out; } -diff -uprN linux-2.6.10.orig/arch/ppc64/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/traps.c ---- linux-2.6.10.orig/arch/ppc64/kernel/traps.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500 -@@ -129,6 +129,7 @@ int die(const char *str, struct pt_regs +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ppc64/kernel/traps.c linux-1500/arch/ppc64/kernel/traps.c +--- linux-1400/arch/ppc64/kernel/traps.c ++++ linux-1500/arch/ppc64/kernel/traps.c +@@ -131,6 +131,7 @@ int die(const char *str, struct pt_regs printk("\n"); print_modules(); show_regs(regs); @@ -668,19 +643,19 @@ bust_spinlocks(0); spin_unlock_irq(&die_lock); -@@ -136,6 +137,8 @@ int die(const char *str, struct pt_regs +@@ -138,6 +139,8 @@ int die(const char *str, struct pt_regs panic("Fatal exception in interrupt"); if (panic_on_oops) { + if (netdump_func) + netdump_func = NULL; printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(5 * HZ); -diff -uprN linux-2.6.10.orig/arch/ppc64/mm/init.c linux-2.6.10.crashdumpcommon/arch/ppc64/mm/init.c ---- linux-2.6.10.orig/arch/ppc64/mm/init.c 2005-01-18 13:12:04.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/ppc64/mm/init.c 2005-01-18 11:56:34.000000000 -0500 -@@ -113,6 +113,7 @@ void show_mem(void) + ssleep(5); + panic("Fatal exception"); +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ppc64/mm/init.c linux-1500/arch/ppc64/mm/init.c +--- linux-1400/arch/ppc64/mm/init.c ++++ linux-1500/arch/ppc64/mm/init.c +@@ -115,6 +115,7 @@ void show_mem(void) printk("%ld pages shared\n", shared); printk("%ld pages swap cached\n", cached); } @@ -688,7 +663,7 @@ #ifdef CONFIG_PPC_ISERIES -@@ -589,6 +590,34 @@ int page_is_ram(unsigned long pfn) +@@ -597,6 +598,34 @@ int page_is_ram(unsigned long pfn) } EXPORT_SYMBOL(page_is_ram); @@ -723,9 +698,9 @@ /* * Initialize the bootmem system and give it all the memory we * have available. -diff -uprN linux-2.6.10.orig/arch/s390/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/s390/kernel/traps.c ---- linux-2.6.10.orig/arch/s390/kernel/traps.c 2004-12-24 16:34:30.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/s390/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/s390/kernel/traps.c linux-1500/arch/s390/kernel/traps.c +--- linux-1400/arch/s390/kernel/traps.c ++++ linux-1500/arch/s390/kernel/traps.c @@ -285,12 +285,16 @@ void die(const char * str, struct pt_reg bust_spinlocks(1); printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter); @@ -744,10 +719,10 @@ do_exit(SIGSEGV); } -diff -uprN linux-2.6.10.orig/arch/x86_64/kernel/process.c linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/process.c ---- linux-2.6.10.orig/arch/x86_64/kernel/process.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/process.c 2005-01-18 11:56:34.000000000 -0500 -@@ -274,6 +274,8 @@ void show_regs(struct pt_regs *regs) +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/kernel/process.c linux-1500/arch/x86_64/kernel/process.c +--- linux-1400/arch/x86_64/kernel/process.c ++++ linux-1500/arch/x86_64/kernel/process.c +@@ -275,6 +275,8 @@ void show_regs(struct pt_regs *regs) show_trace(®s->rsp); } @@ -756,9 +731,9 @@ /* * Free current thread data structures etc.. */ -diff -uprN linux-2.6.10.orig/arch/x86_64/kernel/smp.c linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/smp.c ---- linux-2.6.10.orig/arch/x86_64/kernel/smp.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/smp.c 2005-01-19 13:26:43.795081896 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/kernel/smp.c linux-1500/arch/x86_64/kernel/smp.c +--- linux-1400/arch/x86_64/kernel/smp.c ++++ linux-1500/arch/x86_64/kernel/smp.c @@ -288,33 +288,47 @@ static struct call_data_struct * call_da static void __smp_call_function (void (*func) (void *info), void *info, int nonatomic, int wait) @@ -835,9 +810,9 @@ * * Returns 0 on success, else a negative status code. Does not return until * remote CPUs are nearly ready to execute func or are or have executed. -diff -uprN linux-2.6.10.orig/arch/x86_64/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/traps.c ---- linux-2.6.10.orig/arch/x86_64/kernel/traps.c 2005-01-18 13:11:56.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/kernel/traps.c linux-1500/arch/x86_64/kernel/traps.c +--- linux-1400/arch/x86_64/kernel/traps.c ++++ linux-1500/arch/x86_64/kernel/traps.c @@ -349,8 +349,11 @@ void oops_end(void) bust_spinlocks(0); spin_unlock(&die_lock); @@ -859,9 +834,9 @@ oops_end(); do_exit(SIGSEGV); } -diff -uprN linux-2.6.10.orig/arch/x86_64/mm/fault.c linux-2.6.10.crashdumpcommon/arch/x86_64/mm/fault.c ---- linux-2.6.10.orig/arch/x86_64/mm/fault.c 2005-01-18 13:12:02.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/x86_64/mm/fault.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/mm/fault.c linux-1500/arch/x86_64/mm/fault.c +--- linux-1400/arch/x86_64/mm/fault.c ++++ linux-1500/arch/x86_64/mm/fault.c @@ -541,6 +541,7 @@ no_context: __die("Oops", regs, error_code); /* Executive summary in case the body of the oops scrolled away */ @@ -870,9 +845,9 @@ oops_end(); do_exit(SIGKILL); -diff -uprN linux-2.6.10.orig/arch/x86_64/mm/init.c linux-2.6.10.crashdumpcommon/arch/x86_64/mm/init.c ---- linux-2.6.10.orig/arch/x86_64/mm/init.c 2005-01-18 13:12:04.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/arch/x86_64/mm/init.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/mm/init.c linux-1500/arch/x86_64/mm/init.c +--- linux-1400/arch/x86_64/mm/init.c ++++ linux-1500/arch/x86_64/mm/init.c @@ -23,6 +23,7 @@ #include #include @@ -926,7 +901,7 @@ /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address is * valid. The argument is a physical page number. -@@ -574,6 +606,7 @@ int kern_addr_valid(unsigned long addr) +@@ -576,6 +608,7 @@ int kern_addr_valid(unsigned long addr) return 0; return pfn_valid(pte_pfn(*pte)); } @@ -934,11 +909,36 @@ #ifdef CONFIG_SYSCTL #include -diff -uprN linux-2.6.10.orig/drivers/char/sysrq.c linux-2.6.10.crashdumpcommon/drivers/char/sysrq.c ---- linux-2.6.10.orig/drivers/char/sysrq.c 2005-01-18 13:11:57.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/drivers/char/sysrq.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/Documentation/sysrq.txt linux-1500/Documentation/sysrq.txt +--- linux-1400/Documentation/sysrq.txt ++++ linux-1500/Documentation/sysrq.txt +@@ -72,6 +72,10 @@ On all - write a character to /proc/sys + 'b' - Will immediately reboot the system without syncing or unmounting + your disks. + ++'c' - Intentionally crash the system without syncing or unmounting ++ your disks. This is most useful if the NETDUMP client package ++ and/or the DISKDUMP package have been installed. ++ + 'o' - Will shut your system off (if configured and supported). + + 's' - Will attempt to sync all mounted filesystems. +@@ -120,6 +124,10 @@ useful when you want to exit a program t + re'B'oot is good when you're unable to shut down. But you should also 'S'ync + and 'U'mount first. + ++'C'rash immediately crashes your system. This is most useful if the machine ++has been configured as a NETDUMP client because an OOPS report is generated ++and a kernel crash dump is sent to the NETDUMP server. ++ + 'S'ync is great when your system is locked up, it allows you to sync your + disks and will certainly lessen the chance of data loss and fscking. Note + that the sync hasn't taken place until you see the "OK" and "Done" appear +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/drivers/char/sysrq.c linux-1500/drivers/char/sysrq.c +--- linux-1400/drivers/char/sysrq.c ++++ linux-1500/drivers/char/sysrq.c @@ -108,6 +108,17 @@ static struct sysrq_key_op sysrq_reboot_ - .action_msg = "Resetting", + .enable_mask = SYSRQ_ENABLE_BOOT, }; +/* crash sysrq handler */ @@ -955,7 +955,7 @@ static void sysrq_handle_sync(int key, struct pt_regs *pt_regs, struct tty_struct *tty) { -@@ -246,7 +257,7 @@ static struct sysrq_key_op *sysrq_key_ta +@@ -254,7 +265,7 @@ static struct sysrq_key_op *sysrq_key_ta it is handled specially on the sparc and will never arrive */ /* b */ &sysrq_reboot_op, @@ -964,9 +964,9 @@ /* d */ NULL, /* e */ &sysrq_term_op, /* f */ NULL, -diff -uprN linux-2.6.10.orig/include/asm-generic/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-generic/crashdump.h ---- linux-2.6.10.orig/include/asm-generic/crashdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/include/asm-generic/crashdump.h 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-generic/crashdump.h linux-1500/include/asm-generic/crashdump.h +--- linux-1400/include/asm-generic/crashdump.h ++++ linux-1500/include/asm-generic/crashdump.h @@ -0,0 +1,47 @@ +#ifndef _ASM_GENERIC_CRASHDUMP_H_ +#define _ASM_GENERIC_CRASHDUMP_H_ @@ -1015,9 +1015,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_GENERIC_CRASHDUMP_H */ -diff -uprN linux-2.6.10.orig/include/asm-i386/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-i386/crashdump.h ---- linux-2.6.10.orig/include/asm-i386/crashdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/include/asm-i386/crashdump.h 2005-01-18 14:48:16.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-i386/crashdump.h linux-1500/include/asm-i386/crashdump.h +--- linux-1400/include/asm-i386/crashdump.h ++++ linux-1500/include/asm-i386/crashdump.h @@ -0,0 +1,123 @@ +#ifndef _ASM_I386_CRASHDUMP_H +#define _ASM_I386_CRASHDUMP_H @@ -1142,9 +1142,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_I386_CRASHDUMP_H */ -diff -uprN linux-2.6.10.orig/include/asm-i386/kmap_types.h linux-2.6.10.crashdumpcommon/include/asm-i386/kmap_types.h ---- linux-2.6.10.orig/include/asm-i386/kmap_types.h 2004-12-24 16:35:23.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/include/asm-i386/kmap_types.h 2005-01-18 12:31:16.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-i386/kmap_types.h linux-1500/include/asm-i386/kmap_types.h +--- linux-1400/include/asm-i386/kmap_types.h ++++ linux-1500/include/asm-i386/kmap_types.h @@ -23,7 +23,9 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -1156,9 +1156,9 @@ }; #undef D -diff -uprN linux-2.6.10.orig/include/asm-ia64/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-ia64/crashdump.h ---- linux-2.6.10.orig/include/asm-ia64/crashdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/include/asm-ia64/crashdump.h 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-ia64/crashdump.h linux-1500/include/asm-ia64/crashdump.h +--- linux-1400/include/asm-ia64/crashdump.h ++++ linux-1500/include/asm-ia64/crashdump.h @@ -0,0 +1,72 @@ +#ifndef _ASM_IA64_CRASHDUMP_H +#define _ASM_IA64_CRASHDUMP_H @@ -1232,9 +1232,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_IA64_CRASHDUMP_H */ -diff -uprN linux-2.6.10.orig/include/asm-ppc64/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-ppc64/crashdump.h ---- linux-2.6.10.orig/include/asm-ppc64/crashdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/include/asm-ppc64/crashdump.h 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-ppc64/crashdump.h linux-1500/include/asm-ppc64/crashdump.h +--- linux-1400/include/asm-ppc64/crashdump.h ++++ linux-1500/include/asm-ppc64/crashdump.h @@ -0,0 +1,61 @@ +#ifndef _ASM_PPC64_CRASHDUMP_H +#define _ASM_PPC64_CRASHDUMP_H @@ -1297,9 +1297,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_PPC64_CRASHDUMP_H */ -diff -uprN linux-2.6.10.orig/include/asm-x86_64/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-x86_64/crashdump.h ---- linux-2.6.10.orig/include/asm-x86_64/crashdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/include/asm-x86_64/crashdump.h 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-x86_64/crashdump.h linux-1500/include/asm-x86_64/crashdump.h +--- linux-1400/include/asm-x86_64/crashdump.h ++++ linux-1500/include/asm-x86_64/crashdump.h @@ -0,0 +1,86 @@ +/* + * include/asm-x86_64/crashdump.h @@ -1387,10 +1387,10 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_X86_64_CRASHDUMP_H */ -diff -uprN linux-2.6.10.orig/include/linux/kernel.h linux-2.6.10.crashdumpcommon/include/linux/kernel.h ---- linux-2.6.10.orig/include/linux/kernel.h 2005-01-18 13:12:00.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/include/linux/kernel.h 2005-01-18 11:56:34.000000000 -0500 -@@ -142,6 +142,17 @@ extern int tainted; +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/linux/kernel.h linux-1500/include/linux/kernel.h +--- linux-1400/include/linux/kernel.h ++++ linux-1500/include/linux/kernel.h +@@ -152,6 +152,17 @@ extern int tainted; extern const char *print_tainted(void); extern void add_taint(unsigned); @@ -1408,7 +1408,7 @@ /* Values used for system_state */ extern enum system_states { SYSTEM_BOOTING, -@@ -149,6 +160,7 @@ extern enum system_states { +@@ -159,6 +170,7 @@ extern enum system_states { SYSTEM_HALT, SYSTEM_POWER_OFF, SYSTEM_RESTART, @@ -1416,7 +1416,7 @@ } system_state; #define TAINT_PROPRIETARY_MODULE (1<<0) -@@ -171,6 +183,12 @@ extern void dump_stack(void); +@@ -181,6 +193,12 @@ extern void dump_stack(void); #define pr_info(fmt,arg...) \ printk(KERN_INFO fmt,##arg) @@ -1429,20 +1429,9 @@ /* * Display an IP address in readable format. */ ---- linux-2.6.11/kernel/Makefile~ 2005-03-18 15:42:55.000000000 -0500 -+++ linux-2.6.11/kernel/Makefile 2005-03-18 15:43:08.000000000 -0500 -@@ -7,7 +7,7 @@ obj-y = sched.o fork.o exec_domain.o - sysctl.o capability.o ptrace.o timer.o user.o \ - signal.o sys.o kmod.o workqueue.o pid.o \ - rcupdate.o intermodule.o extable.o params.o posix-timers.o \ -- kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o -+ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o dump.o - - obj-$(CONFIG_FUTEX) += futex.o - obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o -diff -uprN linux-2.6.10.orig/kernel/dump.c linux-2.6.10.crashdumpcommon/kernel/dump.c ---- linux-2.6.10.orig/kernel/dump.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/kernel/dump.c 2005-01-18 11:56:34.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/dump.c linux-1500/kernel/dump.c +--- linux-1400/kernel/dump.c ++++ linux-1500/kernel/dump.c @@ -0,0 +1,246 @@ +/* + * linux/kernel/dump.c @@ -1690,10 +1679,22 @@ + if (netdump_func) + netdump_func(regs); +} -diff -uprN linux-2.6.10.orig/kernel/panic.c linux-2.6.10.crashdumpcommon/kernel/panic.c ---- linux-2.6.10.orig/kernel/panic.c 2004-12-24 16:35:29.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/kernel/panic.c 2005-01-18 11:56:34.000000000 -0500 -@@ -69,6 +69,8 @@ NORET_TYPE void panic(const char * fmt, +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/Makefile linux-1500/kernel/Makefile +--- linux-1400/kernel/Makefile ++++ linux-1500/kernel/Makefile +@@ -7,7 +7,7 @@ obj-y = sched.o fork.o exec_domain.o + sysctl.o capability.o ptrace.o timer.o user.o \ + signal.o sys.o kmod.o workqueue.o pid.o \ + rcupdate.o intermodule.o extable.o params.o posix-timers.o \ +- kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o ++ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o dump.o + + obj-$(CONFIG_FUTEX) += futex.o + obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/panic.c linux-1500/kernel/panic.c +--- linux-1400/kernel/panic.c ++++ linux-1500/kernel/panic.c +@@ -68,6 +68,8 @@ NORET_TYPE void panic(const char * fmt, vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf); @@ -1702,10 +1703,10 @@ bust_spinlocks(0); #ifdef CONFIG_SMP -diff -uprN linux-2.6.10.orig/kernel/printk.c linux-2.6.10.crashdumpcommon/kernel/printk.c ---- linux-2.6.10.orig/kernel/printk.c 2005-01-18 13:12:00.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/kernel/printk.c 2005-01-18 11:56:34.000000000 -0500 -@@ -384,6 +384,20 @@ asmlinkage long sys_syslog(int type, cha +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/printk.c linux-1500/kernel/printk.c +--- linux-1400/kernel/printk.c ++++ linux-1500/kernel/printk.c +@@ -386,6 +386,20 @@ asmlinkage long sys_syslog(int type, cha } /* @@ -1726,7 +1727,7 @@ * Call the console drivers on a range of log_buf */ static void __call_console_drivers(unsigned long start, unsigned long end) -@@ -541,6 +555,12 @@ asmlinkage int vprintk(const char *fmt, +@@ -559,6 +573,12 @@ asmlinkage int vprintk(const char *fmt, /* Emit the output into the temporary buffer */ printed_len = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args); @@ -1739,10 +1740,10 @@ /* * Copy the output into log_buf. If the caller didn't provide * appropriate log level tags, we insert them here -diff -uprN linux-2.6.10.orig/kernel/sched.c linux-2.6.10.crashdumpcommon/kernel/sched.c ---- linux-2.6.10.orig/kernel/sched.c 2005-01-18 13:12:04.000000000 -0500 -+++ linux-2.6.10.crashdumpcommon/kernel/sched.c 2005-01-18 11:56:34.000000000 -0500 -@@ -3894,6 +3894,8 @@ void show_state(void) +diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/sched.c linux-1500/kernel/sched.c +--- linux-1400/kernel/sched.c ++++ linux-1500/kernel/sched.c +@@ -4004,6 +4004,8 @@ void show_state(void) read_unlock(&tasklist_lock); } linux-2.6.10-diskdump.patch: drivers/block/Kconfig | 5 drivers/block/Makefile | 1 drivers/block/diskdump.c | 1121 +++++++++++++++++++++++++++++++++++++++++ include/asm-generic/diskdump.h | 13 include/asm-i386/diskdump.h | 55 ++ include/asm-ia64/diskdump.h | 63 ++ include/asm-ppc/diskdump.h | 6 include/asm-ppc64/diskdump.h | 55 ++ include/asm-s390/diskdump.h | 6 include/asm-x86_64/diskdump.h | 44 + include/linux/diskdump.h | 186 ++++++ include/linux/interrupt.h | 4 include/linux/timer.h | 3 include/linux/workqueue.h | 3 kernel/softirq.c | 32 + kernel/timer.c | 43 + kernel/workqueue.c | 34 + 17 files changed, 1670 insertions(+), 4 deletions(-) Index: linux-2.6.10-diskdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-diskdump.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.10-diskdump.patch 19 Jan 2005 22:57:00 -0000 1.1 +++ linux-2.6.10-diskdump.patch 22 Mar 2005 07:00:21 -0000 1.2 @@ -1,29 +1,6 @@ -diff --exclude=configs -uprN linux-2.6.10.netdump/drivers/block/Kconfig linux-2.6.10/drivers/block/Kconfig ---- linux-2.6.10.netdump/drivers/block/Kconfig 2005-01-18 15:39:00.000000000 -0500 -+++ linux-2.6.10/drivers/block/Kconfig 2005-01-18 17:08:17.848875016 -0500 -@@ -495,6 +495,11 @@ config CDROM_PKTCDVD_WCACHE - this option is dangerous unless the CD-RW media is known good, as we - don't do deferred write error handling yet. - -+config DISKDUMP -+ tristate "Disk dump support" -+ ---help--- -+ Disk dump support. -+ - source "drivers/s390/block/Kconfig" - - source "drivers/block/Kconfig.iosched" -diff --exclude=configs -uprN linux-2.6.10.netdump/drivers/block/Makefile linux-2.6.10/drivers/block/Makefile ---- linux-2.6.10.netdump/drivers/block/Makefile 2004-12-24 16:35:24.000000000 -0500 -+++ linux-2.6.10/drivers/block/Makefile 2005-01-18 17:08:17.849874864 -0500 -@@ -45,3 +45,4 @@ obj-$(CONFIG_VIODASD) += viodasd.o - obj-$(CONFIG_BLK_DEV_SX8) += sx8.o - obj-$(CONFIG_BLK_DEV_UB) += ub.o - -+obj-$(CONFIG_DISKDUMP) += diskdump.o -diff --exclude=configs -uprN linux-2.6.10.netdump/drivers/block/diskdump.c linux-2.6.10/drivers/block/diskdump.c ---- linux-2.6.10.netdump/drivers/block/diskdump.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/drivers/block/diskdump.c 2005-01-18 17:08:17.852874408 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/drivers/block/diskdump.c linux-1503/drivers/block/diskdump.c +--- linux-1502/drivers/block/diskdump.c ++++ linux-1503/drivers/block/diskdump.c @@ -0,0 +1,1121 @@ +/* + * linux/drivers/block/diskdump.c @@ -1146,9 +1123,32 @@ +module_exit(cleanup_diskdump); + +MODULE_LICENSE("GPL"); -diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-generic/diskdump.h linux-2.6.10/include/asm-generic/diskdump.h ---- linux-2.6.10.netdump/include/asm-generic/diskdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-generic/diskdump.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/drivers/block/Kconfig linux-1503/drivers/block/Kconfig +--- linux-1502/drivers/block/Kconfig ++++ linux-1503/drivers/block/Kconfig +@@ -495,6 +495,11 @@ config CDROM_PKTCDVD_WCACHE + this option is dangerous unless the CD-RW media is known good, as we + don't do deferred write error handling yet. + ++config DISKDUMP ++ tristate "Disk dump support" ++ ---help--- ++ Disk dump support. ++ + source "drivers/s390/block/Kconfig" + + source "drivers/block/Kconfig.iosched" +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/drivers/block/Makefile linux-1503/drivers/block/Makefile +--- linux-1502/drivers/block/Makefile ++++ linux-1503/drivers/block/Makefile +@@ -45,3 +45,4 @@ obj-$(CONFIG_VIODASD) += viodasd.o + obj-$(CONFIG_BLK_DEV_SX8) += sx8.o + obj-$(CONFIG_BLK_DEV_UB) += ub.o + ++obj-$(CONFIG_DISKDUMP) += diskdump.o +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-generic/diskdump.h linux-1503/include/asm-generic/diskdump.h +--- linux-1502/include/asm-generic/diskdump.h ++++ linux-1503/include/asm-generic/diskdump.h @@ -0,0 +1,13 @@ +#ifndef _ASM_GENERIC_DISKDUMP_H_ +#define _ASM_GENERIC_DISKDUMP_H_ @@ -1163,9 +1163,9 @@ +#define write_sub_header() 1 + +#endif /* _ASM_GENERIC_DISKDUMP_H */ -diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-i386/diskdump.h linux-2.6.10/include/asm-i386/diskdump.h ---- linux-2.6.10.netdump/include/asm-i386/diskdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-i386/diskdump.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-i386/diskdump.h linux-1503/include/asm-i386/diskdump.h +--- linux-1502/include/asm-i386/diskdump.h ++++ linux-1503/include/asm-i386/diskdump.h @@ -0,0 +1,55 @@ +#ifndef _ASM_I386_DISKDUMP_H +#define _ASM_I386_DISKDUMP_H @@ -1222,9 +1222,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_I386_DISKDUMP_H */ -diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-ia64/diskdump.h linux-2.6.10/include/asm-ia64/diskdump.h ---- linux-2.6.10.netdump/include/asm-ia64/diskdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-ia64/diskdump.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-ia64/diskdump.h linux-1503/include/asm-ia64/diskdump.h +--- linux-1502/include/asm-ia64/diskdump.h ++++ linux-1503/include/asm-ia64/diskdump.h @@ -0,0 +1,63 @@ +#ifndef _ASM_IA64_DISKDUMP_H +#define _ASM_IA64_DISKDUMP_H @@ -1289,9 +1289,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_IA64_DISKDUMP_H */ -diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-ppc/diskdump.h linux-2.6.10/include/asm-ppc/diskdump.h ---- linux-2.6.10.netdump/include/asm-ppc/diskdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-ppc/diskdump.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-ppc/diskdump.h linux-1503/include/asm-ppc/diskdump.h +--- linux-1502/include/asm-ppc/diskdump.h ++++ linux-1503/include/asm-ppc/diskdump.h @@ -0,0 +1,6 @@ +#ifndef _ASM_PPC64_DISKDUMP_H_ +#define _ASM_PPC64_DISKDUMP_H_ @@ -1299,9 +1299,9 @@ +#include + +#endif /* _ASM_PPC64_DISKDUMP_H_ */ -diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-ppc64/diskdump.h linux-2.6.10/include/asm-ppc64/diskdump.h ---- linux-2.6.10.netdump/include/asm-ppc64/diskdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-ppc64/diskdump.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-ppc64/diskdump.h linux-1503/include/asm-ppc64/diskdump.h +--- linux-1502/include/asm-ppc64/diskdump.h ++++ linux-1503/include/asm-ppc64/diskdump.h @@ -0,0 +1,55 @@ +#ifndef _ASM_PPC64_DISKDUMP_H_ +#define _ASM_PPC64_DISKDUMP_H_ @@ -1358,9 +1358,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_PPC64_DISKDUMP_H_ */ -diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-s390/diskdump.h linux-2.6.10/include/asm-s390/diskdump.h ---- linux-2.6.10.netdump/include/asm-s390/diskdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-s390/diskdump.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-s390/diskdump.h linux-1503/include/asm-s390/diskdump.h +--- linux-1502/include/asm-s390/diskdump.h ++++ linux-1503/include/asm-s390/diskdump.h @@ -0,0 +1,6 @@ +#ifndef _ASM_S390_DISKDUMP_H_ +#define _ASM_S390_DISKDUMP_H_ @@ -1368,9 +1368,9 @@ +#include + +#endif /* _ASM_S390_DISKDUMP_H_ */ -diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-x86_64/diskdump.h linux-2.6.10/include/asm-x86_64/diskdump.h ---- linux-2.6.10.netdump/include/asm-x86_64/diskdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-x86_64/diskdump.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-x86_64/diskdump.h linux-1503/include/asm-x86_64/diskdump.h +--- linux-1502/include/asm-x86_64/diskdump.h ++++ linux-1503/include/asm-x86_64/diskdump.h @@ -0,0 +1,44 @@ +/* + * include/asm-x86_64/diskdump.h @@ -1416,9 +1416,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_X86_64_DISKDUMP_H */ -diff --exclude=configs -uprN linux-2.6.10.netdump/include/linux/diskdump.h linux-2.6.10/include/linux/diskdump.h ---- linux-2.6.10.netdump/include/linux/diskdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/linux/diskdump.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/linux/diskdump.h linux-1503/include/linux/diskdump.h +--- linux-1502/include/linux/diskdump.h ++++ linux-1503/include/linux/diskdump.h @@ -0,0 +1,186 @@ +#ifndef _LINUX_DISKDUMP_H +#define _LINUX_DISKDUMP_H @@ -1606,9 +1606,9 @@ + + +#endif /* _LINUX_DISKDUMP_H */ -diff --exclude=configs -uprN linux-2.6.10.netdump/include/linux/interrupt.h linux-2.6.10/include/linux/interrupt.h ---- linux-2.6.10.netdump/include/linux/interrupt.h 2005-01-18 15:38:58.000000000 -0500 -+++ linux-2.6.10/include/linux/interrupt.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/linux/interrupt.h linux-1503/include/linux/interrupt.h +--- linux-1502/include/linux/interrupt.h ++++ linux-1503/include/linux/interrupt.h @@ -286,4 +286,8 @@ extern int probe_irq_off(unsigned long); extern unsigned int probe_irq_mask(unsigned long); /* returns mask of ISA interrupts */ #endif @@ -1618,9 +1618,9 @@ +extern void dump_run_tasklet(void); + #endif -diff --exclude=configs -uprN linux-2.6.10.netdump/include/linux/timer.h linux-2.6.10/include/linux/timer.h ---- linux-2.6.10.netdump/include/linux/timer.h 2004-12-24 16:35:23.000000000 -0500 -+++ linux-2.6.10/include/linux/timer.h 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/linux/timer.h linux-1503/include/linux/timer.h +--- linux-1502/include/linux/timer.h ++++ linux-1503/include/linux/timer.h @@ -99,4 +99,7 @@ extern void init_timers(void); extern void run_local_timers(void); extern void it_real_fn(unsigned long); @@ -1629,10 +1629,10 @@ +extern void dump_run_timers(void); + #endif -diff --exclude=configs -uprN linux-2.6.10.netdump/include/linux/workqueue.h linux-2.6.10/include/linux/workqueue.h ---- linux-2.6.10.netdump/include/linux/workqueue.h 2004-12-24 16:35:23.000000000 -0500 -+++ linux-2.6.10/include/linux/workqueue.h 2005-01-18 17:08:17.000000000 -0500 -@@ -86,4 +86,7 @@ static inline int cancel_delayed_work(st +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/linux/workqueue.h linux-1503/include/linux/workqueue.h +--- linux-1502/include/linux/workqueue.h ++++ linux-1503/include/linux/workqueue.h +@@ -87,4 +87,7 @@ static inline int cancel_delayed_work(st return ret; } @@ -1640,9 +1640,9 @@ +extern void dump_run_workqueue(void); + #endif -diff --exclude=configs -uprN linux-2.6.10.netdump/kernel/softirq.c linux-2.6.10/kernel/softirq.c ---- linux-2.6.10.netdump/kernel/softirq.c 2005-01-18 15:38:58.000000000 -0500 -+++ linux-2.6.10/kernel/softirq.c 2005-01-18 17:08:17.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/kernel/softirq.c linux-1503/kernel/softirq.c +--- linux-1502/kernel/softirq.c ++++ linux-1503/kernel/softirq.c @@ -341,6 +341,38 @@ void tasklet_kill(struct tasklet_struct EXPORT_SYMBOL(tasklet_kill); @@ -1682,11 +1682,11 @@ void __init softirq_init(void) { open_softirq(TASKLET_SOFTIRQ, tasklet_action, NULL); -diff --exclude=configs -uprN linux-2.6.10.netdump/kernel/timer.c linux-2.6.10/kernel/timer.c ---- linux-2.6.10.netdump/kernel/timer.c 2005-01-18 15:38:58.000000000 -0500 -+++ linux-2.6.10/kernel/timer.c 2005-01-18 17:16:26.000000000 -0500 -@@ -32,6 +32,8 @@ - #include +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/kernel/timer.c linux-1503/kernel/timer.c +--- linux-1502/kernel/timer.c ++++ linux-1503/kernel/timer.c +@@ -33,6 +33,8 @@ + #include #include #include +#include @@ -1694,7 +1694,7 @@ #include #include -@@ -434,8 +436,9 @@ static int cascade(tvec_base_t *base, tv +@@ -436,8 +438,9 @@ static int cascade(tvec_base_t *base, tv static inline void __run_timers(tvec_base_t *base) { struct timer_list *timer; @@ -1705,7 +1705,7 @@ while (time_after_eq(jiffies, base->timer_jiffies)) { struct list_head work_list = LIST_HEAD_INIT(work_list); struct list_head *head = &work_list; -@@ -464,7 +467,7 @@ repeat: +@@ -466,7 +469,7 @@ repeat: set_running_timer(base, timer); smp_wmb(); timer->base = NULL; @@ -1714,7 +1714,7 @@ { u32 preempt_count = preempt_count(); fn(data); -@@ -478,7 +481,7 @@ repeat: +@@ -480,7 +483,7 @@ repeat: } } set_running_timer(base, NULL); @@ -1723,7 +1723,7 @@ } #ifdef CONFIG_NO_IDLE_HZ -@@ -1075,6 +1078,12 @@ fastcall signed long __sched schedule_ti +@@ -1080,6 +1083,12 @@ fastcall signed long __sched schedule_ti struct timer_list timer; unsigned long expire; @@ -1736,7 +1736,7 @@ switch (timeout) { case MAX_SCHEDULE_TIMEOUT: -@@ -1277,7 +1286,7 @@ asmlinkage long sys_sysinfo(struct sysin +@@ -1282,7 +1291,7 @@ asmlinkage long sys_sysinfo(struct sysin return 0; } @@ -1745,7 +1745,7 @@ { int j; tvec_base_t *base; -@@ -1296,6 +1305,27 @@ static void __devinit init_timers_cpu(in +@@ -1301,6 +1310,27 @@ static void __devinit init_timers_cpu(in base->timer_jiffies = jiffies; } @@ -1773,7 +1773,7 @@ #ifdef CONFIG_HOTPLUG_CPU static int migrate_timer_list(tvec_base_t *new_base, struct list_head *head) { -@@ -1580,6 +1610,11 @@ void msleep(unsigned int msecs) +@@ -1585,6 +1615,11 @@ void msleep(unsigned int msecs) { unsigned long timeout = msecs_to_jiffies(msecs) + 1; @@ -1785,10 +1785,10 @@ while (timeout) { set_current_state(TASK_UNINTERRUPTIBLE); timeout = schedule_timeout(timeout); -diff --exclude=configs -uprN linux-2.6.10.netdump/kernel/workqueue.c linux-2.6.10/kernel/workqueue.c ---- linux-2.6.10.netdump/kernel/workqueue.c 2005-01-18 15:38:58.000000000 -0500 -+++ linux-2.6.10/kernel/workqueue.c 2005-01-18 17:08:17.000000000 -0500 -@@ -444,6 +444,37 @@ int current_is_keventd(void) +diff -urNp --exclude-from=/home/davej/.exclude linux-1502/kernel/workqueue.c linux-1503/kernel/workqueue.c +--- linux-1502/kernel/workqueue.c ++++ linux-1503/kernel/workqueue.c +@@ -468,6 +468,37 @@ int current_is_keventd(void) } @@ -1826,7 +1826,7 @@ #ifdef CONFIG_HOTPLUG_CPU /* Take the work from this (downed) CPU. */ static void take_over_work(struct workqueue_struct *wq, unsigned int cpu) -@@ -527,3 +558,6 @@ EXPORT_SYMBOL(schedule_work); +@@ -553,3 +584,6 @@ EXPORT_SYMBOL(schedule_work); EXPORT_SYMBOL(schedule_delayed_work); EXPORT_SYMBOL(schedule_delayed_work_on); EXPORT_SYMBOL(flush_scheduled_work); linux-2.6.10-netdump.patch: drivers/net/Kconfig | 7 drivers/net/Makefile | 1 drivers/net/netdump.c | 550 ++++++++++++++++++++++++++++++++++++++++++ drivers/net/netdump.h | 90 ++++++ include/asm-generic/netdump.h | 48 +++ include/asm-i386/netdump.h | 79 ++++++ include/asm-ia64/netdump.h | 82 ++++++ include/asm-ppc64/netdump.h | 79 ++++++ include/asm-s390/netdump.h | 6 include/asm-x86_64/netdump.h | 79 ++++++ include/linux/netdevice.h | 8 include/linux/netpoll.h | 4 net/core/netpoll.c | 21 + 13 files changed, 1043 insertions(+), 11 deletions(-) Index: linux-2.6.10-netdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-netdump.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.10-netdump.patch 1 Feb 2005 19:57:42 -0000 1.2 +++ linux-2.6.10-netdump.patch 22 Mar 2005 07:00:21 -0000 1.3 @@ -1,7 +1,7 @@ -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/drivers/net/Kconfig linux-2.6.10/drivers/net/Kconfig ---- linux-2.6.10.crashdumpcommon/drivers/net/Kconfig 2005-01-18 11:37:42.000000000 -0500 -+++ linux-2.6.10/drivers/net/Kconfig 2005-01-18 15:39:49.777824472 -0500 -@@ -2591,3 +2591,10 @@ config NETCONSOLE +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/drivers/net/Kconfig linux-1501/drivers/net/Kconfig +--- linux-1500/drivers/net/Kconfig ++++ linux-1501/drivers/net/Kconfig +@@ -2556,3 +2556,10 @@ config NETCONSOLE If you want to log kernel messages over the network, enable this. See for details. @@ -12,17 +12,17 @@ + Enable this option if you have a netdump server and you would like + to collect kernel crash dumps. + -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/drivers/net/Makefile linux-2.6.10/drivers/net/Makefile ---- linux-2.6.10.crashdumpcommon/drivers/net/Makefile 2005-01-18 11:37:27.000000000 -0500 -+++ linux-2.6.10/drivers/net/Makefile 2005-01-18 15:39:49.779824168 -0500 -@@ -197,3 +197,4 @@ obj-$(CONFIG_IRDA) += irda/ +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/drivers/net/Makefile linux-1501/drivers/net/Makefile +--- linux-1500/drivers/net/Makefile ++++ linux-1501/drivers/net/Makefile +@@ -195,3 +195,4 @@ obj-$(CONFIG_IRDA) += irda/ obj-$(CONFIG_ETRAX_ETHERNET) += cris/ obj-$(CONFIG_NETCONSOLE) += netconsole.o +obj-$(CONFIG_NETDUMP) += netdump.o -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/drivers/net/netdump.c linux-2.6.10/drivers/net/netdump.c ---- linux-2.6.10.crashdumpcommon/drivers/net/netdump.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/drivers/net/netdump.c 2005-01-18 15:39:49.792822192 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/drivers/net/netdump.c linux-1501/drivers/net/netdump.c +--- linux-1500/drivers/net/netdump.c ++++ linux-1501/drivers/net/netdump.c @@ -0,0 +1,550 @@ +/* + * linux/drivers/net/netdump.c @@ -574,9 +574,9 @@ + +module_init(init_netdump); +module_exit(cleanup_netdump); -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/drivers/net/netdump.h linux-2.6.10/drivers/net/netdump.h ---- linux-2.6.10.crashdumpcommon/drivers/net/netdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/drivers/net/netdump.h 2005-01-18 15:39:49.781823864 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/drivers/net/netdump.h linux-1501/drivers/net/netdump.h +--- linux-1500/drivers/net/netdump.h ++++ linux-1501/drivers/net/netdump.h @@ -0,0 +1,90 @@ +/* + * linux/drivers/net/netdump.h @@ -668,9 +668,9 @@ + unsigned long __ms=(n); \ + while (__ms--) udelay(1000); \ + }) -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-generic/netdump.h linux-2.6.10/include/asm-generic/netdump.h ---- linux-2.6.10.crashdumpcommon/include/asm-generic/netdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-generic/netdump.h 2005-01-18 15:39:49.782823712 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-generic/netdump.h linux-1501/include/asm-generic/netdump.h +--- linux-1500/include/asm-generic/netdump.h ++++ linux-1501/include/asm-generic/netdump.h @@ -0,0 +1,48 @@ +#ifndef _ASM_GENERIC_NETDUMP_H_ +#define _ASM_GENERIC_NETDUMP_H_ @@ -720,9 +720,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_GENERIC_NETDUMP_H */ -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-i386/netdump.h linux-2.6.10/include/asm-i386/netdump.h ---- linux-2.6.10.crashdumpcommon/include/asm-i386/netdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-i386/netdump.h 2005-01-18 15:39:49.783823560 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-i386/netdump.h linux-1501/include/asm-i386/netdump.h +--- linux-1500/include/asm-i386/netdump.h ++++ linux-1501/include/asm-i386/netdump.h @@ -0,0 +1,79 @@ +#ifndef _ASM_I386_NETDUMP_H_ +#define _ASM_I386_NETDUMP_H_ @@ -803,9 +803,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_I386_NETDUMP_H_ */ -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-ia64/netdump.h linux-2.6.10/include/asm-ia64/netdump.h ---- linux-2.6.10.crashdumpcommon/include/asm-ia64/netdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-ia64/netdump.h 2005-01-18 15:39:49.784823408 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-ia64/netdump.h linux-1501/include/asm-ia64/netdump.h +--- linux-1500/include/asm-ia64/netdump.h ++++ linux-1501/include/asm-ia64/netdump.h @@ -0,0 +1,82 @@ +#ifndef _ASM_IA64_NETDUMP_H_ +#define _ASM_IA64_NETDUMP_H_ @@ -889,9 +889,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_IA64_NETDUMP_H */ -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-ppc64/netdump.h linux-2.6.10/include/asm-ppc64/netdump.h ---- linux-2.6.10.crashdumpcommon/include/asm-ppc64/netdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-ppc64/netdump.h 2005-01-18 15:39:49.784823408 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-ppc64/netdump.h linux-1501/include/asm-ppc64/netdump.h +--- linux-1500/include/asm-ppc64/netdump.h ++++ linux-1501/include/asm-ppc64/netdump.h @@ -0,0 +1,79 @@ +#ifndef _ASM_PPC64_NETDUMP_H_ +#define _ASM_PPC64_NETDUMP_H_ @@ -972,9 +972,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_PPC64_NETDUMP_H_ */ -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-s390/netdump.h linux-2.6.10/include/asm-s390/netdump.h ---- linux-2.6.10.crashdumpcommon/include/asm-s390/netdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-s390/netdump.h 2005-01-18 15:39:49.785823256 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-s390/netdump.h linux-1501/include/asm-s390/netdump.h +--- linux-1500/include/asm-s390/netdump.h ++++ linux-1501/include/asm-s390/netdump.h @@ -0,0 +1,6 @@ +#ifndef _ASM_S390_NETDUMP_H_ +#define _ASM_S390_NETDUMP_H_ @@ -982,9 +982,9 @@ +#include + +#endif /* _ASM_S390_NETDUMP_H_ */ -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-x86_64/netdump.h linux-2.6.10/include/asm-x86_64/netdump.h ---- linux-2.6.10.crashdumpcommon/include/asm-x86_64/netdump.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.10/include/asm-x86_64/netdump.h 2005-01-18 15:39:49.783823560 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-x86_64/netdump.h linux-1501/include/asm-x86_64/netdump.h +--- linux-1500/include/asm-x86_64/netdump.h ++++ linux-1501/include/asm-x86_64/netdump.h @@ -0,0 +1,79 @@ +#ifndef _ASM_X86_64_NETDUMP_H_ +#define _ASM_X86_64_NETDUMP_H_ @@ -1065,10 +1065,10 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_X86_64_NETDUMP_H */ -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/linux/netdevice.h linux-2.6.10/include/linux/netdevice.h ---- linux-2.6.10.crashdumpcommon/include/linux/netdevice.h 2005-01-18 11:37:42.000000000 -0500 -+++ linux-2.6.10/include/linux/netdevice.h 2005-01-18 15:39:49.786823104 -0500 -@@ -609,20 +609,12 @@ static inline void netif_start_queue(str +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/linux/netdevice.h linux-1501/include/linux/netdevice.h +--- linux-1500/include/linux/netdevice.h ++++ linux-1501/include/linux/netdevice.h +@@ -605,20 +605,12 @@ static inline void netif_start_queue(str static inline void netif_wake_queue(struct net_device *dev) { @@ -1089,9 +1089,9 @@ set_bit(__LINK_STATE_XOFF, &dev->state); } -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/linux/netpoll.h linux-2.6.10/include/linux/netpoll.h ---- linux-2.6.10.crashdumpcommon/include/linux/netpoll.h 2005-01-18 11:37:42.000000000 -0500 -+++ linux-2.6.10/include/linux/netpoll.h 2005-01-18 15:39:49.788822800 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/linux/netpoll.h linux-1501/include/linux/netpoll.h +--- linux-1500/include/linux/netpoll.h ++++ linux-1501/include/linux/netpoll.h @@ -16,7 +16,8 @@ struct netpoll; struct netpoll { struct net_device *dev; @@ -1110,9 +1110,9 @@ #endif -diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/net/core/netpoll.c linux-2.6.10/net/core/netpoll.c ---- linux-2.6.10.crashdumpcommon/net/core/netpoll.c 2005-01-18 11:37:42.000000000 -0500 -+++ linux-2.6.10/net/core/netpoll.c 2005-01-18 15:39:49.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1500/net/core/netpoll.c linux-1501/net/core/netpoll.c +--- linux-1500/net/core/netpoll.c ++++ linux-1501/net/core/netpoll.c @@ -19,9 +19,11 @@ #include #include @@ -1125,7 +1125,7 @@ /* * We maintain a small pool of fully-sized skbs, to make sure the -@@ -78,7 +78,7 @@ static int checksum_udp(struct sk_buff * +@@ -76,7 +78,7 @@ static int checksum_udp(struct sk_buff * */ static void poll_napi(struct netpoll *np) { @@ -1134,7 +1134,7 @@ unsigned long flags; struct softnet_data *queue; -@@ -138,6 +140,7 @@ static void zap_completion_queue(void) +@@ -147,6 +149,7 @@ static void zap_completion_queue(void) } put_cpu_var(softnet_data); @@ -1142,7 +1142,7 @@ } static struct sk_buff * find_skb(struct netpoll *np, int len, int reserve) -@@ -252,7 +255,7 @@ void netpoll_send_udp(struct netpoll *np +@@ -261,7 +264,7 @@ void netpoll_send_udp(struct netpoll *np iph->check = 0; put_unaligned(htonl(np->local_ip), &(iph->saddr)); put_unaligned(htonl(np->remote_ip), &(iph->daddr)); @@ -1151,7 +1151,7 @@ eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); -@@ -368,6 +371,9 @@ int netpoll_rx(struct sk_buff *skb) +@@ -377,6 +380,9 @@ int netpoll_rx(struct sk_buff *skb) struct list_head *p; unsigned long flags; @@ -1161,7 +1161,7 @@ if (skb->dev->type != ARPHRD_ETHER) goto out; -@@ -636,6 +642,9 @@ int netpoll_setup(struct netpoll *np) +@@ -645,6 +651,9 @@ int netpoll_setup(struct netpoll *np) spin_unlock_irqrestore(&rx_list_lock, flags); } @@ -1171,7 +1171,7 @@ return 0; release: dev_put(ndev); -@@ -671,6 +680,13 @@ void netpoll_set_trap(int trap) +@@ -680,6 +689,13 @@ void netpoll_set_trap(int trap) atomic_dec(&trapped); } @@ -1185,7 +1185,7 @@ EXPORT_SYMBOL(netpoll_set_trap); EXPORT_SYMBOL(netpoll_trap); EXPORT_SYMBOL(netpoll_parse_options); -@@ -678,3 +694,4 @@ EXPORT_SYMBOL(netpoll_setup); +@@ -687,3 +703,4 @@ EXPORT_SYMBOL(netpoll_setup); EXPORT_SYMBOL(netpoll_cleanup); EXPORT_SYMBOL(netpoll_send_udp); EXPORT_SYMBOL(netpoll_poll); linux-2.6.10-periodic-slab-debug.patch: slab.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 105 insertions(+), 5 deletions(-) Index: linux-2.6.10-periodic-slab-debug.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-periodic-slab-debug.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.10-periodic-slab-debug.patch 23 Jan 2005 18:40:04 -0000 1.2 +++ linux-2.6.10-periodic-slab-debug.patch 22 Mar 2005 07:00:21 -0000 1.3 @@ -1,24 +1,6 @@ - -The redzone words are only checked during alloc and free - thus objects -that are never/rarely freed are not checked at all. - -The attached patch adds a periodic scan over all objects and checks for -wrong redzone data or corrupted bufctl lists. - -Most changes are under #ifdef DEBUG, the only exception is a trivial -correction for the initial timeout calculation: divide the cachep address -by L1_CACHE_BYTES before the mod - the low order bits are always 0. - -Signed-Off-By: Manfred Spraul - -// $Header$ -// Kernel Version: -// VERSION = 2 -// PATCHLEVEL = 6 -// SUBLEVEL = 11 -// EXTRAVERSION =-rc2 ---- 2.6/mm/slab.c 2005-01-23 14:42:01.000000000 +0100 -+++ build-2.6/mm/slab.c 2005-01-23 16:47:46.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-1000/mm/slab.c linux-1010/mm/slab.c +--- linux-1000/mm/slab.c ++++ linux-1010/mm/slab.c @@ -189,7 +189,7 @@ */ @@ -28,7 +10,7 @@ #define SLAB_LIMIT (((kmem_bufctl_t)(~0U))-2) /* Max number of objs-per-slab for caches which use off-slab slabs. -@@ -355,6 +355,7 @@ +@@ -355,6 +355,7 @@ struct kmem_cache_s { #if DEBUG int dbghead; int reallen; @@ -36,7 +18,7 @@ #endif }; -@@ -370,6 +371,7 @@ +@@ -370,6 +371,7 @@ struct kmem_cache_s { */ #define REAPTIMEOUT_CPUC (2*HZ) #define REAPTIMEOUT_LIST3 (4*HZ) @@ -44,7 +26,7 @@ #if STATS #define STATS_INC_ACTIVE(x) ((x)->num_active++) -@@ -1447,7 +1449,11 @@ +@@ -1446,7 +1448,11 @@ next: } cachep->lists.next_reap = jiffies + REAPTIMEOUT_LIST3 + @@ -57,7 +39,7 @@ /* Need the semaphore to access the chain. */ down(&cache_chain_sem); -@@ -2044,7 +2050,7 @@ +@@ -2043,7 +2049,7 @@ retry: slabp->inuse++; next = slab_bufctl(slabp)[slabp->free]; #if DEBUG @@ -66,7 +48,7 @@ #endif slabp->free = next; } -@@ -2182,7 +2188,7 @@ +@@ -2181,7 +2187,7 @@ static void free_block(kmem_cache_t *cac objnr = (objp - slabp->s_mem) / cachep->objsize; check_slabp(cachep, slabp); #if DEBUG @@ -75,7 +57,7 @@ printk(KERN_ERR "slab: double free detected in cache '%s', objp %p.\n", cachep->name, objp); BUG(); -@@ -2410,7 +2416,7 @@ +@@ -2409,7 +2415,7 @@ got_slabp: slabp->inuse++; next = slab_bufctl(slabp)[slabp->free]; #if DEBUG @@ -84,7 +66,7 @@ #endif slabp->free = next; check_slabp(cachep, slabp); -@@ -2616,6 +2622,94 @@ +@@ -2615,6 +2621,94 @@ unsigned int kmem_cache_size(kmem_cache_ EXPORT_SYMBOL(kmem_cache_size); @@ -179,7 +161,7 @@ struct ccupdate_struct { kmem_cache_t *cachep; struct array_cache *new[NR_CPUS]; -@@ -2799,6 +2893,12 @@ +@@ -2798,6 +2892,12 @@ static void cache_reap(void *unused) drain_array_locked(searchp, ac_data(searchp), 0); linux-2.6.10-ppc-headerabuse.patch: setup.h | 5 +++++ 1 files changed, 5 insertions(+) Index: linux-2.6.10-ppc-headerabuse.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-ppc-headerabuse.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.10-ppc-headerabuse.patch 8 Feb 2005 17:57:37 -0000 1.1 +++ linux-2.6.10-ppc-headerabuse.patch 22 Mar 2005 07:00:21 -0000 1.2 @@ -1,6 +1,6 @@ -===== include/asm-ppc/setup.h 1.4 vs edited ===== ---- 1.4/include/asm-ppc/setup.h Thu Jun 24 09:55:46 2004 -+++ edited/include/asm-ppc/setup.h Tue Feb 8 10:33:55 2005 +diff -urNp --exclude-from=/home/davej/.exclude linux-300/include/asm-ppc/setup.h linux-302/include/asm-ppc/setup.h +--- linux-300/include/asm-ppc/setup.h ++++ linux-302/include/asm-ppc/setup.h @@ -2,12 +2,17 @@ #ifndef _PPC_SETUP_H #define _PPC_SETUP_H linux-2.6.10-revert-module-invalidparam.patch: module.c | 2 -- 1 files changed, 2 deletions(-) Index: linux-2.6.10-revert-module-invalidparam.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-revert-module-invalidparam.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.10-revert-module-invalidparam.patch 6 Mar 2005 23:02:00 -0000 1.1 +++ linux-2.6.10-revert-module-invalidparam.patch 22 Mar 2005 07:00:21 -0000 1.2 @@ -1,6 +1,7 @@ ---- linux-2.6.10/kernel/module.c~ 2005-01-17 01:03:44.000000000 -0500 -+++ linux-2.6.10/kernel/module.c 2005-01-17 01:03:53.000000000 -0500 -@@ -1721,8 +1721,6 @@ static struct module *load_module(void _ +diff -urNp --exclude-from=/home/davej/.exclude linux-1503/kernel/module.c linux-1700/kernel/module.c +--- linux-1503/kernel/module.c ++++ linux-1700/kernel/module.c +@@ -1707,8 +1707,6 @@ static struct module *load_module(void _ / sizeof(struct kernel_param), NULL); } linux-2.6.10-usb-use_both_schemes.patch: hub.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.10-usb-use_both_schemes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-usb-use_both_schemes.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.10-usb-use_both_schemes.patch 18 Mar 2005 21:54:20 -0000 1.3 +++ linux-2.6.10-usb-use_both_schemes.patch 22 Mar 2005 07:00:21 -0000 1.4 @@ -1,5 +1,6 @@ ---- linux-2.6.11/drivers/usb/core/hub.c~ 2005-03-16 01:21:11.000000000 -0500 -+++ linux-2.6.11/drivers/usb/core/hub.c 2005-03-16 01:21:16.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1301/drivers/usb/core/hub.c linux-1400/drivers/usb/core/hub.c +--- linux-1301/drivers/usb/core/hub.c ++++ linux-1400/drivers/usb/core/hub.c @@ -69,7 +69,7 @@ MODULE_PARM_DESC (blinkenlights, "true t * otherwise the new scheme is used. If that fails and "use_both_schemes" * is set, then the driver will make another attempt, using the other scheme. linux-2.6.10-x86-tune-p4.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.10-x86-tune-p4.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.10-x86-tune-p4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.10-x86-tune-p4.patch 25 Dec 2004 05:22:15 -0000 1.1 +++ linux-2.6.10-x86-tune-p4.patch 22 Mar 2005 07:00:21 -0000 1.2 @@ -1,6 +1,7 @@ ---- linux-2.6.10/arch/i386/Makefile~ 2004-12-25 00:20:36.930426112 -0500 -+++ linux-2.6.10/arch/i386/Makefile 2004-12-25 00:20:45.046192328 -0500 -@@ -31,7 +31,7 @@ cflags-$(CONFIG_M486) += -march=i486 +diff -urNp --exclude-from=/home/davej/.exclude linux-1/arch/i386/Makefile linux-212/arch/i386/Makefile +--- linux-2.6.10/arch/i386/Makefile ++++ linux-2.6.10/arch/i386/Makefile +@@ -33,7 +33,7 @@ cflags-$(CONFIG_M486) += -march=i486 cflags-$(CONFIG_M586) += -march=i586 cflags-$(CONFIG_M586TSC) += -march=i586 cflags-$(CONFIG_M586MMX) += $(call cc-option,-march=pentium-mmx,-march=i586) linux-2.6.11-compile-fixes.patch: include/linux/init.h | 4 ---- init/Makefile | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) Index: linux-2.6.11-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-compile-fixes.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6.11-compile-fixes.patch 18 Mar 2005 21:54:20 -0000 1.8 +++ linux-2.6.11-compile-fixes.patch 22 Mar 2005 07:00:21 -0000 1.9 @@ -1,19 +1,6 @@ ---- linux-2.6.10/init/Makefile~ 2005-03-02 09:15:30.000000000 +0000 -+++ linux-2.6.10/init/Makefile 2005-03-02 09:16:17.000000000 +0000 -@@ -2,6 +2,11 @@ - # Makefile for the linux kernel. - # - -+# Work around GCC bug (http://bugzilla.redhat.com/150020) -+ifeq ($(ARCH),ppc) -+CFLAGS_initramfs.o := -O2 -+endif -+ - obj-y := main.o version.o mounts.o initramfs.o - obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o - ---- linux-2.6.11/include/linux/init.h~ 2005-03-03 19:53:01.000000000 -0500 -+++ linux-2.6.11/include/linux/init.h 2005-03-03 19:53:27.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-10001/include/linux/init.h linux-10002/include/linux/init.h +--- linux-10001/include/linux/init.h ++++ linux-10002/include/linux/init.h @@ -46,11 +46,7 @@ #define __exitdata __attribute__ ((__section__(".exit.data"))) #define __exit_call __attribute_used__ __attribute__ ((__section__ (".exitcall.exit"))) @@ -26,3 +13,18 @@ /* For assembly routines */ #define __INIT .section ".init.text","ax" +diff -urNp --exclude-from=/home/davej/.exclude linux-10001/init/Makefile linux-10002/init/Makefile +--- linux-10001/init/Makefile ++++ linux-10002/init/Makefile +@@ -2,6 +2,11 @@ + # Makefile for the linux kernel. + # + ++# Work around GCC bug (http://bugzilla.redhat.com/150020) ++ifeq ($(ARCH),ppc) ++CFLAGS_initramfs.o := -O2 ++endif ++ + obj-y := main.o version.o mounts.o initramfs.o + obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o + linux-2.6.11-devmem.patch: arch/i386/mm/init.c | 19 +++++ arch/ia64/mm/init.c | 7 ++ arch/ppc/mm/init.c | 5 + arch/ppc64/mm/init.c | 12 +++ arch/s390/mm/init.c | 5 + arch/x86_64/mm/init.c | 20 +++++ drivers/char/mem.c | 146 ++++++------------------------------------- fs/proc/kcore.c | 2 include/asm-alpha/page.h | 1 include/asm-arm/page.h | 2 include/asm-arm26/page.h | 2 include/asm-cris/page.h | 2 include/asm-h8300/page.h | 2 include/asm-i386/page.h | 4 + include/asm-ia64/page.h | 2 include/asm-m68k/page.h | 2 include/asm-m68knommu/page.h | 2 include/asm-mips/page.h | 2 include/asm-parisc/page.h | 2 include/asm-ppc/page.h | 2 include/asm-ppc64/page.h | 2 include/asm-s390/page.h | 2 include/asm-sh/page.h | 2 include/asm-sh64/page.h | 2 include/asm-sparc/page.h | 2 include/asm-sparc64/page.h | 2 include/asm-um/page.h | 1 include/asm-v850/page.h | 2 include/asm-x86_64/page.h | 4 + 29 files changed, 135 insertions(+), 125 deletions(-) Index: linux-2.6.11-devmem.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-devmem.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.11-devmem.patch 18 Mar 2005 21:55:21 -0000 1.1 +++ linux-2.6.11-devmem.patch 22 Mar 2005 07:00:21 -0000 1.2 @@ -1,6 +1,7 @@ ---- linux-2.6.9/arch/i386/mm/init.c~ 2004-12-09 00:30:22.439979032 -0500 -+++ linux-2.6.9/arch/i386/mm/init.c 2004-12-09 00:31:40.906050376 -0500 -@@ -225,6 +225,25 @@ static inline int page_is_ram(unsigned l +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/i386/mm/init.c linux-1050/arch/i386/mm/init.c +--- linux-1020/arch/i386/mm/init.c ++++ linux-1050/arch/i386/mm/init.c +@@ -229,6 +229,25 @@ static inline int page_is_ram(unsigned l return 0; } @@ -26,13 +27,79 @@ #ifdef CONFIG_HIGHMEM pte_t *kmap_pte; pgprot_t kmap_prot; -diff -purN linux-2.6.7/arch/x86_64/mm/init.c linux/arch/x86_64/mm/init.c ---- linux-2.6.7/arch/x86_64/mm/init.c 2004-07-30 11:41:27.000000000 +0200 -+++ linux/arch/x86_64/mm/init.c 2004-07-30 11:54:25.299432577 +0200 -@@ -396,6 +396,26 @@ static inline int page_is_ram (unsigned - return 0; +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/ia64/mm/init.c linux-1050/arch/ia64/mm/init.c +--- linux-1020/arch/ia64/mm/init.c ++++ linux-1050/arch/ia64/mm/init.c +@@ -230,6 +230,13 @@ free_initrd_mem (unsigned long start, un + } } ++int page_is_ram(unsigned long pagenr) ++{ ++ //FIXME: implement w/efi walk ++ printk("page is ram is called!!!!!\n"); ++ return 1; ++} ++ + /* + * This installs a clean page in the kernel's page table. + */ +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/ppc/mm/init.c linux-1050/arch/ppc/mm/init.c +--- linux-1020/arch/ppc/mm/init.c ++++ linux-1050/arch/ppc/mm/init.c +@@ -641,3 +641,8 @@ void update_mmu_cache(struct vm_area_str + } + #endif + } ++ ++int page_is_ram (unsigned long pagenr) ++{ ++ return 1; ++} +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/ppc64/mm/init.c linux-1050/arch/ppc64/mm/init.c +--- linux-1020/arch/ppc64/mm/init.c ++++ linux-1050/arch/ppc64/mm/init.c +@@ -722,6 +722,18 @@ void __init mem_init(void) + totalram_pages += free_all_bootmem(); + #endif + ++#ifdef CONFIG_PPC_PSERIES ++ /* Mark the RTAS pages as PG_reserved so userspace can mmap them */ ++ if (rtas_rmo_buf) { ++ unsigned long pfn, start_pfn, end_pfn; ++ ++ start_pfn = rtas_rmo_buf >> PAGE_SHIFT; ++ end_pfn = (rtas_rmo_buf + RTAS_RMOBUF_MAX) >> PAGE_SHIFT; ++ for (pfn = start_pfn; pfn < end_pfn; pfn++) ++ SetPageReserved(pfn_to_page(pfn)); ++ } ++#endif ++ + for_each_pgdat(pgdat) { + for (i = 0; i < pgdat->node_spanned_pages; i++) { + page = pgdat->node_mem_map + i; +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/s390/mm/init.c linux-1050/arch/s390/mm/init.c +--- linux-1020/arch/s390/mm/init.c ++++ linux-1050/arch/s390/mm/init.c +@@ -253,6 +253,11 @@ void __init paging_init(void) + } + #endif /* CONFIG_ARCH_S390X */ + ++int page_is_ram (unsigned long pagenr) ++{ ++ return pagenr < max_mapnr; ++} ++ + void __init mem_init(void) + { + unsigned long codesize, reservedpages, datasize, initsize; +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/x86_64/mm/init.c linux-1050/arch/x86_64/mm/init.c +--- linux-1020/arch/x86_64/mm/init.c ++++ linux-1050/arch/x86_64/mm/init.c +@@ -397,6 +397,26 @@ static inline int page_is_ram (unsigned + + extern int swiotlb_force; + +/* + * devmem_is_allowed() checks to see if /dev/mem access to a certain address is + * valid. The argument is a physical page number. @@ -56,10 +123,10 @@ static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, kcore_vsyscall; -diff -purN linux-2.6.7/drivers/char/mem.c linux/drivers/char/mem.c ---- linux-2.6.7/drivers/char/mem.c 2004-07-30 11:42:13.000000000 +0200 -+++ linux/drivers/char/mem.c 2004-07-30 11:54:25.316430579 +0200 -@@ -111,6 +111,19 @@ static inline int valid_phys_addr_range( +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/drivers/char/mem.c linux-1050/drivers/char/mem.c +--- linux-1020/drivers/char/mem.c ++++ linux-1050/drivers/char/mem.c +@@ -111,6 +111,22 @@ static inline int valid_phys_addr_range( } #endif @@ -69,8 +136,11 @@ + + cursor = from >> PAGE_SHIFT; + while ((cursor << PAGE_SHIFT) < to) { -+ if (!devmem_is_allowed(cursor)) ++ if (!devmem_is_allowed(cursor)) { ++ printk ("Program %s tried to read /dev/mem between %lx->%lx." ++ "We stopped at %lx\n", current->comm, from, to, cursor); + return 0; ++ } + cursor++; + } + return 1; @@ -79,7 +149,7 @@ /* * This funcion reads the *physical* memory. The f_pos points directly to the * memory location. -@@ -173,6 +173,8 @@ static ssize_t read_mem(struct file * fi +@@ -160,6 +176,8 @@ static ssize_t read_mem(struct file * fi */ ptr = xlate_dev_mem_ptr(p); @@ -88,7 +158,7 @@ if (copy_to_user(buf, ptr, sz)) return -EFAULT; buf += sz; -@@ -230,6 +232,8 @@ static ssize_t write_mem(struct file * f +@@ -217,6 +235,8 @@ static ssize_t write_mem(struct file * f */ ptr = xlate_dev_mem_ptr(p); @@ -97,7 +167,16 @@ copied = copy_from_user(ptr, buf, sz); if (copied) { ssize_t ret; -@@ -358,128 +362,6 @@ static ssize_t read_kmem(struct file *fi +@@ -270,6 +290,8 @@ static ssize_t read_kmem(struct file *fi + ssize_t read, virtr, sz; + char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ + ++ return -EPERM; ++ + read = 0; + virtr = 0; + if (p < (unsigned long) high_memory) { +@@ -345,128 +367,6 @@ static ssize_t read_kmem(struct file *fi } @@ -226,7 +305,7 @@ #if defined(CONFIG_ISA) || !defined(__mc68000__) static ssize_t read_port(struct file * file, char __user * buf, size_t count, loff_t *ppos) -@@ -594,7 +559,6 @@ static struct file_operations mem_fops = +@@ -717,7 +617,6 @@ static struct file_operations mem_fops = static struct file_operations kmem_fops = { .llseek = memory_lseek, .read = read_kmem, @@ -234,10 +313,30 @@ .mmap = mmap_kmem, .open = open_kmem, }; -diff -purN linux-2.6.7/include/asm-alpha/page.h linux/include/asm-alpha/page.h ---- linux-2.6.7/include/asm-alpha/page.h 2004-06-16 07:19:44.000000000 +0200 -+++ linux/include/asm-alpha/page.h 2004-07-30 11:54:25.334428463 +0200 -@@ -106,6 +106,7 @@ extern __inline__ int get_order(unsigned +@@ -823,7 +722,6 @@ static const struct { + struct file_operations *fops; + } devlist[] = { /* list of minor devices */ + {1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops}, +- {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, + {3, "null", S_IRUGO | S_IWUGO, &null_fops}, + #if defined(CONFIG_ISA) || !defined(__mc68000__) + {4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops}, +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/fs/proc/kcore.c linux-1050/fs/proc/kcore.c +--- linux-1020/fs/proc/kcore.c ++++ linux-1050/fs/proc/kcore.c +@@ -25,7 +25,7 @@ + + static int open_kcore(struct inode * inode, struct file * filp) + { +- return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; ++ return -EPERM; + } + + static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *); +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-alpha/page.h linux-1050/include/asm-alpha/page.h +--- linux-1020/include/asm-alpha/page.h ++++ linux-1050/include/asm-alpha/page.h +@@ -110,6 +110,7 @@ extern __inline__ int get_order(unsigned #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -245,10 +344,10 @@ #endif /* __KERNEL__ */ #endif /* _ALPHA_PAGE_H */ -diff -purN linux-2.6.7/include/asm-arm/page.h linux/include/asm-arm/page.h ---- linux-2.6.7/include/asm-arm/page.h 2004-06-16 07:19:01.000000000 +0200 -+++ linux/include/asm-arm/page.h 2004-07-30 11:54:25.351426465 +0200 -@@ -196,6 +196,8 @@ static inline int get_order(unsigned lon +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-arm/page.h linux-1050/include/asm-arm/page.h +--- linux-1020/include/asm-arm/page.h ++++ linux-1050/include/asm-arm/page.h +@@ -192,6 +192,8 @@ static inline int get_order(unsigned lon #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -257,9 +356,9 @@ #endif /* __KERNEL__ */ #endif -diff -purN linux-2.6.7/include/asm-arm26/page.h linux/include/asm-arm26/page.h ---- linux-2.6.7/include/asm-arm26/page.h 2004-06-16 07:19:42.000000000 +0200 -+++ linux/include/asm-arm26/page.h 2004-07-30 11:54:25.372423996 +0200 +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-arm26/page.h linux-1050/include/asm-arm26/page.h +--- linux-1020/include/asm-arm26/page.h ++++ linux-1050/include/asm-arm26/page.h @@ -110,6 +110,8 @@ static inline int get_order(unsigned lon #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -269,10 +368,10 @@ #endif /* __KERNEL__ */ #endif -diff -purN linux-2.6.7/include/asm-cris/page.h linux/include/asm-cris/page.h ---- linux-2.6.7/include/asm-cris/page.h 2004-06-16 07:19:09.000000000 +0200 -+++ linux/include/asm-cris/page.h 2004-07-30 11:54:25.385422468 +0200 -@@ -96,6 +96,8 @@ static inline int get_order(unsigned lon +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-cris/page.h linux-1050/include/asm-cris/page.h +--- linux-1020/include/asm-cris/page.h ++++ linux-1050/include/asm-cris/page.h +@@ -99,6 +99,8 @@ static inline int get_order(unsigned lon #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -281,10 +380,10 @@ #endif /* __KERNEL__ */ #endif /* _CRIS_PAGE_H */ -diff -purN linux-2.6.7/include/asm-h8300/page.h linux/include/asm-h8300/page.h ---- linux-2.6.7/include/asm-h8300/page.h 2004-06-16 07:19:52.000000000 +0200 -+++ linux/include/asm-h8300/page.h 2004-07-30 11:54:25.398420940 +0200 -@@ -96,6 +96,8 @@ extern unsigned long memory_end; +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-h8300/page.h linux-1050/include/asm-h8300/page.h +--- linux-1020/include/asm-h8300/page.h ++++ linux-1050/include/asm-h8300/page.h +@@ -99,6 +99,8 @@ extern unsigned long memory_end; #endif /* __ASSEMBLY__ */ @@ -293,19 +392,19 @@ #endif /* __KERNEL__ */ #endif /* _H8300_PAGE_H */ -diff -purN linux-2.6.7/include/asm-i386/page.h linux/include/asm-i386/page.h ---- linux-2.6.7/include/asm-i386/page.h 2004-07-30 11:42:33.000000000 +0200 -+++ linux/include/asm-i386/page.h 2004-07-30 11:54:25.649391435 +0200 -@@ -128,6 +128,8 @@ static __inline__ int get_order(unsigned - return order; - } +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-i386/page.h linux-1050/include/asm-i386/page.h +--- linux-1020/include/asm-i386/page.h ++++ linux-1050/include/asm-i386/page.h +@@ -119,6 +119,8 @@ static __inline__ int get_order(unsigned + + extern int sysctl_legacy_va_layout; +extern int devmem_is_allowed(unsigned long pagenr); + #endif /* __ASSEMBLY__ */ - #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) -@@ -151,6 +153,8 @@ static __inline__ int get_order(unsigned + #ifdef __ASSEMBLY__ +@@ -148,6 +150,8 @@ extern int sysctl_legacy_va_layout; ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -314,19 +413,19 @@ #endif /* __KERNEL__ */ #endif /* _I386_PAGE_H */ -diff -purN linux-2.6.7/include/asm-ia64/page.h linux/include/asm-ia64/page.h ---- linux-2.6.7/include/asm-ia64/page.h 2004-07-30 11:42:32.000000000 +0200 -+++ linux/include/asm-ia64/page.h 2004-07-30 11:54:25.427417531 +0200 -@@ -187,4 +187,6 @@ get_order (unsigned long size) +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-ia64/page.h linux-1050/include/asm-ia64/page.h +--- linux-1020/include/asm-ia64/page.h ++++ linux-1050/include/asm-ia64/page.h +@@ -204,4 +204,6 @@ get_order (unsigned long size) (((current->personality & READ_IMPLIES_EXEC) != 0) \ ? VM_EXEC : 0)) +#define devmem_is_allowed(x) 1 + #endif /* _ASM_IA64_PAGE_H */ -diff -purN linux-2.6.7/include/asm-m68k/page.h linux/include/asm-m68k/page.h ---- linux-2.6.7/include/asm-m68k/page.h 2004-07-30 11:42:15.000000000 +0200 -+++ linux/include/asm-m68k/page.h 2004-07-30 11:54:25.450414827 +0200 +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-m68k/page.h linux-1050/include/asm-m68k/page.h +--- linux-1020/include/asm-m68k/page.h ++++ linux-1050/include/asm-m68k/page.h @@ -190,6 +190,8 @@ static inline void *__va(unsigned long x #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -336,9 +435,9 @@ #endif /* __KERNEL__ */ #endif /* _M68K_PAGE_H */ -diff -purN linux-2.6.7/include/asm-m68knommu/page.h linux/include/asm-m68knommu/page.h ---- linux-2.6.7/include/asm-m68knommu/page.h 2004-06-16 07:19:22.000000000 +0200 -+++ linux/include/asm-m68knommu/page.h 2004-07-30 11:54:25.463413299 +0200 +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-m68knommu/page.h linux-1050/include/asm-m68knommu/page.h +--- linux-1020/include/asm-m68knommu/page.h ++++ linux-1050/include/asm-m68knommu/page.h @@ -96,6 +96,8 @@ extern unsigned long memory_end; #endif /* __ASSEMBLY__ */ @@ -348,19 +447,19 @@ #endif /* __KERNEL__ */ #endif /* _M68KNOMMU_PAGE_H */ -diff -purN linux-2.6.7/include/asm-mips/page.h linux/include/asm-mips/page.h ---- linux-2.6.7/include/asm-mips/page.h 2004-07-30 11:42:15.000000000 +0200 -+++ linux/include/asm-mips/page.h 2004-07-30 11:54:25.486410595 +0200 -@@ -137,4 +137,6 @@ static __inline__ int get_order(unsigned +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-mips/page.h linux-1050/include/asm-mips/page.h +--- linux-1020/include/asm-mips/page.h ++++ linux-1050/include/asm-mips/page.h +@@ -148,4 +148,6 @@ static __inline__ int get_order(unsigned #define WANT_PAGE_VIRTUAL #endif +#define devmem_is_allowed(x) 1 + #endif /* _ASM_PAGE_H */ -diff -purN linux-2.6.7/include/asm-parisc/page.h linux/include/asm-parisc/page.h ---- linux-2.6.7/include/asm-parisc/page.h 2004-06-16 07:19:01.000000000 +0200 -+++ linux/include/asm-parisc/page.h 2004-07-30 11:54:25.500408950 +0200 +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-parisc/page.h linux-1050/include/asm-parisc/page.h +--- linux-1020/include/asm-parisc/page.h ++++ linux-1050/include/asm-parisc/page.h @@ -157,6 +157,8 @@ extern int npmem_ranges; #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -370,9 +469,9 @@ #endif /* __KERNEL__ */ #endif /* _PARISC_PAGE_H */ -diff -purN linux-2.6.7/include/asm-ppc/page.h linux/include/asm-ppc/page.h ---- linux-2.6.7/include/asm-ppc/page.h 2004-06-16 07:19:02.000000000 +0200 -+++ linux/include/asm-ppc/page.h 2004-07-30 11:54:25.515407187 +0200 +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-ppc/page.h linux-1050/include/asm-ppc/page.h +--- linux-1020/include/asm-ppc/page.h ++++ linux-1050/include/asm-ppc/page.h @@ -163,5 +163,7 @@ extern __inline__ int get_order(unsigned #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -381,21 +480,21 @@ + #endif /* __KERNEL__ */ #endif /* _PPC_PAGE_H */ -diff -purN linux-2.6.7/include/asm-ppc64/page.h linux/include/asm-ppc64/page.h ---- linux-2.6.7/include/asm-ppc64/page.h 2004-06-16 07:18:47.000000000 +0200 -+++ linux/include/asm-ppc64/page.h 2004-07-30 11:54:25.530405423 +0200 -@@ -245,5 +245,7 @@ extern int page_is_ram(unsigned long phy - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-ppc64/page.h linux-1050/include/asm-ppc64/page.h +--- linux-1020/include/asm-ppc64/page.h ++++ linux-1050/include/asm-ppc64/page.h +@@ -257,5 +257,7 @@ extern u64 ppc64_pft_size; /* Log 2 of + #define VM_STACK_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _PPC64_PAGE_H */ -diff -purN linux-2.6.7/include/asm-s390/page.h linux/include/asm-s390/page.h ---- linux-2.6.7/include/asm-s390/page.h 2004-06-16 07:18:59.000000000 +0200 -+++ linux/include/asm-s390/page.h 2004-07-30 11:54:25.543403895 +0200 -@@ -181,6 +181,8 @@ typedef struct { unsigned long pgd; } pg +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-s390/page.h linux-1050/include/asm-s390/page.h +--- linux-1020/include/asm-s390/page.h ++++ linux-1050/include/asm-s390/page.h +@@ -203,6 +203,8 @@ page_get_storage_key(unsigned long addr) #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -404,10 +503,10 @@ #endif /* __KERNEL__ */ #endif /* _S390_PAGE_H */ -diff -purN linux-2.6.7/include/asm-sh/page.h linux/include/asm-sh/page.h ---- linux-2.6.7/include/asm-sh/page.h 2004-06-16 07:20:03.000000000 +0200 -+++ linux/include/asm-sh/page.h 2004-07-30 11:54:25.559402014 +0200 -@@ -133,6 +133,8 @@ static __inline__ int get_order(unsigned +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-sh/page.h linux-1050/include/asm-sh/page.h +--- linux-1020/include/asm-sh/page.h ++++ linux-1050/include/asm-sh/page.h +@@ -139,6 +139,8 @@ static __inline__ int get_order(unsigned #endif @@ -416,9 +515,9 @@ #endif /* __KERNEL__ */ #endif /* __ASM_SH_PAGE_H */ -diff -purN linux-2.6.7/include/asm-sh64/page.h linux/include/asm-sh64/page.h ---- linux-2.6.7/include/asm-sh64/page.h 2004-07-30 11:42:15.000000000 +0200 -+++ linux/include/asm-sh64/page.h 2004-07-30 11:54:25.579399663 +0200 +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-sh64/page.h linux-1050/include/asm-sh64/page.h +--- linux-1020/include/asm-sh64/page.h ++++ linux-1050/include/asm-sh64/page.h @@ -132,6 +132,8 @@ extern __inline__ int get_order(unsigned #endif @@ -428,9 +527,9 @@ #endif /* __KERNEL__ */ #endif /* __ASM_SH64_PAGE_H */ -diff -purN linux-2.6.7/include/asm-sparc/page.h linux/include/asm-sparc/page.h ---- linux-2.6.7/include/asm-sparc/page.h 2004-06-16 07:19:02.000000000 +0200 -+++ linux/include/asm-sparc/page.h 2004-07-30 11:54:25.591398253 +0200 +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-sparc/page.h linux-1050/include/asm-sparc/page.h +--- linux-1020/include/asm-sparc/page.h ++++ linux-1050/include/asm-sparc/page.h @@ -176,6 +176,8 @@ extern unsigned long pfn_base; #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -440,10 +539,10 @@ #endif /* __KERNEL__ */ #endif /* _SPARC_PAGE_H */ -diff -purN linux-2.6.7/include/asm-sparc64/page.h linux/include/asm-sparc64/page.h ---- linux-2.6.7/include/asm-sparc64/page.h 2004-07-30 11:42:15.000000000 +0200 -+++ linux/include/asm-sparc64/page.h 2004-07-30 11:54:25.603396842 +0200 -@@ -165,6 +165,8 @@ static __inline__ int get_order(unsigned +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-sparc64/page.h linux-1050/include/asm-sparc64/page.h +--- linux-1020/include/asm-sparc64/page.h ++++ linux-1050/include/asm-sparc64/page.h +@@ -156,6 +156,8 @@ static __inline__ int get_order(unsigned #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -452,19 +551,20 @@ #endif /* !(__KERNEL__) */ #endif /* !(_SPARC64_PAGE_H) */ -diff -purN linux-2.6.7/include/asm-um/page.h linux/include/asm-um/page.h ---- linux-2.6.7/include/asm-um/page.h 2004-06-16 07:19:36.000000000 +0200 -+++ linux/include/asm-um/page.h 2004-07-30 11:54:25.620394844 +0200 -@@ -44,5 +44,6 @@ extern struct page *page_mem_map(struct +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-um/page.h linux-1050/include/asm-um/page.h +--- linux-1020/include/asm-um/page.h ++++ linux-1050/include/asm-um/page.h +@@ -123,6 +123,7 @@ static __inline__ int get_order(unsigned extern struct page *arch_validate(struct page *page, int mask, int order); #define HAVE_ARCH_VALIDATE +#define devmem_is_allowed(x) 1 - #endif -diff -purN linux-2.6.7/include/asm-v850/page.h linux/include/asm-v850/page.h ---- linux-2.6.7/include/asm-v850/page.h 2004-06-16 07:19:36.000000000 +0200 -+++ linux/include/asm-v850/page.h 2004-07-30 11:54:25.630393668 +0200 + extern void arch_free_page(struct page *page, int order); + #define HAVE_ARCH_FREE_PAGE +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-v850/page.h linux-1050/include/asm-v850/page.h +--- linux-1020/include/asm-v850/page.h ++++ linux-1050/include/asm-v850/page.h @@ -141,6 +141,8 @@ extern __inline__ int get_order (unsigne #define __va(x) ((void *)__phys_to_virt ((unsigned long)(x))) @@ -474,10 +574,10 @@ #endif /* KERNEL */ #endif /* __V850_PAGE_H__ */ -diff -purN linux-2.6.7/include/asm-x86_64/page.h linux/include/asm-x86_64/page.h ---- linux-2.6.10/include/asm-x86_64/page.h~ 2005-01-06 22:47:53.000000000 -0500 -+++ linux-2.6.10/include/asm-x86_64/page.h 2005-01-06 22:48:27.000000000 -0500 -@@ -138,6 +137,10 @@ extern int devmem_is_allowed(unsigned lo +diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-x86_64/page.h linux-1050/include/asm-x86_64/page.h +--- linux-1020/include/asm-x86_64/page.h ++++ linux-1050/include/asm-x86_64/page.h +@@ -138,6 +138,10 @@ extern __inline__ int get_order(unsigned #define __HAVE_ARCH_GATE_AREA 1 @@ -488,121 +588,3 @@ #endif /* __KERNEL__ */ #endif /* _X86_64_PAGE_H */ - -librtas accesses these pages through /dev/mem, so mark -them reserved and it gets permitted. - -diff -urN linux-2.5/arch/ppc64/mm/init.c ppc64-2.5-pseries/arch/ppc64/mm/init.c ---- linux-2.5/arch/ppc64/mm/init.c 2004-09-24 15:23:06.000000000 +1000 -+++ ppc64-2.5-pseries/arch/ppc64/mm/init.c 2004-10-12 15:41:27.000000000 +1000 -@@ -719,6 +719,18 @@ - totalram_pages += free_all_bootmem(); - #endif - -+#ifdef CONFIG_PPC_PSERIES -+ /* Mark the RTAS pages as PG_reserved so userspace can mmap them */ -+ if (rtas_rmo_buf) { -+ unsigned long pfn, start_pfn, end_pfn; -+ -+ start_pfn = rtas_rmo_buf >> PAGE_SHIFT; -+ end_pfn = (rtas_rmo_buf + RTAS_RMOBUF_MAX) >> PAGE_SHIFT; -+ for (pfn = start_pfn; pfn < end_pfn; pfn++) -+ SetPageReserved(pfn_to_page(pfn)); -+ } -+#endif -+ - for_each_pgdat(pgdat) { - for (i = 0; i < pgdat->node_spanned_pages; i++) { - page = pgdat->node_mem_map + i; - - -diff -urNp linux-1030/arch/s390/mm/init.c linux-1050/arch/s390/mm/init.c ---- linux-1030/arch/s390/mm/init.c -+++ linux-1050/arch/s390/mm/init.c -@@ -236,6 +236,11 @@ void __init paging_init(void) - } - #endif /* CONFIG_ARCH_S390X */ - -+int page_is_ram (unsigned long pagenr) -+{ -+ return pagenr < max_mapnr; -+} -+ - void __init mem_init(void) - { - unsigned long codesize, reservedpages, datasize, initsize; ---- linux-2.6.11/drivers/char/mem.c~ 2005-03-18 14:25:26.000000000 -0500 -+++ linux-2.6.11/drivers/char/mem.c 2005-03-18 14:25:45.000000000 -0500 -@@ -287,6 +287,8 @@ static ssize_t read_kmem(struct file *fi - ssize_t read, virtr, sz; - char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ - -+ return -EPERM; -+ - read = 0; - virtr = 0; - if (p < (unsigned long) high_memory) { -diff -urNp linux-1030/fs/proc/kcore.c linux-1050/fs/proc/kcore.c ---- linux-1030/fs/proc/kcore.c -+++ linux-1050/fs/proc/kcore.c -@@ -24,7 +24,7 @@ - - static int open_kcore(struct inode * inode, struct file * filp) - { -- return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; -+ return -EPERM; - } - - static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *); ---- linux-2.6.3/arch/ppc/mm/init.c~ 2004-03-09 13:41:17.699613784 +0100 -+++ linux-2.6.3/arch/ppc/mm/init.c 2004-03-09 13:41:17.699613784 +0100 -@@ -632,3 +632,8 @@ - } - #endif - } -+ -+int page_is_ram (unsigned long pagenr) -+{ -+ return 1; -+} ---- linux-2.6.3/arch/ia64/mm/init.c.bak Mon Mar 8 11:06:25 2004 -+++ linux-2.6.3/arch/ia64/mm/init.c Mon Mar 8 11:06:59 2004 -@@ -218,6 +218,13 @@ free_initrd_mem (unsigned long start, un - } - } - -+int page_is_ram(unsigned long pagenr) -+{ -+ //FIXME: implement w/efi walk -+ printk("page is ram is called!!!!!\n"); -+ return 1; -+} -+ - /* - * This is like put_dirty_page() but installs a clean page in the kernel's page table. - */ ---- linux-2.6.8/drivers/char/mem.c~ 2004-09-07 10:13:44.106301796 +0200 -+++ linux-2.6.8/drivers/char/mem.c 2004-09-07 10:13:44.106301796 +0200 -@@ -658,7 +658,6 @@ - struct file_operations *fops; - } devlist[] = { /* list of minor devices */ - {1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops}, -- {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, - {3, "null", S_IRUGO | S_IWUGO, &null_fops}, - #if defined(CONFIG_ISA) || !defined(__mc68000__) - {4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops}, ---- linux-2.6.11/drivers/char/mem.c~ 2005-03-04 01:00:47.000000000 -0500 -+++ linux-2.6.11/drivers/char/mem.c 2005-03-04 01:02:54.000000000 -0500 -@@ -117,8 +117,11 @@ static inline int range_is_allowed(unsig - - cursor = from >> PAGE_SHIFT; - while ((cursor << PAGE_SHIFT) < to) { -- if (!devmem_is_allowed(cursor)) -+ if (!devmem_is_allowed(cursor)) { -+ printk ("Program %s tried to read /dev/mem between %lx->%lx." -+ "We stopped at %lx\n", current->comm, from, to, cursor); - return 0; -+ } - cursor++; - } - return 1; linux-2.6.11-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/entry.S | 8 +- arch/i386/kernel/process.c | 59 +++++++++++++++++ arch/i386/kernel/signal.c | 4 - arch/i386/kernel/smp.c | 3 arch/i386/kernel/sysenter.c | 55 +++++++++++++++- arch/i386/kernel/traps.c | 48 +++++++++++++- arch/i386/kernel/vsyscall-sysenter.S | 6 - arch/i386/kernel/vsyscall.lds.S | 4 - arch/i386/mm/init.c | 6 + arch/i386/mm/mmap.c | 6 + arch/ia64/ia32/binfmt_elf32.c | 2 arch/x86_64/ia32/ia32_binfmt.c | 2 arch/x86_64/kernel/process.c | 7 -- arch/x86_64/mm/Makefile | 2 arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++++++++++ drivers/char/random.c | 7 +- fs/binfmt_elf.c | 120 ++++++++++++++++++++++++++++------- fs/proc/array.c | 8 +- fs/proc/base.c | 4 - fs/proc/task_mmu.c | 25 +++++-- include/asm-i386/desc.h | 14 ++++ include/asm-i386/elf.h | 42 ++++++++---- include/asm-i386/mmu.h | 6 + include/asm-i386/pgalloc.h | 1 include/asm-i386/processor.h | 8 ++ include/asm-i386/thread_info.h | 1 include/asm-ia64/pgalloc.h | 4 + include/asm-ppc/pgalloc.h | 5 + include/asm-ppc64/pgalloc.h | 5 + include/asm-s390/pgalloc.h | 4 + include/asm-sparc/pgalloc.h | 4 + include/asm-sparc64/pgalloc.h | 4 + include/asm-x86_64/pgalloc.h | 7 ++ include/asm-x86_64/processor.h | 8 ++ include/linux/mm.h | 9 ++ include/linux/resource.h | 5 + include/linux/sched.h | 9 ++ include/linux/sysctl.h | 3 kernel/signal.c | 38 +++++++++++ kernel/sysctl.c | 39 +++++++++++ mm/fremap.c | 10 +- mm/mmap.c | 107 ++++++++++++++++++++++++++++--- mm/mprotect.c | 5 + mm/mremap.c | 4 - 45 files changed, 726 insertions(+), 88 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6.11-execshield.patch Index: linux-2.6.11-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-execshield.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.11-execshield.patch 21 Mar 2005 00:27:08 -0000 1.2 +++ linux-2.6.11-execshield.patch 22 Mar 2005 07:00:21 -0000 1.3 @@ -1,710 +1,455 @@ ---- linux/fs/binfmt_elf.c.orig -+++ linux/fs/binfmt_elf.c -@@ -47,7 +47,7 @@ - - static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs); - static int load_elf_library(struct file*); --static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int); -+static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long); - extern int dump_fpu (struct pt_regs *, elf_fpregset_t *); - - #ifndef elf_addr_t -@@ -285,20 +285,59 @@ create_elf_tables(struct linux_binprm *b - #ifndef elf_map - - static unsigned long elf_map(struct file *filep, unsigned long addr, -- struct elf_phdr *eppnt, int prot, int type) -+ struct elf_phdr *eppnt, int prot, int type, -+ unsigned long total_size) - { - unsigned long map_addr; -+ unsigned long size = eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr); -+ unsigned long off = eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr); -+ -+ addr = ELF_PAGESTART(addr); -+ size = ELF_PAGEALIGN(size); +diff -urNp --exclude-from=/home/davej/.exclude linux-801/arch/i386/kernel/asm-offsets.c linux-810/arch/i386/kernel/asm-offsets.c +--- linux-801/arch/i386/kernel/asm-offsets.c ++++ linux-810/arch/i386/kernel/asm-offsets.c +@@ -53,6 +53,7 @@ void foo(void) + OFFSET(TI_preempt_count, thread_info, preempt_count); + OFFSET(TI_addr_limit, thread_info, addr_limit); + OFFSET(TI_restart_block, thread_info, restart_block); ++ OFFSET(TI_sysenter_return, thread_info, sysenter_return); + BLANK(); - down_write(¤t->mm->mmap_sem); -- map_addr = do_mmap(filep, ELF_PAGESTART(addr), -- eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr), prot, type, -- eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr)); -+ + OFFSET(EXEC_DOMAIN_handler, exec_domain, handler); +diff -urNp --exclude-from=/home/davej/.exclude linux-801/arch/i386/kernel/entry.S linux-810/arch/i386/kernel/entry.S +--- linux-801/arch/i386/kernel/entry.S ++++ linux-810/arch/i386/kernel/entry.S +@@ -201,8 +201,12 @@ sysenter_past_esp: + pushl %ebp + pushfl + pushl $(__USER_CS) +- pushl $SYSENTER_RETURN +- + /* -+ * total_size is the size of the ELF (interpreter) image. -+ * The _first_ mmap needs to know the full size, otherwise -+ * randomization might put this image into an overlapping -+ * position with the ELF binary image. (since size < total_size) -+ * So we first map the 'big' image - and unmap the remainder at -+ * the end. (which unmap is needed for ELF images with holes.) ++ * Push current_thread_info()->sysenter_return to the stack. ++ * A tiny bit of offset fixup is necessary - 4*4 means the 4 words ++ * pushed above, and the word being pushed now: + */ -+ if (total_size) { -+ total_size = ELF_PAGEALIGN(total_size); -+ map_addr = do_mmap(filep, addr, total_size, prot, type, off); -+ if (!BAD_ADDR(map_addr)) -+ do_munmap(current->mm, map_addr+size, total_size-size); -+ } else -+ map_addr = do_mmap(filep, addr, size, prot, type, off); -+ - up_write(¤t->mm->mmap_sem); -- return(map_addr); -+ -+ return map_addr; - } ++ pushl (TI_sysenter_return-THREAD_SIZE+4*4)(%esp) + /* + * Load the potential sixth argument from user stack. + * Careful about security. +diff -urNp --exclude-from=/home/davej/.exclude linux-801/arch/i386/kernel/process.c linux-810/arch/i386/kernel/process.c +--- linux-801/arch/i386/kernel/process.c ++++ linux-810/arch/i386/kernel/process.c +@@ -582,6 +582,8 @@ struct task_struct fastcall * __switch_t + /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ - #endif /* !elf_map */ + __unlazy_fpu(prev_p); ++ if (next_p->mm) ++ load_user_cs_desc(cpu, next_p->mm); -+static inline unsigned long total_mapping_size(struct elf_phdr *cmds, int nr) + /* + * Reload esp0, LDT and the page table pointer: +@@ -835,3 +837,60 @@ unsigned long arch_align_stack(unsigned + sp -= get_random_int() % 8192; + return sp & ~0xf; + } ++ ++void arch_add_exec_range(struct mm_struct *mm, unsigned long limit) +{ -+ int i, first_idx = -1, last_idx = -1; ++ if (limit > mm->context.exec_limit) { ++ mm->context.exec_limit = limit; ++ set_user_cs(&mm->context.user_cs, limit); ++ if (mm == current->mm) { ++ preempt_disable(); ++ load_user_cs_desc(smp_processor_id(), mm); ++ preempt_enable(); ++ } ++ } ++} + -+ for (i = 0; i < nr; i++) -+ if (cmds[i].p_type == PT_LOAD) { -+ last_idx = i; -+ if (first_idx == -1) -+ first_idx = i; ++void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end) ++{ ++ struct vm_area_struct *vma; ++ unsigned long limit = PAGE_SIZE; ++ ++ if (old_end == mm->context.exec_limit) { ++ for (vma = mm->mmap; vma; vma = vma->vm_next) ++ if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) ++ limit = vma->vm_end; ++ ++ mm->context.exec_limit = limit; ++ set_user_cs(&mm->context.user_cs, limit); ++ if (mm == current->mm) { ++ preempt_disable(); ++ load_user_cs_desc(smp_processor_id(), mm); ++ preempt_enable(); + } ++ } ++} + -+ if (first_idx == -1) -+ return 0; ++void arch_flush_exec_range(struct mm_struct *mm) ++{ ++ mm->context.exec_limit = 0; ++ set_user_cs(&mm->context.user_cs, 0); ++} + -+ return cmds[last_idx].p_vaddr + cmds[last_idx].p_memsz - -+ ELF_PAGESTART(cmds[first_idx].p_vaddr); ++/* ++ * Generate random brk address between 128MB and 196MB. (if the layout ++ * allows it.) ++ */ ++void randomize_brk(unsigned long old_brk) ++{ ++ unsigned long new_brk, range_start, range_end; ++ ++ range_start = 0x08000000; ++ if (current->mm->brk >= range_start) ++ range_start = current->mm->brk; ++ range_end = range_start + 0x02000000; ++ new_brk = randomize_range(range_start, range_end, 0); ++ if (new_brk) ++ current->mm->brk = new_brk; +} + - /* This is much more generalized than the library routine read function, - so we keep this separate. Technically the library read function - is only provided so that we can read a.out libraries that have -@@ -306,7 +345,8 @@ static unsigned long elf_map(struct file +diff -urNp --exclude-from=/home/davej/.exclude linux-801/arch/i386/kernel/signal.c linux-810/arch/i386/kernel/signal.c +--- linux-801/arch/i386/kernel/signal.c ++++ linux-810/arch/i386/kernel/signal.c +@@ -380,7 +380,7 @@ static void setup_frame(int sig, struct + goto give_sigsegv; + } - static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, - struct file * interpreter, -- unsigned long *interp_load_addr) -+ unsigned long *interp_load_addr, -+ unsigned long no_base) - { - struct elf_phdr *elf_phdata; - struct elf_phdr *eppnt; -@@ -314,6 +354,7 @@ static unsigned long load_elf_interp(str - int load_addr_set = 0; - unsigned long last_bss = 0, elf_bss = 0; - unsigned long error = ~0UL; -+ unsigned long total_size; - int retval, i, size; +- restorer = &__kernel_sigreturn; ++ restorer = current->mm->context.vdso + (long)&__kernel_sigreturn; + if (ka->sa.sa_flags & SA_RESTORER) [...2627 lines suppressed...] - */ --#define ELF_CORE_EXTRA_PHDRS (VSYSCALL_EHDR->e_phnum) -+#define ELF_CORE_EXTRA_PHDRS (__VSYSCALL_EHDR->e_phnum) - #define ELF_CORE_WRITE_EXTRA_PHDRS \ - do { \ - const struct elf_phdr *const vsyscall_phdrs = \ -- (const struct elf_phdr *) (VSYSCALL_BASE \ -- + VSYSCALL_EHDR->e_phoff); \ -+ (const struct elf_phdr *) (__VSYSCALL_BASE \ -+ + __VSYSCALL_EHDR->e_phoff); \ - int i; \ - Elf32_Off ofs = 0; \ -- for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) { \ -+ for (i = 0; i < __VSYSCALL_EHDR->e_phnum; ++i) { \ - struct elf_phdr phdr = vsyscall_phdrs[i]; \ - if (phdr.p_type == PT_LOAD) { \ - BUG_ON(ofs != 0); \ -@@ -178,10 +186,10 @@ do { \ - #define ELF_CORE_WRITE_EXTRA_DATA \ - do { \ - const struct elf_phdr *const vsyscall_phdrs = \ -- (const struct elf_phdr *) (VSYSCALL_BASE \ -- + VSYSCALL_EHDR->e_phoff); \ -+ (const struct elf_phdr *) (__VSYSCALL_BASE \ -+ + __VSYSCALL_EHDR->e_phoff); \ - int i; \ -- for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) { \ -+ for (i = 0; i < __VSYSCALL_EHDR->e_phnum; ++i) { \ - if (vsyscall_phdrs[i].p_type == PT_LOAD) \ - DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr, \ - PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ -@@ -190,4 +198,10 @@ do { \ + * Verify that the stack growth is acceptable and + * update accounting. This is shared with both the +@@ -1420,7 +1506,7 @@ static int acct_stack_growth(struct vm_a + return -ENOMEM; - #endif + /* Stack limit test */ +- if (size > rlim[RLIMIT_STACK].rlim_cur) ++ if (over_stack_limit(size)) + return -ENOMEM; -+#define __HAVE_ARCH_RANDOMIZE_BRK -+extern void randomize_brk(unsigned long old_brk); -+ -+#define __HAVE_ARCH_VSYSCALL -+extern void map_vsyscall(void); + /* mlock limit tests */ +@@ -1760,10 +1846,14 @@ int split_vma(struct mm_struct * mm, str + if (new->vm_ops && new->vm_ops->open) + new->vm_ops->open(new); + +- if (new_below) ++ if (new_below) { ++ unsigned long old_end = vma->vm_end; + - #endif ---- linux/include/asm-ppc64/pgalloc.h.orig -+++ linux/include/asm-ppc64/pgalloc.h -@@ -11,6 +11,11 @@ + vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff + + ((addr - new->vm_start) >> PAGE_SHIFT), new); +- else ++ if (vma->vm_flags & VM_EXEC) ++ arch_remove_exec_range(mm, old_end); ++ } else + vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); - extern kmem_cache_t *zero_cache; + return 0; +@@ -1981,6 +2071,7 @@ void exit_mmap(struct mm_struct *mm) + mm->rss = 0; + mm->total_vm = 0; + mm->locked_vm = 0; ++ arch_flush_exec_range(mm); -+/* Dummy functions since we don't support execshield on ppc */ -+#define arch_add_exec_range(mm, limit) do { ; } while (0) -+#define arch_flush_exec_range(mm) do { ; } while (0) -+#define arch_remove_exec_range(mm, limit) do { ; } while (0) -+ - /* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License ---- linux/include/asm-sparc64/pgalloc.h.orig -+++ linux/include/asm-sparc64/pgalloc.h -@@ -250,4 +250,8 @@ static inline void pte_free(struct page - #define pgd_free(pgd) free_pgd_fast(pgd) - #define pgd_alloc(mm) get_pgd_fast() + spin_unlock(&mm->page_table_lock); -+#define arch_add_exec_range(mm, limit) do { ; } while (0) -+#define arch_flush_exec_range(mm) do { ; } while (0) -+#define arch_remove_exec_range(mm, limit) do { ; } while (0) -+ - #endif /* _SPARC64_PGALLOC_H */ ---- linux/include/asm-x86_64/processor.h.orig -+++ linux/include/asm-x86_64/processor.h -@@ -163,6 +163,15 @@ static inline void clear_in_cr4 (unsigne - */ - #define TASK_SIZE (0x800000000000UL) +diff -urNp --exclude-from=/home/davej/.exclude linux-801/mm/mprotect.c linux-810/mm/mprotect.c +--- linux-801/mm/mprotect.c ++++ linux-810/mm/mprotect.c +@@ -22,6 +22,7 @@ -+#define TASK_SIZE_64 (0x800000000000) -+ -+#define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64) -+ -+#define __HAVE_ARCH_ALIGN_STACK -+extern unsigned long arch_align_stack(unsigned long sp); -+ -+#define HAVE_ARCH_PICK_MMAP_LAYOUT -+ - /* This decides where the kernel will search for a free chunk of vm - * space during mmap's. - */ ---- linux/include/asm-x86_64/pgalloc.h.orig -+++ linux/include/asm-x86_64/pgalloc.h -@@ -7,6 +7,13 @@ - #include - #include + #include + #include ++#include + #include + #include -+#define arch_add_exec_range(mm, limit) \ -+ do { (void)(mm), (void)(limit); } while (0) -+#define arch_flush_exec_range(mm) \ -+ do { (void)(mm); } while (0) -+#define arch_remove_exec_range(mm, limit) \ -+ do { (void)(mm), (void)(limit); } while (0) -+ - #define pmd_populate_kernel(mm, pmd, pte) \ - set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte))) - #define pud_populate(mm, pud, pmd) \ ---- linux-2.6.11/include/asm-x86_64/processor.h.~1~ 2005-03-20 02:30:47.000000000 -0800 -+++ linux-2.6.11/include/asm-x86_64/processor.h 2005-03-20 16:03:58.630866387 -0800 -@@ -161,10 +161,7 @@ static inline void clear_in_cr4 (unsigne - /* - * User space process size. 47bits. - */ --#define TASK_SIZE (0x800000000000UL) -- --#define TASK_SIZE_64 (0x800000000000) -- -+#define TASK_SIZE_64 (0x800000000000UL) - #define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64) +@@ -105,7 +106,7 @@ mprotect_fixup(struct vm_area_struct *vm + struct mm_struct *mm = vma->vm_mm; + unsigned long oldflags = vma->vm_flags; + long nrpages = (end - start) >> PAGE_SHIFT; +- unsigned long charged = 0; ++ unsigned long charged = 0, old_end = vma->vm_end; + pgprot_t newprot; + pgoff_t pgoff; + int error; +@@ -166,6 +167,8 @@ success: + */ + vma->vm_flags = newflags; + vma->vm_page_prot = newprot; ++ if (oldflags & VM_EXEC) ++ arch_remove_exec_range(current->mm, old_end); + change_protection(vma, start, end, newprot); + __vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); + __vm_stat_account(mm, newflags, vma->vm_file, nrpages); +diff -urNp --exclude-from=/home/davej/.exclude linux-801/mm/mremap.c linux-810/mm/mremap.c +--- linux-801/mm/mremap.c ++++ linux-810/mm/mremap.c +@@ -398,8 +398,8 @@ unsigned long do_mremap(unsigned long ad + if (vma->vm_flags & VM_MAYSHARE) + map_flags |= MAP_SHARED; - #define __HAVE_ARCH_ALIGN_STACK - ---- linux-2.6.11/arch/x86_64/kernel/process.c.~1~ 2005-03-20 02:30:52.000000000 -0800 -+++ linux-2.6.11/arch/x86_64/kernel/process.c 2005-03-20 16:13:31.209561108 -0800 -@@ -746,10 +746,3 @@ int dump_task_regs(struct task_struct *t - - return 1; - } -- --unsigned long arch_align_stack(unsigned long sp) --{ -- if (randomize_va_space) -- sp -= get_random_int() % 8192; -- return sp & ~0xf; --} - +- new_addr = get_unmapped_area(vma->vm_file, 0, new_len, +- vma->vm_pgoff, map_flags); ++ new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len, ++ vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC); + ret = new_addr; + if (new_addr & ~PAGE_MASK) + goto out; linux-2.6.11-ext3-release-race.patch: transaction.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6.11-ext3-release-race.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-ext3-release-race.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.11-ext3-release-race.patch 18 Mar 2005 18:25:23 -0000 1.1 +++ linux-2.6.11-ext3-release-race.patch 22 Mar 2005 07:00:21 -0000 1.2 @@ -1,6 +1,7 @@ ---- linux-2.6.9/fs/jbd/transaction.c.=K0002=.orig -+++ linux-2.6.9/fs/jbd/transaction.c -@@ -1812,10 +1812,10 @@ static int journal_unmap_buffer(journal_ +diff -urNp --exclude-from=/home/davej/.exclude linux-1730/fs/jbd/transaction.c linux-1740/fs/jbd/transaction.c +--- linux-1730/fs/jbd/transaction.c ++++ linux-1740/fs/jbd/transaction.c +@@ -1774,10 +1774,10 @@ static int journal_unmap_buffer(journal_ JBUFFER_TRACE(jh, "checkpointed: add to BJ_Forget"); ret = __dispose_buffer(jh, journal->j_running_transaction); @@ -12,7 +13,7 @@ return ret; } else { /* There is no currently-running transaction. So the -@@ -1826,10 +1826,10 @@ static int journal_unmap_buffer(journal_ +@@ -1788,10 +1788,10 @@ static int journal_unmap_buffer(journal_ JBUFFER_TRACE(jh, "give to committing trans"); ret = __dispose_buffer(jh, journal->j_committing_transaction); @@ -24,7 +25,7 @@ return ret; } else { /* The orphan record's transaction has -@@ -1850,10 +1850,10 @@ static int journal_unmap_buffer(journal_ +@@ -1812,10 +1812,10 @@ static int journal_unmap_buffer(journal_ journal->j_running_transaction); jh->b_next_transaction = NULL; } linux-2.6.11-tux.patch: arch/alpha/kernel/systbls.S | 8 arch/i386/kernel/entry.S | 10 arch/ia64/kernel/entry.S | 8 arch/ia64/kernel/ia64_ksyms.c | 3 arch/ppc64/kernel/misc.S | 20 arch/x86_64/ia32/ia32entry.S | 10 fs/dcache.c | 36 fs/exec.c | 2 fs/fcntl.c | 4 fs/namei.c | 18 fs/namespace.c | 2 fs/open.c | 4 fs/pipe.c | 2 fs/read_write.c | 2 include/asm-alpha/fcntl.h | 1 include/asm-i386/fcntl.h | 1 include/asm-i386/unistd.h | 5 include/asm-ia64/fcntl.h | 1 include/asm-ia64/unistd.h | 2 include/asm-ppc/fcntl.h | 1 include/asm-ppc64/fcntl.h | 1 include/asm-s390/fcntl.h | 1 include/asm-sparc/fcntl.h | 1 include/asm-sparc64/fcntl.h | 1 include/asm-x86_64/fcntl.h | 1 include/asm-x86_64/unistd.h | 10 include/linux/buffer_head.h | 1 include/linux/dcache.h | 8 include/linux/errno.h | 3 include/linux/file.h | 2 include/linux/fs.h | 7 include/linux/kmod.h | 1 include/linux/namei.h | 2 include/linux/net.h | 1 include/linux/sched.h | 5 include/linux/skbuff.h | 2 include/linux/socket.h | 5 include/linux/sysctl.h | 50 include/net/sock.h | 6 include/net/tcp.h | 8 include/net/tux.h | 802 +++++++++++++++ include/net/tux_u.h | 163 +++ kernel/exit.c | 7 kernel/fork.c | 1 kernel/kmod.c | 25 kernel/signal.c | 1 mm/filemap.c | 19 mm/truncate.c | 2 net/Kconfig | 2 net/Makefile | 1 net/ipv4/tcp.c | 3 net/ipv4/tcp_input.c | 1 net/ipv4/tcp_ipv4.c | 5 net/ipv4/tcp_minisocks.c | 3 net/ipv4/tcp_output.c | 5 net/socket.c | 139 +- net/tux/Kconfig | 25 net/tux/Makefile | 12 net/tux/abuf.c | 190 +++ net/tux/accept.c | 859 ++++++++++++++++ net/tux/cachemiss.c | 265 +++++ net/tux/cgi.c | 160 +++ net/tux/directory.c | 302 +++++ net/tux/extcgi.c | 329 ++++++ net/tux/gzip.c | 40 net/tux/input.c | 640 ++++++++++++ net/tux/logger.c | 836 +++++++++++++++ net/tux/main.c | 1413 +++++++++++++++++++++++++++ net/tux/mod.c | 262 +++++ net/tux/output.c | 352 ++++++ net/tux/parser.h | 102 + net/tux/postpone.c | 77 + net/tux/proc.c | 1149 +++++++++++++++++++++ net/tux/proto_ftp.c | 1549 +++++++++++++++++++++++++++++ net/tux/proto_http.c | 2197 ++++++++++++++++++++++++++++++++++++++++++ net/tux/redirect.c | 162 +++ net/tux/times.c | 392 +++++++ net/tux/userspace.c | 27 78 files changed, 12703 insertions(+), 72 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6.11-tux.patch Index: linux-2.6.11-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-tux.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.11-tux.patch 18 Mar 2005 21:54:20 -0000 1.2 +++ linux-2.6.11-tux.patch 22 Mar 2005 07:00:21 -0000 1.3 @@ -1,2135 +1,2478 @@ ---- linux/net/Kconfig.orig -+++ linux/net/Kconfig -@@ -653,6 +653,8 @@ source "net/irda/Kconfig" +diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/alpha/kernel/systbls.S linux-910/arch/alpha/kernel/systbls.S +--- linux-905/arch/alpha/kernel/systbls.S ++++ linux-910/arch/alpha/kernel/systbls.S +@@ -240,7 +240,15 @@ sys_call_table: + .quad alpha_ni_syscall + .quad alpha_ni_syscall /* 220 */ + .quad alpha_ni_syscall ++#ifdef CONFIG_TUX ++ .quad __sys_tux ++#else ++# ifdef CONFIG_TUX_MODULE ++ .quad sys_tux ++# else + .quad alpha_ni_syscall ++# endif ++#endif + .quad alpha_ni_syscall + .quad alpha_ni_syscall + .quad alpha_ni_syscall /* 225 */ +diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/i386/kernel/entry.S linux-910/arch/i386/kernel/entry.S +--- linux-905/arch/i386/kernel/entry.S ++++ linux-910/arch/i386/kernel/entry.S +@@ -801,7 +801,15 @@ ENTRY(sys_call_table) + .long sys_madvise + .long sys_getdents64 /* 220 */ + .long sys_fcntl64 +- .long sys_ni_syscall /* reserved for TUX */ ++#ifdef CONFIG_TUX ++ .long __sys_tux ++#else ++# ifdef CONFIG_TUX_MODULE ++ .long sys_tux ++# else ++ .long sys_ni_syscall ++# endif ++#endif + .long sys_ni_syscall + .long sys_gettid + .long sys_readahead /* 225 */ +diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/ia64/kernel/entry.S linux-910/arch/ia64/kernel/entry.S +--- linux-905/arch/ia64/kernel/entry.S ++++ linux-910/arch/ia64/kernel/entry.S +@@ -1423,7 +1423,15 @@ sys_call_table: + data8 sys_syslog + data8 sys_setitimer + data8 sys_getitimer ++#ifdef CONFIG_TUX ++ data8 __sys_tux // 1120 /* was: ia64_oldstat */ ++#else ++# ifdef CONFIG_TUX_MODULE ++ data8 sys_tux // 1120 /* was: ia64_oldstat */ ++# else + data8 sys_ni_syscall // 1120 /* was: ia64_oldstat */ ++# endif ++#endif + data8 sys_ni_syscall /* was: ia64_oldlstat */ + data8 sys_ni_syscall /* was: ia64_oldfstat */ + data8 sys_vhangup +diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/ia64/kernel/ia64_ksyms.c linux-910/arch/ia64/kernel/ia64_ksyms.c +--- linux-905/arch/ia64/kernel/ia64_ksyms.c ++++ linux-910/arch/ia64/kernel/ia64_ksyms.c +@@ -58,8 +58,11 @@ EXPORT_SYMBOL(__strlen_user); + EXPORT_SYMBOL(__strncpy_from_user); + EXPORT_SYMBOL(__strnlen_user); - source "net/bluetooth/Kconfig" ++#define __KERNEL_SYSCALLS__ + #include + EXPORT_SYMBOL(__ia64_syscall); ++EXPORT_SYMBOL(sys_execve); ++EXPORT_SYMBOL(clone); -+source "net/tux/Kconfig" -+ - source "drivers/net/Kconfig" + /* from arch/ia64/lib */ + extern void __divsi3(void); +diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/ppc64/kernel/misc.S linux-910/arch/ppc64/kernel/misc.S +--- linux-905/arch/ppc64/kernel/misc.S ++++ linux-910/arch/ppc64/kernel/misc.S +@@ -912,7 +912,15 @@ _GLOBAL(sys_call_table32) + .llong .compat_sys_sched_setaffinity + .llong .compat_sys_sched_getaffinity + .llong .sys_ni_syscall +- .llong .sys_ni_syscall /* 225 - reserved for tux */ ++#ifdef CONFIG_TUX ++ .llong .__sys_tux ++#else ++# ifdef CONFIG_TUX_MODULE ++ .llong .sys_tux ++# else ++ .llong .sys_ni_syscall ++# endif ++#endif + .llong .sys32_sendfile64 + .llong .compat_sys_io_setup + .llong .sys_io_destroy +@@ -1188,7 +1196,15 @@ _GLOBAL(sys_call_table) + .llong .sys_sched_setaffinity + .llong .sys_sched_getaffinity + .llong .sys_ni_syscall +- .llong .sys_ni_syscall /* 225 - reserved for tux */ ++#ifdef CONFIG_TUX ++ .llong .__sys_tux ++#else ++# ifdef CONFIG_TUX_MODULE ++ .llong .sys_tux ++# else ++ .llong .sys_ni_syscall ++# endif ++#endif + .llong .sys_ni_syscall /* 32bit only sendfile64 */ + .llong .sys_io_setup + .llong .sys_io_destroy +diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/x86_64/ia32/ia32entry.S linux-910/arch/x86_64/ia32/ia32entry.S +--- linux-905/arch/x86_64/ia32/ia32entry.S ++++ linux-910/arch/x86_64/ia32/ia32entry.S +@@ -528,7 +528,15 @@ ia32_sys_call_table: + .quad sys_madvise + .quad compat_sys_getdents64 /* 220 getdents64 */ + .quad compat_sys_fcntl64 +- .quad quiet_ni_syscall /* tux */ ++#ifdef CONFIG_TUX ++ .quad __sys_tux ++#else ++# ifdef CONFIG_TUX_MODULE ++ .quad sys_tux ++# else ++ .quad quiet_ni_syscall ++# endif ++#endif + .quad quiet_ni_syscall /* security */ + .quad sys_gettid + .quad sys_readahead /* 225 */ +diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/dcache.c linux-910/fs/dcache.c +--- linux-905/fs/dcache.c ++++ linux-910/fs/dcache.c +@@ -84,6 +84,10 @@ static void d_free(struct dentry *dentry + { + if (dentry->d_op && dentry->d_op->d_release) + dentry->d_op->d_release(dentry); ++ if (dentry->d_extra_attributes) { ++ kfree(dentry->d_extra_attributes); ++ dentry->d_extra_attributes = NULL; ++ } + call_rcu(&dentry->d_rcu, d_callback); + } - endmenu ---- linux/net/socket.c.orig -+++ linux/net/socket.c -@@ -68,6 +68,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -120,7 +121,7 @@ static ssize_t sock_sendpage(struct file - * in the operation structures but are done directly via the socketcall() multiplexor. - */ +@@ -746,6 +750,7 @@ struct dentry *d_alloc(struct dentry * p + dentry->d_sb = NULL; + dentry->d_op = NULL; + dentry->d_fsdata = NULL; ++ dentry->d_extra_attributes = NULL; + dentry->d_mounted = 0; + dentry->d_cookie = NULL; + INIT_HLIST_NODE(&dentry->d_hash); +@@ -1311,6 +1316,16 @@ already_unhashed: + /* Unhash the target: dput() will then get rid of it */ + __d_drop(target); --static struct file_operations socket_file_ops = { -+struct file_operations socket_file_ops = { - .owner = THIS_MODULE, - .llseek = no_llseek, - .aio_read = sock_aio_read, -@@ -362,52 +363,63 @@ static struct dentry_operations sockfs_d - * but we take care of internal coherence yet. - */ ++ /* flush any possible attributes */ ++ if (dentry->d_extra_attributes) { ++ kfree(dentry->d_extra_attributes); ++ dentry->d_extra_attributes = NULL; ++ } ++ if (target->d_extra_attributes) { [...24374 lines suppressed...] - /* CTL_FS names: */ ---- linux/include/linux/dcache.h.orig -+++ linux/include/linux/dcache.h -@@ -101,6 +101,7 @@ struct dentry { - struct dentry_operations *d_op; - struct super_block *d_sb; /* The root of the dentry tree */ - void *d_fsdata; /* fs-specific data */ -+ void * d_extra_attributes; /* TUX-specific data */ - struct rcu_head d_rcu; - struct dcookie_struct *d_cookie; /* cookie, if any */ - struct hlist_node d_hash; /* lookup hash list */ -@@ -210,6 +211,7 @@ extern void shrink_dcache_sb(struct supe - extern void shrink_dcache_parent(struct dentry *); - extern void shrink_dcache_anon(struct hlist_head *); - extern int d_invalidate(struct dentry *); -+extern void flush_dentry_attributes(void); - - /* only used at mount-time */ - extern struct dentry * d_alloc_root(struct inode *); -@@ -270,8 +272,12 @@ extern struct dentry * __d_lookup(struct - /* validate "insecure" dentry pointer */ - extern int d_validate(struct dentry *, struct dentry *); - -+char * __d_path( struct dentry *dentry, struct vfsmount *vfsmnt, -+ struct dentry *root, struct vfsmount *rootmnt, -+ char *buffer, int buflen); ++ mday = make_num(s + 2); ++ mon = make_month(s + 5); ++ year = make_num(s + 9) + 1900; ++ if (year < 1970) ++ year += 100; ++ hour = make_num(s + 12); ++ min = make_num(s + 15); ++ sec = make_num(s + 18); ++ } ++ } + - extern char * d_path(struct dentry *, struct vfsmount *, char *, int); -- -+ - /* Allocation counts.. */ - - /** ---- linux/include/linux/buffer_head.h.orig -+++ linux/include/linux/buffer_head.h -@@ -196,6 +196,7 @@ int cont_prepare_write(struct page*, uns - int generic_cont_expand(struct inode *inode, loff_t size) ; - int block_commit_write(struct page *page, unsigned from, unsigned to); - int block_sync_page(struct page *); -+void flush_inode_pages (struct inode * inode); - sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *); - int generic_commit_write(struct file *, struct page *, unsigned, unsigned); - int block_truncate_page(struct address_space *, loff_t, get_block_t *); ---- linux/include/linux/sched.h.orig -+++ linux/include/linux/sched.h -@@ -640,6 +640,11 @@ struct task_struct { - int (*notifier)(void *priv); - void *notifier_data; - sigset_t *notifier_mask; ++ if (sec < 0 || sec > 59) ++ return -1; ++ if (min < 0 || min > 59) ++ return -1; ++ if (hour < 0 || hour > 23) ++ return -1; ++ if (mday < 1 || mday > 31) ++ return -1; ++ if (mon < 1 || mon > 12) ++ return -1; ++ if (year < 1970 || year > 2020) ++ return -1; + -+ /* TUX state */ -+ void *tux_info; -+ void (*tux_exit)(void); ++ return mktime(year, mon, mday, hour, min, sec); ++} +diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/userspace.c linux-910/net/tux/userspace.c +--- linux-905/net/tux/userspace.c ++++ linux-910/net/tux/userspace.c +@@ -0,0 +1,27 @@ ++/* ++ * TUX - Integrated Application Protocols Layer and Object Cache ++ * ++ * Copyright (C) 2000, 2001, Ingo Molnar ++ * ++ * userspace.c: handle userspace-module requests ++ */ + - - void *security; - struct audit_context *audit_context; ---- linux/include/linux/skbuff.h.orig -+++ linux/include/linux/skbuff.h -@@ -1138,6 +1138,8 @@ extern int skb_iter_next(const struct sk - /* Call this if aborting loop before !skb_iter_next */ - extern void skb_iter_abort(const struct sk_buff *skb, struct skb_iter *i); - -+struct tux_req_struct; ++#include + - #ifdef CONFIG_NETFILTER - static inline void nf_conntrack_put(struct nf_conntrack *nfct) - { ---- linux/include/asm-i386/fcntl.h.orig -+++ linux/include/asm-i386/fcntl.h -@@ -21,6 +21,7 @@ - #define O_DIRECTORY 0200000 /* must be a directory */ - #define O_NOFOLLOW 0400000 /* don't follow links */ - #define O_NOATIME 01000000 -+#define O_ATOMICLOOKUP 02000000 /* do atomic file lookup */ - - #define F_DUPFD 0 /* dup */ - #define F_GETFD 1 /* get close_on_exec */ ---- linux/include/asm-i386/unistd.h.orig -+++ linux/include/asm-i386/unistd.h -@@ -297,6 +297,7 @@ - - #define NR_syscalls 289 - -+#ifndef __KERNEL_SYSCALLS_NO_ERRNO__ - /* - * user-visible error numbers are in the range -1 - -128: see - * -@@ -310,6 +311,10 @@ do { \ - return (type) (res); \ - } while (0) - -+#else -+# define __syscall_return(type, res) return (type) (res) -+#endif ++/**************************************************************** ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ ****************************************************************/ + - /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */ - #define _syscall0(type,name) \ - type name(void) \ ---- linux/include/asm-ppc64/fcntl.h.orig -+++ linux/include/asm-ppc64/fcntl.h -@@ -28,6 +28,7 @@ - #define O_LARGEFILE 0200000 - #define O_DIRECT 0400000 /* direct disk access hint */ - #define O_NOATIME 01000000 -+#define O_ATOMICLOOKUP 02000000 /* do atomic file lookup */ - - #define F_DUPFD 0 /* dup */ - #define F_GETFD 1 /* get close_on_exec */ ---- linux/include/asm-sparc64/fcntl.h.orig -+++ linux/include/asm-sparc64/fcntl.h -@@ -20,6 +20,7 @@ - #define O_DIRECTORY 0x10000 /* must be a directory */ - #define O_NOFOLLOW 0x20000 /* don't follow links */ - #define O_LARGEFILE 0x40000 -+#define O_ATOMICLOOKUP 0x80000 /* do atomic file lookup */ - #define O_DIRECT 0x100000 /* direct disk access hint */ - #define O_NOATIME 0x200000 - ---- linux/include/asm-x86_64/fcntl.h.orig -+++ linux/include/asm-x86_64/fcntl.h -@@ -21,6 +21,7 @@ - #define O_DIRECTORY 0200000 /* must be a directory */ - #define O_NOFOLLOW 0400000 /* don't follow links */ - #define O_NOATIME 01000000 -+#define O_ATOMICLOOKUP 02000000 /* TUX */ - - #define F_DUPFD 0 /* dup */ - #define F_GETFD 1 /* get close_on_exec */ ---- linux/include/asm-x86_64/unistd.h.orig -+++ linux/include/asm-x86_64/unistd.h -@@ -425,7 +425,15 @@ __SYSCALL(__NR_putpmsg, sys_ni_syscall) - __SYSCALL(__NR_afs_syscall, sys_ni_syscall) - - #define __NR_tuxcall 184 /* reserved for tux */ --__SYSCALL(__NR_tuxcall, sys_ni_syscall) -+#ifdef CONFIG_TUX -+ __SYSCALL(__NR_tuxcall, __sys_tux) -+#else -+# ifdef CONFIG_TUX_MODULE -+ __SYSCALL(__NR_tuxcall, sys_tux) -+# else -+ __SYSCALL(__NR_tuxcall, sys_ni_syscall) -+# endif -+#endif - - #define __NR_security 185 - __SYSCALL(__NR_security, sys_ni_syscall) linux-2.6.11-vm-taint.patch: include/asm-generic/bug.h | 10 +++++++--- kernel/panic.c | 1 + mm/page_alloc.c | 4 ++-- mm/slab.c | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) Index: linux-2.6.11-vm-taint.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-vm-taint.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6.11-vm-taint.patch 26 Feb 2005 00:20:41 -0000 1.8 +++ linux-2.6.11-vm-taint.patch 22 Mar 2005 07:00:21 -0000 1.9 @@ -1,34 +1,14 @@ ---- linux-2.6.10/mm/slab.c~ 2005-01-11 16:22:12.000000000 -0500 -+++ linux-2.6.10/mm/slab.c 2005-01-11 16:22:28.000000000 -0500 -@@ -1054,8 +1054,8 @@ static void check_poison_obj(kmem_cache_ - /* Mismatch ! */ - /* Print header */ - if (lines == 0) { -- printk(KERN_ERR "Slab corruption: start=%p, len=%d\n", -- realobj, size); -+ printk(KERN_ERR "Slab corruption: (%s) start=%p, len=%d\n", -+ print_tainted(), realobj, size); - print_objinfo(cachep, objp, 0); - } - /* Hexdump the affected line */ ---- linux-2.6.10/mm/page_alloc.c~ 2005-01-17 03:02:13.000000000 -0500 -+++ linux-2.6.10/mm/page_alloc.c 2005-01-17 03:02:59.000000000 -0500 -@@ -78,9 +78,9 @@ static void bad_page(const char *functio - { - printk(KERN_EMERG "Bad page state at %s (in process '%s', page %p)\n", - function, current->comm, page); -- printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d\n", -+ printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n", - (int)(2*sizeof(page_flags_t)), (unsigned long)page->flags, -- page->mapping, page_mapcount(page), page_count(page)); -+ page->mapping, page_mapcount(page), page_count(page), print_tainted()); - printk(KERN_EMERG "Backtrace:\n"); - dump_stack(); - printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"); ---- 1/include/asm-generic/bug.h 2004-12-24 16:34:01.000000000 -0500 -+++ 2/include/asm-generic/bug.h 2005-02-23 16:52:07.000000000 -0500 -@@ -6,14 +6,14 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-1740/include/asm-generic/bug.h linux-2000/include/asm-generic/bug.h +--- linux-1740/include/asm-generic/bug.h ++++ linux-2000/include/asm-generic/bug.h +@@ -4,16 +4,20 @@ + #include + #include ++#ifndef __ASSEMBLY__ ++extern const char *print_tainted(void); ++#endif ++ #ifndef HAVE_ARCH_BUG #define BUG() do { \ - printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ @@ -44,7 +24,7 @@ BUG(); \ } while (0) #endif -@@ -25,7 +25,7 @@ +@@ -25,7 +29,7 @@ #ifndef HAVE_ARCH_WARN_ON #define WARN_ON(condition) do { \ if (unlikely((condition)!=0)) { \ @@ -53,10 +33,10 @@ dump_stack(); \ } \ } while (0) - ---- linux-2.6.10/kernel/panic.c~ 2005-02-25 19:01:03.000000000 -0500 -+++ linux-2.6.10/kernel/panic.c 2005-02-25 19:01:17.000000000 -0500 -@@ -152,6 +152,7 @@ const char *print_tainted(void) +diff -urNp --exclude-from=/home/davej/.exclude linux-1740/kernel/panic.c linux-2000/kernel/panic.c +--- linux-1740/kernel/panic.c ++++ linux-2000/kernel/panic.c +@@ -151,6 +151,7 @@ const char *print_tainted(void) snprintf(buf, sizeof(buf), "Not tainted"); return(buf); } @@ -64,16 +44,32 @@ void add_taint(unsigned flag) { ---- linux-2.6.10/include/asm-generic/bug.h~ 2005-02-25 19:20:06.000000000 -0500 -+++ linux-2.6.10/include/asm-generic/bug.h 2005-02-25 19:20:26.000000000 -0500 -@@ -4,6 +4,10 @@ - #include - #include - -+#ifndef __ASSEMBLY__ -+extern const char *print_tainted(void); -+#endif -+ - #ifndef HAVE_ARCH_BUG - #define BUG() do { \ - printk("kernel BUG at %s:%d! (%s)\n", __FILE__, __LINE__, print_tainted()); \ +diff -urNp --exclude-from=/home/davej/.exclude linux-1740/mm/page_alloc.c linux-2000/mm/page_alloc.c +--- linux-1740/mm/page_alloc.c ++++ linux-2000/mm/page_alloc.c +@@ -97,9 +97,9 @@ static void bad_page(const char *functio + { + printk(KERN_EMERG "Bad page state at %s (in process '%s', page %p)\n", + function, current->comm, page); +- printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d\n", ++ printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n", + (int)(2*sizeof(page_flags_t)), (unsigned long)page->flags, +- page->mapping, page_mapcount(page), page_count(page)); ++ page->mapping, page_mapcount(page), page_count(page), print_tainted()); + printk(KERN_EMERG "Backtrace:\n"); + dump_stack(); + printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"); +diff -urNp --exclude-from=/home/davej/.exclude linux-1740/mm/slab.c linux-2000/mm/slab.c +--- linux-1740/mm/slab.c ++++ linux-2000/mm/slab.c +@@ -1053,8 +1053,8 @@ static void check_poison_obj(kmem_cache_ + /* Mismatch ! */ + /* Print header */ + if (lines == 0) { +- printk(KERN_ERR "Slab corruption: start=%p, len=%d\n", +- realobj, size); ++ printk(KERN_ERR "Slab corruption: (%s) start=%p, len=%d\n", ++ print_tainted(), realobj, size); + print_objinfo(cachep, objp, 0); + } + /* Hexdump the affected line */ linux-2.6.2-ppc64-build.patch: Makefile | 2 ++ 1 files changed, 2 insertions(+) Index: linux-2.6.2-ppc64-build.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.2-ppc64-build.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6.2-ppc64-build.patch 20 Sep 2004 09:17:42 -0000 1.9 +++ linux-2.6.2-ppc64-build.patch 22 Mar 2005 07:00:21 -0000 1.10 @@ -1,6 +1,7 @@ ---- linux-2.6.1/arch/ppc64/Makefile.orig 2004-01-28 16:54:40.000000000 -0500 -+++ linux-2.6.1/arch/ppc64/Makefile 2004-01-28 16:54:35.000000000 -0500 -@@ -45,6 +45,8 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-212/arch/ppc64/Makefile linux-300/arch/ppc64/Makefile +--- linux-2.6.1/arch/ppc64/Makefile ++++ linux-2.6.1/arch/ppc64/Makefile +@@ -79,6 +79,8 @@ core-$(CONFIG_XMON) += arch/ppc64/xmon/ drivers-$(CONFIG_OPROFILE) += arch/ppc64/oprofile/ boot := arch/ppc64/boot @@ -8,4 +9,4 @@ + cp vmlinux arch/ppc64/boot/bzImage boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd - boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm + boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd linux-2.6.3-crash-driver.patch: arch/i386/mm/init.c | 2 arch/ia64/kernel/ia64_ksyms.c | 3 arch/x86_64/mm/init.c | 3 drivers/char/Kconfig | 2 drivers/char/Makefile | 1 drivers/char/crash.c | 129 ++++++++++++++++++++++++++++++++++++++++++ include/asm-i386/crash.h | 75 ++++++++++++++++++++++++ include/asm-ia64/crash.h | 90 +++++++++++++++++++++++++++++ include/asm-x86_64/crash.h | 75 ++++++++++++++++++++++++ 9 files changed, 380 insertions(+) Index: linux-2.6.3-crash-driver.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-crash-driver.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6.3-crash-driver.patch 18 Mar 2005 21:54:20 -0000 1.4 +++ linux-2.6.3-crash-driver.patch 22 Mar 2005 07:00:21 -0000 1.5 @@ -1,28 +1,51 @@ -diff -urNp linux-2.6.3/drivers/char/Kconfig.orig linux-2.6.3/drivers/char/Kconfig ---- linux-2.6.3/drivers/char/Kconfig.orig 2004-03-03 13:59:21.000000000 -0500 -+++ linux-2.6.3/drivers/char/Kconfig 2004-03-03 14:00:56.000000000 -0500 -@@ -599,6 +599,8 @@ config PC9800_OLDLP_CONSOLE - bool "Support for console on line printer" - depends on PC9800_OLDLP +diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/i386/mm/init.c linux-1060/arch/i386/mm/init.c +--- linux-1050/arch/i386/mm/init.c ++++ linux-1060/arch/i386/mm/init.c +@@ -248,6 +248,8 @@ int devmem_is_allowed(unsigned long page + return 0; + } -+config CRASH -+ tristate "Crash Utility memory driver" ++EXPORT_SYMBOL_GPL(page_is_ram); ++ + #ifdef CONFIG_HIGHMEM + pte_t *kmap_pte; + pgprot_t kmap_prot; +diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/ia64/kernel/ia64_ksyms.c linux-1060/arch/ia64/kernel/ia64_ksyms.c +--- linux-1050/arch/ia64/kernel/ia64_ksyms.c ++++ linux-1060/arch/ia64/kernel/ia64_ksyms.c +@@ -106,6 +106,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs); + #include + EXPORT_SYMBOL(unw_init_running); - menu "Mice" ++#include ++EXPORT_SYMBOL_GPL(efi_mem_type); ++ + #ifdef ASM_SUPPORTED + # ifdef CONFIG_SMP + # if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3) +diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/x86_64/mm/init.c linux-1060/arch/x86_64/mm/init.c +--- linux-1050/arch/x86_64/mm/init.c ++++ linux-1060/arch/x86_64/mm/init.c +@@ -7,6 +7,7 @@ + */ ---- linux-2.6.11/drivers/char/Makefile~ 2005-03-18 15:02:00.000000000 -0500 -+++ linux-2.6.11/drivers/char/Makefile 2005-03-18 15:02:08.000000000 -0500 -@@ -88,6 +88,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/ - obj-$(CONFIG_IPMI_HANDLER) += ipmi/ + #include ++#include + #include + #include + #include +@@ -417,6 +418,8 @@ int devmem_is_allowed(unsigned long page + } - obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o -+obj-$(CONFIG_CRASH) += crash.o - obj-$(CONFIG_TCG_TPM) += tpm/ - # Files generated that shall be removed upon make clean - clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c -diff -urNp linux-2.6.3/drivers/char/crash.c.orig linux-2.6.3/drivers/char/crash.c ---- linux-2.6.3/drivers/char/crash.c.orig 2004-03-03 11:18:31.000000000 -0500 -+++ linux-2.6.3/drivers/char/crash.c 2004-03-03 11:18:47.000000000 -0500 + ++EXPORT_SYMBOL_GPL(page_is_ram); ++ + static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, + kcore_vsyscall; + +diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/crash.c linux-1060/drivers/char/crash.c +--- linux-1050/drivers/char/crash.c ++++ linux-1060/drivers/char/crash.c @@ -0,0 +1,129 @@ +/* + * linux/drivers/char/crash.c @@ -153,9 +176,32 @@ +module_exit(crash_cleanup_module); + +MODULE_LICENSE("GPL"); -diff -urNp linux-2.6.3/include/asm-i386/crash.h.orig linux-2.6.3/include/asm-i386/crash.h ---- linux-2.6.3/include/asm-i386/crash.h.orig 2004-03-03 14:29:03.000000000 -0500 -+++ linux-2.6.3/include/asm-i386/crash.h 2004-03-03 15:03:18.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/Kconfig linux-1060/drivers/char/Kconfig +--- linux-1050/drivers/char/Kconfig ++++ linux-1060/drivers/char/Kconfig +@@ -441,6 +441,8 @@ config LEGACY_PTYS + security. This option enables these legacy devices; on most + systems, it is safe to say N. + ++config CRASH ++ tristate "Crash Utility memory driver" + + config LEGACY_PTY_COUNT + int "Maximum number of legacy PTY in use" +diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/Makefile linux-1060/drivers/char/Makefile +--- linux-1050/drivers/char/Makefile ++++ linux-1060/drivers/char/Makefile +@@ -88,6 +88,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/ + obj-$(CONFIG_IPMI_HANDLER) += ipmi/ + + obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o ++obj-$(CONFIG_CRASH) += crash.o + obj-$(CONFIG_TCG_TPM) += tpm/ + # Files generated that shall be removed upon make clean + clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c +diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-i386/crash.h linux-1060/include/asm-i386/crash.h +--- linux-1050/include/asm-i386/crash.h ++++ linux-1060/include/asm-i386/crash.h @@ -0,0 +1,75 @@ +#ifndef _ASM_I386_CRASH_H +#define _ASM_I386_CRASH_H @@ -232,22 +278,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_I386_CRASH_H */ -diff -urNp linux-2.6.3/arch/ia64/kernel/ia64_ksyms.c.orig linux-2.6.3/arch/ia64/kernel/ia64_ksyms.c ---- linux-2.6.3/arch/ia64/kernel/ia64_ksyms.c.orig 2004-03-04 15:19:49.000000000 -0500 -+++ linux-2.6.3/arch/ia64/kernel/ia64_ksyms.c 2004-03-04 15:20:56.000000000 -0500 -@@ -106,6 +106,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs); - #include - EXPORT_SYMBOL(unw_init_running); - -+#include -+EXPORT_SYMBOL_GPL(efi_mem_type); -+ - #ifdef ASM_SUPPORTED - # ifdef CONFIG_SMP - # if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3) -diff -urNp linux-2.6.3/include/asm-ia64/crash.h.orig linux-2.6.3/include/asm-ia64/crash.h ---- linux-2.6.3/include/asm-ia64/crash.h.orig 2004-03-04 15:17:45.000000000 -0500 -+++ linux-2.6.3/include/asm-ia64/crash.h 2004-03-04 15:17:32.000000000 -0500 +diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-ia64/crash.h linux-1060/include/asm-ia64/crash.h +--- linux-1050/include/asm-ia64/crash.h ++++ linux-1060/include/asm-ia64/crash.h @@ -0,0 +1,90 @@ +#ifndef _ASM_IA64_CRASH_H +#define _ASM_IA64_CRASH_H @@ -339,20 +372,9 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_IA64_CRASH_H */ ---- linux-2.6.4/arch/i386/mm/init.c~ 2004-03-24 11:01:18.869200376 +0100 -+++ linux-2.6.4/arch/i386/mm/init.c 2004-03-24 11:01:18.870200224 +0100 -@@ -94,6 +94,8 @@ - return 0; - } - -+EXPORT_SYMBOL_GPL(page_is_ram); -+ - #ifdef CONFIG_HIGHMEM - pte_t *kmap_pte; - pgprot_t kmap_prot; - ---- linux-2.6.7/include/asm-x86_64/crash.h.orig 2004-07-01 20:26:12.872610584 -0400 -+++ linux-2.6.7/include/asm-x86_64/crash.h 2004-07-01 20:25:08.256433736 -0400 +diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-x86_64/crash.h linux-1060/include/asm-x86_64/crash.h +--- linux-1050/include/asm-x86_64/crash.h ++++ linux-1060/include/asm-x86_64/crash.h @@ -0,0 +1,75 @@ +#ifndef _ASM_X86_64_CRASH_H +#define _ASM_X86_64_CRASH_H @@ -429,22 +451,3 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_X86_64_CRASH_H */ ---- linux-2.6.7/arch/x86_64/mm/init.c.orig 2004-07-02 17:57:15.734075376 -0400 -+++ linux-2.6.7/arch/x86_64/mm/init.c 2004-07-02 17:58:09.486903704 -0400 -@@ -7,6 +7,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -396,6 +397,8 @@ - return 0; - } - -+EXPORT_SYMBOL_GPL(page_is_ram); -+ - static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, - kcore_vsyscall; - linux-2.6.3-ia64-build.patch: arch/ia64/Kconfig | 3 --- arch/ia64/Makefile | 4 ++++ include/asm-ia64/sn/pda.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) Index: linux-2.6.3-ia64-build.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-ia64-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.3-ia64-build.patch 9 Sep 2004 14:08:48 -0000 1.1 +++ linux-2.6.3-ia64-build.patch 22 Mar 2005 07:00:21 -0000 1.2 @@ -1,39 +1,34 @@ ---- linux-2.6.3/arch/ia64/Makefile.bak Mon Mar 8 11:06:25 2004 -+++ linux-2.6.3/arch/ia64/Makefile Mon Mar 8 11:06:29 2004 -@@ -73,6 +73,10 @@ boot := arch/ia64/hp/sim/boot - - all: compressed unwcheck - -+bzImage: compressed -+ mkdir -p arch/ia64/boot -+ cp vmlinux.gz arch/ia64/boot/bzImage -+ - compressed: vmlinux.gz - - vmlinux.gz: vmlinux ---- linux-2.6.4/arch/ia64/Kconfig~ 2004-03-12 07:53:28.202957944 +0100 -+++ linux-2.6.4/arch/ia64/Kconfig 2004-03-12 07:53:28.202957944 +0100 -@@ -62,8 +62,6 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-302/arch/ia64/Kconfig linux-400/arch/ia64/Kconfig +--- linux-302/arch/ia64/Kconfig ++++ linux-400/arch/ia64/Kconfig +@@ -52,10 +52,7 @@ choice config IA64_GENERIC bool "generic" - select NUMA - select ACPI_NUMA select VIRTUAL_MEM_MAP - select DISCONTIGMEM - help ---- linux-2.6.4/arch/ia64/Kconfig~ 2004-03-12 08:13:40.064726952 +0100 -+++ linux-2.6.4/arch/ia64/Kconfig 2004-03-12 08:13:40.064726952 +0100 -@@ -63,7 +63,6 @@ - config IA64_GENERIC - bool "generic" - select VIRTUAL_MEM_MAP - select DISCONTIGMEM help This selects the system type of your hardware. A "generic" kernel will run on any supported IA-64 system. However, if you configure ---- linux-2.6.4/include/asm-ia64/sn/pda.h~ 2004-03-12 09:01:47.302800048 +0100 -+++ linux-2.6.4/include/asm-ia64/sn/pda.h 2004-03-12 09:01:47.302800048 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-302/arch/ia64/Makefile linux-400/arch/ia64/Makefile +--- linux-302/arch/ia64/Makefile ++++ linux-400/arch/ia64/Makefile +@@ -71,6 +71,10 @@ boot := arch/ia64/hp/sim/boot + + all: compressed unwcheck + ++bzImage: compressed ++ mkdir -p arch/ia64/boot ++ cp vmlinux.gz arch/ia64/boot/bzImage ++ + compressed: vmlinux.gz + + vmlinux.gz: vmlinux +diff -urNp --exclude-from=/home/davej/.exclude linux-302/include/asm-ia64/sn/pda.h linux-400/include/asm-ia64/sn/pda.h +--- linux-302/include/asm-ia64/sn/pda.h ++++ linux-400/include/asm-ia64/sn/pda.h @@ -9,11 +9,11 @@ #define _ASM_IA64_SN_PDA_H linux-2.6.3-printopen.patch: fs/exec.c | 10 ++++++++++ fs/namei.c | 9 +++++++++ fs/open.c | 13 +++++++++++++ include/linux/jiffies.h | 2 +- 4 files changed, 33 insertions(+), 1 deletion(-) Index: linux-2.6.3-printopen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-printopen.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6.3-printopen.patch 22 Mar 2005 05:38:27 -0000 1.5 +++ linux-2.6.3-printopen.patch 22 Mar 2005 07:00:21 -0000 1.6 @@ -1,7 +1,27 @@ -diff -purN linux-2.6.3/fs/namei.c linux/fs/namei.c ---- linux-2.6.3/fs/namei.c 2004-03-04 17:13:55.100154000 +0100 -+++ linux/fs/namei.c 2004-03-04 17:17:24.510154000 +0100 -@@ -350,6 +350,15 @@ static struct dentry * real_lookup(struc +diff -urNp --exclude-from=/home/davej/.exclude linux-2100/fs/exec.c linux-2999/fs/exec.c +--- linux-2100/fs/exec.c ++++ linux-2999/fs/exec.c +@@ -1144,6 +1144,16 @@ int do_execve(char * filename, + + sched_exec(); + ++ { ++ static unsigned long prev_jiffies; ++ static char buf[1024]; ++ char *p; ++ p = d_path(file->f_dentry, file->f_vfsmnt, buf, 1023); ++ if (jiffies < 180 * HZ) ++ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s exec'd %s\n", jiffies / HZ, jiffies+(jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, current->comm, p); ++ prev_jiffies = jiffies; ++ } ++ + bprm->p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *); + + bprm->file = file; +diff -urNp --exclude-from=/home/davej/.exclude linux-2100/fs/namei.c linux-2999/fs/namei.c +--- linux-2100/fs/namei.c ++++ linux-2999/fs/namei.c +@@ -392,6 +392,15 @@ static struct dentry * real_lookup(struc { struct dentry * result; struct inode *dir = parent->d_inode; @@ -17,65 +37,18 @@ down(&dir->i_sem); /* -diff -purN linux-2.6.3/fs/open.c linux/fs/open.c ---- linux-2.6.3/fs/open.c 2004-03-04 17:13:55.210154000 +0100 -+++ linux/fs/open.c 2004-03-04 17:18:15.220154000 +0100 -@@ -929,6 +929,7 @@ asmlinkage long sys_open(const char __us - { - char * tmp; - int fd, error; -+ static unsigned long prev_jiffies; - - #if BITS_PER_LONG != 32 - flags |= O_LARGEFILE; -@@ -936,6 +937,12 @@ asmlinkage long sys_open(const char __us +diff -urNp --exclude-from=/home/davej/.exclude linux-2100/fs/open.c linux-2999/fs/open.c +--- linux-2100/fs/open.c ++++ linux-2999/fs/open.c +@@ -945,6 +945,7 @@ asmlinkage long sys_open(const char __us tmp = getname(filename); fd = PTR_ERR(tmp); if (!IS_ERR(tmp)) { -+ if (jiffies < 80 * HZ) -+ printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ, -+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, -+ tmp); -+ prev_jiffies = jiffies; + fd = get_unused_fd(); if (fd >= 0) { struct file *f = filp_open(tmp, flags, mode); ---- linux-2.6.11/include/linux/jiffies.h~ 2005-03-21 21:26:11.000000000 -0500 -+++ linux-2.6.11/include/linux/jiffies.h 2005-03-21 21:26:26.000000000 -0500 -@@ -122,7 +122,7 @@ static inline u64 get_jiffies_64(void) - * Have the 32 bit jiffies value wrap 5 minutes after boot - * so jiffies wrap bugs show up earlier. - */ --#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ)) -+#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (0*HZ)) - - /* - * Change timeval to jiffies, trying to avoid the -diff -purN linux-2.6.3/fs.org/open.c linux-2.6.3/fs/open.c ---- linux-2.6.3/fs.org/open.c 2004-03-05 09:57:02.055714000 +0100 -+++ linux-2.6.3/fs/open.c 2004-03-05 10:01:10.055714000 +0100 -@@ -929,7 +929,6 @@ asmlinkage long sys_open(const char __us - { - char * tmp; - int fd, error; -- static unsigned long prev_jiffies; - - #if BITS_PER_LONG != 32 - flags |= O_LARGEFILE; -@@ -937,11 +936,6 @@ asmlinkage long sys_open(const char __us - tmp = getname(filename); - fd = PTR_ERR(tmp); - if (!IS_ERR(tmp)) { -- if (jiffies < 80 * HZ) -- printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ, -- (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, -- tmp); -- prev_jiffies = jiffies; - - fd = get_unused_fd(); - if (fd >= 0) { -@@ -950,6 +944,18 @@ asmlinkage long sys_open(const char __us +@@ -952,6 +953,18 @@ asmlinkage long sys_open(const char __us if (IS_ERR(f)) goto out_error; fd_install(fd, f); @@ -94,22 +67,15 @@ } out: putname(tmp); ---- linux-2.6.11/fs/exec.c~ 2005-03-21 22:02:08.000000000 -0500 -+++ linux-2.6.11/fs/exec.c 2005-03-21 22:12:16.000000000 -0500 -@@ -1157,6 +1157,16 @@ int do_execve(char * filename, - - sched_exec(); - -+ { -+ static unsigned long prev_jiffies; -+ static char buf[1024]; -+ char *p; -+ p = d_path(file->f_dentry, file->f_vfsmnt, buf, 1023); -+ if (jiffies < 180 * HZ) -+ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s exec'd %s\n", jiffies / HZ, jiffies+(jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, current->comm, p); -+ prev_jiffies = jiffies; -+ } -+ - bprm->p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *); +diff -urNp --exclude-from=/home/davej/.exclude linux-2100/include/linux/jiffies.h linux-2999/include/linux/jiffies.h +--- linux-2100/include/linux/jiffies.h ++++ linux-2999/include/linux/jiffies.h +@@ -122,7 +122,7 @@ static inline u64 get_jiffies_64(void) + * Have the 32 bit jiffies value wrap 5 minutes after boot + * so jiffies wrap bugs show up earlier. + */ +-#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ)) ++#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (0*HZ)) - bprm->file = file; + /* + * Change timeval to jiffies, trying to avoid the linux-2.6.3-sparc-addbzimage.patch: sparc/Makefile | 3 +++ sparc64/Makefile | 3 +++ 2 files changed, 6 insertions(+) Index: linux-2.6.3-sparc-addbzimage.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.3-sparc-addbzimage.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.3-sparc-addbzimage.patch 9 Sep 2004 13:53:35 -0000 1.1 +++ linux-2.6.3-sparc-addbzimage.patch 22 Mar 2005 07:00:21 -0000 1.2 @@ -1,6 +1,7 @@ ---- linux-2.6.3/arch/sparc/Makefile.BAD 2004-03-07 10:16:47.000000000 -0500 -+++ linux-2.6.3/arch/sparc/Makefile 2004-03-07 10:20:48.000000000 -0500 -@@ -52,6 +52,9 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-503/arch/sparc/Makefile linux-600/arch/sparc/Makefile +--- linux-503/arch/sparc/Makefile ++++ linux-600/arch/sparc/Makefile +@@ -53,6 +53,9 @@ all: image boot := arch/sparc/boot @@ -10,9 +11,10 @@ image tftpboot.img: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ ---- linux-2.6.3/arch/sparc64/Makefile.BAD 2004-03-07 10:17:45.000000000 -0500 -+++ linux-2.6.3/arch/sparc64/Makefile 2004-03-07 10:19:03.000000000 -0500 -@@ -68,6 +68,9 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-503/arch/sparc64/Makefile linux-600/arch/sparc64/Makefile +--- linux-503/arch/sparc64/Makefile ++++ linux-600/arch/sparc64/Makefile +@@ -69,6 +69,9 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc boot := arch/sparc64/boot linux-2.6.4-stackusage.patch: debug.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.4-stackusage.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.4-stackusage.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6.4-stackusage.patch 8 Feb 2005 17:57:37 -0000 1.5 +++ linux-2.6.4-stackusage.patch 22 Mar 2005 07:00:21 -0000 1.6 @@ -1,4 +1,4 @@ -diff -urNp linux-1010/fs/befs/debug.c linux-1020/fs/befs/debug.c +diff -urNp --exclude-from=/home/davej/.exclude linux-1010/fs/befs/debug.c linux-1020/fs/befs/debug.c --- linux-1010/fs/befs/debug.c +++ linux-1020/fs/befs/debug.c @@ -23,7 +23,7 @@ @@ -10,5 +10,3 @@ void befs_error(const struct super_block *sb, const char *fmt, ...) - - linux-2.6.7-modsign-core.patch: include/linux/module.h | 3 init/Kconfig | 16 + kernel/Makefile | 3 kernel/module-verify-sig.c | 442 +++++++++++++++++++++++++++++++++++++++++++++ kernel/module-verify.c | 340 ++++++++++++++++++++++++++++++++++ kernel/module-verify.h | 37 +++ kernel/module.c | 19 + 7 files changed, 856 insertions(+), 4 deletions(-) Index: linux-2.6.7-modsign-core.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.7-modsign-core.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6.7-modsign-core.patch 3 Dec 2004 08:35:50 -0000 1.7 +++ linux-2.6.7-modsign-core.patch 22 Mar 2005 07:00:21 -0000 1.8 @@ -1,7 +1,7 @@ -diff -uNrp linux-2.6.9-rc4-mm1/include/linux/module.h linux-2.6.9-rc4-mm1-modsign/include/linux/module.h ---- linux-2.6.9-rc4-mm1/include/linux/module.h 2004-10-12 21:52:21.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/linux/module.h 2004-10-13 17:18:41.000000000 +0100 -@@ -289,6 +289,9 @@ struct module +diff -urNp --exclude-from=/home/davej/.exclude linux-811/include/linux/module.h linux-900/include/linux/module.h +--- linux-811/include/linux/module.h ++++ linux-900/include/linux/module.h +@@ -277,6 +277,9 @@ struct module /* Am I GPL-compatible */ int license_gplok; @@ -11,10 +11,10 @@ #ifdef CONFIG_MODULE_UNLOAD /* Reference counts */ -diff -uNrp linux-2.6.9-rc4-mm1/init/Kconfig linux-2.6.9-rc4-mm1-modsign/init/Kconfig ---- linux-2.6.9-rc4-mm1/init/Kconfig 2004-10-12 21:52:21.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/init/Kconfig 2004-10-13 17:57:49.000000000 +0100 -@@ -412,6 +412,22 @@ config MODULE_SRCVERSION_ALL +diff -urNp --exclude-from=/home/davej/.exclude linux-811/init/Kconfig linux-900/init/Kconfig +--- linux-811/init/Kconfig ++++ linux-900/init/Kconfig +@@ -434,6 +434,22 @@ config MODULE_SRCVERSION_ALL the version). With this option, such a "srcversion" field will be created for all modules. If unsure, say N. @@ -37,9 +37,9 @@ config KMOD bool "Automatic kernel module loading" depends on MODULES -diff -uNrp linux-2.6.9-rc4-mm1/kernel/Makefile linux-2.6.9-rc4-mm1-modsign/kernel/Makefile ---- linux-2.6.9-rc4-mm1/kernel/Makefile 2004-10-12 21:52:22.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/kernel/Makefile 2004-10-13 17:37:53.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/Makefile linux-900/kernel/Makefile +--- linux-811/kernel/Makefile ++++ linux-900/kernel/Makefile @@ -13,7 +13,8 @@ obj-$(CONFIG_FUTEX) += futex.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o spinlock.o @@ -50,9 +50,9 @@ obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PM) += power/ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o -diff -uNrp linux-2.6.9-rc4-mm1/kernel/module.c linux-2.6.9-rc4-mm1-modsign/kernel/module.c ---- linux-2.6.9-rc4-mm1/kernel/module.c 2004-10-12 21:52:22.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/kernel/module.c 2004-10-13 21:26:30.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module.c linux-900/kernel/module.c +--- linux-811/kernel/module.c ++++ linux-900/kernel/module.c @@ -38,6 +38,7 @@ #include #include @@ -61,7 +61,7 @@ #if 0 #define DEBUGP printk -@@ -1511,6 +1512,7 @@ static struct module *load_module(void _ +@@ -1413,6 +1414,7 @@ static struct module *load_module(void _ long err = 0; void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */ struct exception_table_entry *extable; @@ -69,7 +69,7 @@ DEBUGP("load_module: umod=%p, len=%lu, uargs=%p\n", umod, len, uargs); -@@ -1536,8 +1538,13 @@ static struct module *load_module(void _ +@@ -1438,8 +1440,13 @@ static struct module *load_module(void _ goto free_hdr; } @@ -85,7 +85,7 @@ /* Convenience variables */ sechdrs = (void *)hdr + hdr->e_shoff; -@@ -1575,6 +1582,7 @@ static struct module *load_module(void _ +@@ -1476,6 +1483,7 @@ static struct module *load_module(void _ goto free_hdr; } mod = (void *)sechdrs[modindex].sh_addr; @@ -93,7 +93,7 @@ if (symindex == 0) { printk(KERN_WARNING "%s: module has no symbols (stripped?)\n", -@@ -2153,8 +2161,13 @@ void print_modules(void) +@@ -2078,8 +2086,13 @@ void print_modules(void) struct module *mod; printk("Modules linked in:"); @@ -108,9 +108,9 @@ printk("\n"); } -diff -uNrp linux-2.6.9-rc4-mm1/kernel/module-verify.c linux-2.6.9-rc4-mm1-modsign/kernel/module-verify.c ---- linux-2.6.9-rc4-mm1/kernel/module-verify.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/kernel/module-verify.c 2004-10-14 12:00:26.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify.c linux-900/kernel/module-verify.c +--- linux-811/kernel/module-verify.c ++++ linux-900/kernel/module-verify.c @@ -0,0 +1,340 @@ +/* module-verify.c: module verifier + * @@ -452,9 +452,9 @@ + return -ELIBBAD; + +} /* end module_verify_elf() */ -diff -uNrp linux-2.6.9-rc4-mm1/kernel/module-verify.h linux-2.6.9-rc4-mm1-modsign/kernel/module-verify.h ---- linux-2.6.9-rc4-mm1/kernel/module-verify.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/kernel/module-verify.h 2004-10-13 21:46:17.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify.h linux-900/kernel/module-verify.h +--- linux-811/kernel/module-verify.h ++++ linux-900/kernel/module-verify.h @@ -0,0 +1,37 @@ +/* module-verify.h: module verification definitions + * @@ -493,9 +493,9 @@ + +extern int module_verify(const Elf_Ehdr *hdr, size_t size); +extern int module_verify_signature(struct module_verify_data *mvdata); -diff -uNrp linux-2.6.9-rc4-mm1/kernel/module-verify-sig.c linux-2.6.9-rc4-mm1-modsign/kernel/module-verify-sig.c ---- linux-2.6.9-rc4-mm1/kernel/module-verify-sig.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/kernel/module-verify-sig.c 2004-10-13 21:52:06.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify-sig.c linux-900/kernel/module-verify-sig.c +--- linux-811/kernel/module-verify-sig.c ++++ linux-900/kernel/module-verify-sig.c @@ -0,0 +1,442 @@ +/* module-verify-sig.c: module signature checker + * linux-2.6.7-modsign-crypto.patch: crypto/Kconfig | 19 +++++++++++++++++++ crypto/Makefile | 3 +++ crypto/api.c | 16 ++++++++++++++-- include/linux/crypto.h | 4 ++++ 4 files changed, 40 insertions(+), 2 deletions(-) Index: linux-2.6.7-modsign-crypto.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.7-modsign-crypto.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.7-modsign-crypto.patch 31 Dec 2004 03:37:26 -0000 1.3 +++ linux-2.6.7-modsign-crypto.patch 22 Mar 2005 07:00:21 -0000 1.4 @@ -1,6 +1,6 @@ -diff -urNp linux-600/crypto/api.c linux-601/crypto/api.c ---- linux-600/crypto/api.c -+++ linux-601/crypto/api.c +diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/api.c linux-901/crypto/api.c +--- linux-900/crypto/api.c ++++ linux-901/crypto/api.c @@ -117,12 +117,19 @@ static void crypto_exit_ops(struct crypt } } @@ -34,10 +34,11 @@ + void crypto_free_tfm(struct crypto_tfm *tfm) { - crypto_exit_ops(tfm); ---- linux-2.6.10/crypto/Kconfig~ 2004-12-30 21:52:28.152504632 -0500 -+++ linux-2.6.10/crypto/Kconfig 2004-12-30 21:53:32.612705192 -0500 -@@ -274,6 +274,25 @@ config CRYPTO_TEST + struct crypto_alg *alg = tfm->__crt_alg; +diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/Kconfig linux-901/crypto/Kconfig +--- linux-900/crypto/Kconfig ++++ linux-901/crypto/Kconfig +@@ -287,6 +287,25 @@ config CRYPTO_TEST help Quick & dirty crypto test module. @@ -63,20 +64,20 @@ source "drivers/crypto/Kconfig" endmenu -diff -urNp linux-600/crypto/Makefile linux-601/crypto/Makefile ---- linux-600/crypto/Makefile -+++ linux-601/crypto/Makefile -@@ -28,3 +28,6 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich +diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/Makefile linux-901/crypto/Makefile +--- linux-900/crypto/Makefile ++++ linux-901/crypto/Makefile +@@ -32,3 +32,6 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o + +obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/ +obj-$(CONFIG_CRYPTO_MPILIB) += mpi/ -diff -urNp linux-600/include/linux/crypto.h linux-601/include/linux/crypto.h ---- linux-600/include/linux/crypto.h -+++ linux-601/include/linux/crypto.h -@@ -202,10 +202,14 @@ struct crypto_tfm { +diff -urNp --exclude-from=/home/davej/.exclude linux-900/include/linux/crypto.h linux-901/include/linux/crypto.h +--- linux-900/include/linux/crypto.h ++++ linux-901/include/linux/crypto.h +@@ -213,10 +213,14 @@ struct crypto_tfm { * will then attempt to load a module of the same name or alias. A refcount * is grabbed on the algorithm which is then associated with the new transform. * linux-2.6.7-modsign-include.patch: asm-alpha/module.h | 3 +++ asm-arm/module.h | 5 +++++ asm-cris/module.h | 5 +++++ asm-h8300/module.h | 5 +++++ asm-i386/module.h | 5 +++++ asm-ia64/module.h | 5 +++++ asm-m32r/module.h | 5 +++++ asm-m68k/module.h | 5 +++++ asm-mips/module.h | 10 ++++++++++ asm-parisc/module.h | 8 ++++++++ asm-ppc/module.h | 5 +++++ asm-ppc64/module.h | 5 +++++ asm-s390/module.h | 3 +++ asm-sh/module.h | 5 +++++ asm-sparc/module.h | 5 +++++ asm-sparc64/module.h | 5 +++++ asm-um/module-i386.h | 4 ++++ asm-v850/module.h | 5 +++++ asm-x86_64/module.h | 5 +++++ 19 files changed, 98 insertions(+) Index: linux-2.6.7-modsign-include.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.7-modsign-include.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.7-modsign-include.patch 15 Oct 2004 00:15:45 -0000 1.1 +++ linux-2.6.7-modsign-include.patch 22 Mar 2005 07:00:21 -0000 1.2 @@ -1,6 +1,6 @@ -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-alpha/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-alpha/module.h ---- linux-2.6.9-rc4-mm1/include/asm-alpha/module.h 2004-06-18 13:42:21.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-alpha/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-alpha/module.h linux-905/include/asm-alpha/module.h +--- linux-904/include/asm-alpha/module.h ++++ linux-905/include/asm-alpha/module.h @@ -6,6 +6,7 @@ struct mod_arch_specific unsigned int gotsecindex; }; @@ -18,9 +18,9 @@ #define ARCH_SHF_SMALL SHF_ALPHA_GPREL -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-arm/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-arm/module.h ---- linux-2.6.9-rc4-mm1/include/asm-arm/module.h 2004-06-18 13:42:20.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-arm/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-arm/module.h linux-905/include/asm-arm/module.h +--- linux-904/include/asm-arm/module.h ++++ linux-905/include/asm-arm/module.h @@ -6,9 +6,14 @@ struct mod_arch_specific int foo; }; @@ -36,9 +36,9 @@ /* * Include the ARM architecture version. -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-cris/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-cris/module.h ---- linux-2.6.9-rc4-mm1/include/asm-cris/module.h 2004-06-18 13:42:22.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-cris/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-cris/module.h linux-905/include/asm-cris/module.h +--- linux-904/include/asm-cris/module.h ++++ linux-905/include/asm-cris/module.h @@ -3,7 +3,12 @@ /* cris is simple */ struct mod_arch_specific { }; @@ -52,9 +52,9 @@ +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_CRIS_MODULE_H */ -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-h8300/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-h8300/module.h ---- linux-2.6.9-rc4-mm1/include/asm-h8300/module.h 2004-06-18 13:44:05.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-h8300/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-h8300/module.h linux-905/include/asm-h8300/module.h +--- linux-904/include/asm-h8300/module.h ++++ linux-905/include/asm-h8300/module.h @@ -4,9 +4,14 @@ * This file contains the H8/300 architecture specific module code. */ @@ -70,9 +70,9 @@ #define MODULE_SYMBOL_PREFIX "_" -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-i386/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-i386/module.h ---- linux-2.6.9-rc4-mm1/include/asm-i386/module.h 2004-06-18 13:42:21.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-i386/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-i386/module.h linux-905/include/asm-i386/module.h +--- linux-904/include/asm-i386/module.h ++++ linux-905/include/asm-i386/module.h @@ -6,9 +6,14 @@ struct mod_arch_specific { }; @@ -88,9 +88,9 @@ #ifdef CONFIG_M386 #define MODULE_PROC_FAMILY "386 " -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-ia64/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-ia64/module.h ---- linux-2.6.9-rc4-mm1/include/asm-ia64/module.h 2004-06-18 13:42:14.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-ia64/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-ia64/module.h linux-905/include/asm-ia64/module.h +--- linux-904/include/asm-ia64/module.h ++++ linux-905/include/asm-ia64/module.h @@ -23,9 +23,14 @@ struct mod_arch_specific { unsigned int next_got_entry; /* index of next available got entry */ }; @@ -106,9 +106,9 @@ #define MODULE_PROC_FAMILY "ia64" #define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-m32r/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-m32r/module.h ---- linux-2.6.9-rc4-mm1/include/asm-m32r/module.h 2004-10-12 21:48:43.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-m32r/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-m32r/module.h linux-905/include/asm-m32r/module.h +--- linux-904/include/asm-m32r/module.h ++++ linux-905/include/asm-m32r/module.h @@ -5,9 +5,14 @@ struct mod_arch_specific { }; @@ -124,9 +124,9 @@ #endif /* _ASM_M32R_MODULE_H */ -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-m68k/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-m68k/module.h ---- linux-2.6.9-rc4-mm1/include/asm-m68k/module.h 2004-06-18 13:42:17.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-m68k/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-m68k/module.h linux-905/include/asm-m68k/module.h +--- linux-904/include/asm-m68k/module.h ++++ linux-905/include/asm-m68k/module.h @@ -1,7 +1,12 @@ #ifndef _ASM_M68K_MODULE_H #define _ASM_M68K_MODULE_H @@ -140,9 +140,9 @@ +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_M68K_MODULE_H */ -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-mips/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-mips/module.h ---- linux-2.6.9-rc4-mm1/include/asm-mips/module.h 2004-09-16 12:06:18.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-mips/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-mips/module.h linux-905/include/asm-mips/module.h +--- linux-904/include/asm-mips/module.h ++++ linux-905/include/asm-mips/module.h @@ -27,17 +27,27 @@ typedef struct #ifdef CONFIG_MIPS32 @@ -171,9 +171,9 @@ #endif -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-parisc/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-parisc/module.h ---- linux-2.6.9-rc4-mm1/include/asm-parisc/module.h 2004-06-18 13:42:13.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-parisc/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-parisc/module.h linux-905/include/asm-parisc/module.h +--- linux-904/include/asm-parisc/module.h ++++ linux-905/include/asm-parisc/module.h @@ -4,17 +4,25 @@ * This file contains the parisc architecture specific module code. */ @@ -199,10 +199,10 @@ +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif - struct mod_arch_specific -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-ppc/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-ppc/module.h ---- linux-2.6.9-rc4-mm1/include/asm-ppc/module.h 2004-06-18 13:42:17.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-ppc/module.h 2004-10-13 17:20:14.000000000 +0100 + struct unwind_table; +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-ppc/module.h linux-905/include/asm-ppc/module.h +--- linux-904/include/asm-ppc/module.h ++++ linux-905/include/asm-ppc/module.h @@ -32,9 +32,14 @@ struct mod_arch_specific extern struct bug_entry *module_find_bug(unsigned long bugaddr); @@ -218,9 +218,9 @@ /* Make empty sections for module_frob_arch_sections to expand. */ #ifdef MODULE -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-ppc64/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-ppc64/module.h ---- linux-2.6.9-rc4-mm1/include/asm-ppc64/module.h 2004-06-18 13:42:05.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-ppc64/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-ppc64/module.h linux-905/include/asm-ppc64/module.h +--- linux-904/include/asm-ppc64/module.h ++++ linux-905/include/asm-ppc64/module.h @@ -20,9 +20,14 @@ struct mod_arch_specific extern struct bug_entry *module_find_bug(unsigned long bugaddr); @@ -236,9 +236,9 @@ /* Make empty section for module_frob_arch_sections to expand. */ #ifdef MODULE -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-s390/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-s390/module.h ---- linux-2.6.9-rc4-mm1/include/asm-s390/module.h 2004-06-18 13:42:22.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-s390/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-s390/module.h linux-905/include/asm-s390/module.h +--- linux-904/include/asm-s390/module.h ++++ linux-905/include/asm-s390/module.h @@ -29,14 +29,17 @@ struct mod_arch_specific }; @@ -257,9 +257,9 @@ #define Elf_Rela ElfW(Rela) #define Elf_Shdr ElfW(Shdr) #define Elf_Sym ElfW(Sym) -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-sh/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-sh/module.h ---- linux-2.6.9-rc4-mm1/include/asm-sh/module.h 2004-06-18 13:42:24.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-sh/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sh/module.h linux-905/include/asm-sh/module.h +--- linux-904/include/asm-sh/module.h ++++ linux-905/include/asm-sh/module.h @@ -9,9 +9,14 @@ struct mod_arch_specific { /* Nothing to see here .. */ }; @@ -275,9 +275,9 @@ #ifdef CONFIG_CPU_LITTLE_ENDIAN # ifdef CONFIG_CPU_SH2 -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-sparc/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-sparc/module.h ---- linux-2.6.9-rc4-mm1/include/asm-sparc/module.h 2004-06-18 13:42:20.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-sparc/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sparc/module.h linux-905/include/asm-sparc/module.h +--- linux-904/include/asm-sparc/module.h ++++ linux-905/include/asm-sparc/module.h @@ -1,7 +1,12 @@ #ifndef _ASM_SPARC_MODULE_H #define _ASM_SPARC_MODULE_H @@ -291,9 +291,9 @@ +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_SPARC_MODULE_H */ -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-sparc64/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-sparc64/module.h ---- linux-2.6.9-rc4-mm1/include/asm-sparc64/module.h 2004-06-18 13:42:23.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-sparc64/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sparc64/module.h linux-905/include/asm-sparc64/module.h +--- linux-904/include/asm-sparc64/module.h ++++ linux-905/include/asm-sparc64/module.h @@ -1,7 +1,12 @@ #ifndef _ASM_SPARC64_MODULE_H #define _ASM_SPARC64_MODULE_H @@ -307,9 +307,9 @@ +#define ELF_R_TYPE(X) ELF64_R_TYPE(X) +#define ELF_R_SYM(X) ELF64_R_SYM(X) #endif /* _ASM_SPARC64_MODULE_H */ -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-um/module-i386.h linux-2.6.9-rc4-mm1-modsign/include/asm-um/module-i386.h ---- linux-2.6.9-rc4-mm1/include/asm-um/module-i386.h 2004-10-12 21:48:44.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-um/module-i386.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-um/module-i386.h linux-905/include/asm-um/module-i386.h +--- linux-904/include/asm-um/module-i386.h ++++ linux-905/include/asm-um/module-i386.h @@ -9,5 +9,9 @@ struct mod_arch_specific #define Elf_Shdr Elf32_Shdr #define Elf_Sym Elf32_Sym @@ -320,9 +320,9 @@ +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-v850/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-v850/module.h ---- linux-2.6.9-rc4-mm1/include/asm-v850/module.h 2004-06-18 13:42:23.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-v850/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-v850/module.h linux-905/include/asm-v850/module.h +--- linux-904/include/asm-v850/module.h ++++ linux-905/include/asm-v850/module.h @@ -31,9 +31,14 @@ struct mod_arch_specific unsigned int core_plt_section, init_plt_section; }; @@ -338,9 +338,9 @@ /* Make empty sections for module_frob_arch_sections to expand. */ #ifdef MODULE -diff -uNrp linux-2.6.9-rc4-mm1/include/asm-x86_64/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-x86_64/module.h ---- linux-2.6.9-rc4-mm1/include/asm-x86_64/module.h 2004-06-18 13:42:14.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/include/asm-x86_64/module.h 2004-10-13 17:20:14.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-x86_64/module.h linux-905/include/asm-x86_64/module.h +--- linux-904/include/asm-x86_64/module.h ++++ linux-905/include/asm-x86_64/module.h @@ -3,8 +3,13 @@ struct mod_arch_specific {}; linux-2.6.7-modsign-ksign.patch: crypto/digest.c | 8 crypto/signature/Makefile | 10 crypto/signature/dsa.c | 98 +++++ crypto/signature/key.h | 7 crypto/signature/ksign-keyring.c | 112 ++++++ crypto/signature/ksign-parse.c | 609 +++++++++++++++++++++++++++++++++++++ crypto/signature/ksign-publickey.c | 19 + crypto/signature/ksign.c | 179 ++++++++++ crypto/signature/local.h | 163 +++++++++ include/linux/crypto.h | 10 include/linux/crypto/ksign.h | 22 + 11 files changed, 1237 insertions(+) Index: linux-2.6.7-modsign-ksign.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.7-modsign-ksign.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6.7-modsign-ksign.patch 15 Oct 2004 00:15:27 -0000 1.12 +++ linux-2.6.7-modsign-ksign.patch 22 Mar 2005 07:00:21 -0000 1.13 @@ -1,6 +1,6 @@ -diff -urNp linux-601/crypto/digest.c linux-602/crypto/digest.c ---- linux-601/crypto/digest.c -+++ linux-602/crypto/digest.c +diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/digest.c linux-902/crypto/digest.c +--- linux-901/crypto/digest.c ++++ linux-902/crypto/digest.c @@ -52,6 +52,13 @@ static void update(struct crypto_tfm *tf } } @@ -23,9 +23,9 @@ ops->dit_final = final; ops->dit_digest = digest; ops->dit_setkey = setkey; -diff -urNp linux-601/crypto/signature/dsa.c linux-602/crypto/signature/dsa.c ---- linux-601/crypto/signature/dsa.c -+++ linux-602/crypto/signature/dsa.c +diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/dsa.c linux-902/crypto/signature/dsa.c +--- linux-901/crypto/signature/dsa.c ++++ linux-902/crypto/signature/dsa.c @@ -0,0 +1,98 @@ +/* dsa.c - DSA signature algorithm + * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. @@ -125,9 +125,9 @@ + mpi_free(v); + return rc; +} /* end DSA_verify() */ -diff -urNp linux-601/crypto/signature/key.h linux-602/crypto/signature/key.h ---- linux-601/crypto/signature/key.h -+++ linux-602/crypto/signature/key.h +diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/key.h linux-902/crypto/signature/key.h +--- linux-901/crypto/signature/key.h ++++ linux-902/crypto/signature/key.h @@ -0,0 +1,7 @@ +const int ksign_def_public_key_size = 0; +/* automatically generated by bin2hex */ @@ -136,9 +136,9 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + -diff -urNp linux-601/crypto/signature/ksign.c linux-602/crypto/signature/ksign.c ---- linux-601/crypto/signature/ksign.c -+++ linux-602/crypto/signature/ksign.c +diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign.c linux-902/crypto/signature/ksign.c +--- linux-901/crypto/signature/ksign.c ++++ linux-902/crypto/signature/ksign.c @@ -0,0 +1,179 @@ +/* ksign.c: signature checker + * @@ -319,9 +319,9 @@ + + return retval; +} /* end ksign_verify_signature() */ -diff -urNp linux-601/crypto/signature/ksign-keyring.c linux-602/crypto/signature/ksign-keyring.c ---- linux-601/crypto/signature/ksign-keyring.c -+++ linux-602/crypto/signature/ksign-keyring.c +diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-keyring.c linux-902/crypto/signature/ksign-keyring.c +--- linux-901/crypto/signature/ksign-keyring.c ++++ linux-902/crypto/signature/ksign-keyring.c @@ -0,0 +1,112 @@ +/* ksign-keyring.c: public key cache + * @@ -435,9 +435,9 @@ + + up_write(&keyring_sem); +} /* end ksign_clear_keyring() */ -diff -urNp linux-601/crypto/signature/ksign-parse.c linux-602/crypto/signature/ksign-parse.c ---- linux-601/crypto/signature/ksign-parse.c -+++ linux-602/crypto/signature/ksign-parse.c +diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-parse.c linux-902/crypto/signature/ksign-parse.c +--- linux-901/crypto/signature/ksign-parse.c ++++ linux-902/crypto/signature/ksign-parse.c @@ -0,0 +1,609 @@ +/* parse-packet.c - read packets + * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -888,7 +888,7 @@ + } + + for (i = 0; i < DSA_NSIG; i++) { -+ size_t remaining = endp - datap; ++ unsigned remaining = endp - datap; + sig->data[i] = mpi_read_from_buffer(datap, &remaining); + datap += remaining; + } @@ -1048,9 +1048,9 @@ + + return rc; +} /* end ksign_parse_packets() */ -diff -urNp linux-601/crypto/signature/ksign-publickey.c linux-602/crypto/signature/ksign-publickey.c ---- linux-601/crypto/signature/ksign-publickey.c -+++ linux-602/crypto/signature/ksign-publickey.c +diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-publickey.c linux-902/crypto/signature/ksign-publickey.c +--- linux-901/crypto/signature/ksign-publickey.c ++++ linux-902/crypto/signature/ksign-publickey.c @@ -0,0 +1,19 @@ +#include "local.h" + @@ -1063,7 +1063,7 @@ + printk("ksign: Installing public key data\n"); + + rc = ksign_load_keyring_from_buffer(ksign_def_public_key, -+ sizeof(ksign_def_public_key)); ++ ksign_def_public_key_size); + if (rc < 0) + printk("Unable to load default keyring: error=%d\n", -rc); + @@ -1071,9 +1071,9 @@ +} + +module_init(ksign_init) -diff -urNp linux-601/crypto/signature/local.h linux-602/crypto/signature/local.h ---- linux-601/crypto/signature/local.h -+++ linux-602/crypto/signature/local.h +diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/local.h linux-902/crypto/signature/local.h +--- linux-901/crypto/signature/local.h ++++ linux-902/crypto/signature/local.h @@ -0,0 +1,163 @@ +/* local.h: kernel signature checker internal defs + * @@ -1238,9 +1238,9 @@ +{ + crypto_digest_update_kernel(sha1, s, n); +} -diff -urNp linux-601/crypto/signature/Makefile linux-602/crypto/signature/Makefile ---- linux-601/crypto/signature/Makefile -+++ linux-602/crypto/signature/Makefile +diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/Makefile linux-902/crypto/signature/Makefile +--- linux-901/crypto/signature/Makefile ++++ linux-902/crypto/signature/Makefile @@ -0,0 +1,10 @@ +# +# Makefile for the signature checker @@ -1252,9 +1252,9 @@ + ksign-keyring.o \ + ksign-publickey.o \ + dsa.o -diff -urNp linux-601/include/linux/crypto/ksign.h linux-602/include/linux/crypto/ksign.h ---- linux-601/include/linux/crypto/ksign.h -+++ linux-602/include/linux/crypto/ksign.h +diff -urNp --exclude-from=/home/davej/.exclude linux-901/include/linux/crypto/ksign.h linux-902/include/linux/crypto/ksign.h +--- linux-901/include/linux/crypto/ksign.h ++++ linux-902/include/linux/crypto/ksign.h @@ -0,0 +1,22 @@ +/* ksign.h: in-kernel signature checker + * @@ -1278,10 +1278,10 @@ +#endif + +#endif /* _LINUX_CRYPTO_KSIGN_H */ -diff -urNp linux-601/include/linux/crypto.h linux-602/include/linux/crypto.h ---- linux-601/include/linux/crypto.h -+++ linux-602/include/linux/crypto.h -@@ -156,6 +156,8 @@ struct digest_tfm { +diff -urNp --exclude-from=/home/davej/.exclude linux-901/include/linux/crypto.h linux-902/include/linux/crypto.h +--- linux-901/include/linux/crypto.h ++++ linux-902/include/linux/crypto.h +@@ -167,6 +167,8 @@ struct digest_tfm { void (*dit_init)(struct crypto_tfm *tfm); void (*dit_update)(struct crypto_tfm *tfm, struct scatterlist *sg, unsigned int nsg); @@ -1290,7 +1290,7 @@ void (*dit_final)(struct crypto_tfm *tfm, u8 *out); void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg, unsigned int nsg, u8 *out); -@@ -276,6 +278,14 @@ static inline void crypto_digest_update( +@@ -287,6 +289,14 @@ static inline void crypto_digest_update( tfm->crt_digest.dit_update(tfm, sg, nsg); } @@ -1305,27 +1305,3 @@ static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); -diff -uNr linux-2.6.8/crypto/signature/ksign-parse.c.orig linux-2.6.8/crypto/signature/ksign-parse.c ---- linux-2.6.8/crypto/signature/ksign-parse.c.orig 2004-08-27 14:12:01.055869976 +0100 -+++ linux-2.6.8/crypto/signature/ksign-parse.c 2004-08-27 14:12:08.000000000 +0100 -@@ -447,7 +447,7 @@ static int ksign_parse_signature(const u - } - - for (i = 0; i < DSA_NSIG; i++) { -- size_t remaining = endp - datap; -+ unsigned remaining = endp - datap; - sig->data[i] = mpi_read_from_buffer(datap, &remaining); - datap += remaining; - } -diff -uNr linux-2.6.8/crypto/signature/ksign-publickey.c.orig linux-2.6.8/crypto/signature/ksign-publickey.c ---- linux-2.6.8/crypto/signature/ksign-publickey.c.orig 2004-08-27 14:25:15.822925760 +0100 -+++ linux-2.6.8/crypto/signature/ksign-publickey.c 2004-08-27 14:25:24.000000000 +0100 -@@ -9,7 +9,7 @@ static int __init ksign_init(void) - printk("ksign: Installing public key data\n"); - - rc = ksign_load_keyring_from_buffer(ksign_def_public_key, -- sizeof(ksign_def_public_key)); -+ ksign_def_public_key_size); - if (rc < 0) - printk("Unable to load default keyring: error=%d\n", -rc); - linux-2.6.7-modsign-mpilib.patch: crypto/mpi/Makefile | 30 crypto/mpi/generic_mpi-asm-defs.h | 10 crypto/mpi/generic_mpih-add1.c | 62 + crypto/mpi/generic_mpih-lshift.c | 66 + crypto/mpi/generic_mpih-mul1.c | 58 + crypto/mpi/generic_mpih-mul2.c | 63 + crypto/mpi/generic_mpih-mul3.c | 64 + crypto/mpi/generic_mpih-rshift.c | 65 + crypto/mpi/generic_mpih-sub1.c | 62 + crypto/mpi/generic_udiv-w-sdiv.c | 130 +++ crypto/mpi/longlong.h | 1502 ++++++++++++++++++++++++++++++++++++++ crypto/mpi/mpi-add.c | 258 ++++++ crypto/mpi/mpi-bit.c | 245 ++++++ crypto/mpi/mpi-cmp.c | 71 + crypto/mpi/mpi-div.c | 345 ++++++++ crypto/mpi/mpi-gcd.c | 60 + crypto/mpi/mpi-inline.c | 33 crypto/mpi/mpi-inline.h | 128 +++ crypto/mpi/mpi-internal.h | 265 ++++++ crypto/mpi/mpi-inv.c | 148 +++ crypto/mpi/mpi-mpow.c | 113 ++ crypto/mpi/mpi-mul.c | 202 +++++ crypto/mpi/mpi-pow.c | 312 +++++++ crypto/mpi/mpi-scan.c | 129 +++ crypto/mpi/mpicoder.c | 359 +++++++++ crypto/mpi/mpih-cmp.c | 58 + crypto/mpi/mpih-div.c | 534 +++++++++++++ crypto/mpi/mpih-mul.c | 547 +++++++++++++ crypto/mpi/mpiutil.c | 214 +++++ include/linux/crypto/mpi.h | 147 +++ 30 files changed, 6280 insertions(+) Index: linux-2.6.7-modsign-mpilib.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.7-modsign-mpilib.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.7-modsign-mpilib.patch 9 Sep 2004 14:49:36 -0000 1.2 +++ linux-2.6.7-modsign-mpilib.patch 22 Mar 2005 07:00:21 -0000 1.3 @@ -1,6 +1,6 @@ -diff -urNp linux-602/crypto/mpi/generic_mpi-asm-defs.h linux-603/crypto/mpi/generic_mpi-asm-defs.h ---- linux-602/crypto/mpi/generic_mpi-asm-defs.h -+++ linux-603/crypto/mpi/generic_mpi-asm-defs.h +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpi-asm-defs.h linux-903/crypto/mpi/generic_mpi-asm-defs.h +--- linux-902/crypto/mpi/generic_mpi-asm-defs.h ++++ linux-903/crypto/mpi/generic_mpi-asm-defs.h @@ -0,0 +1,10 @@ +/* This file defines some basic constants for the MPI machinery. We + * need to define the types on a per-CPU basis, so it is done with @@ -12,9 +12,9 @@ + + + -diff -urNp linux-602/crypto/mpi/generic_mpih-add1.c linux-603/crypto/mpi/generic_mpih-add1.c ---- linux-602/crypto/mpi/generic_mpih-add1.c -+++ linux-603/crypto/mpi/generic_mpih-add1.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-add1.c linux-903/crypto/mpi/generic_mpih-add1.c +--- linux-902/crypto/mpi/generic_mpih-add1.c ++++ linux-903/crypto/mpi/generic_mpih-add1.c @@ -0,0 +1,62 @@ +/* mpihelp-add_1.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, @@ -78,9 +78,9 @@ + return cy; +} + -diff -urNp linux-602/crypto/mpi/generic_mpih-lshift.c linux-603/crypto/mpi/generic_mpih-lshift.c ---- linux-602/crypto/mpi/generic_mpih-lshift.c -+++ linux-603/crypto/mpi/generic_mpih-lshift.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-lshift.c linux-903/crypto/mpi/generic_mpih-lshift.c +--- linux-902/crypto/mpi/generic_mpih-lshift.c ++++ linux-903/crypto/mpi/generic_mpih-lshift.c @@ -0,0 +1,66 @@ +/* mpihelp-lshift.c - MPI helper functions + * Copyright (C) 1994, 1996, 1998, 2001 Free Software Foundation, Inc. @@ -148,9 +148,9 @@ +} + + -diff -urNp linux-602/crypto/mpi/generic_mpih-mul1.c linux-603/crypto/mpi/generic_mpih-mul1.c ---- linux-602/crypto/mpi/generic_mpih-mul1.c -+++ linux-603/crypto/mpi/generic_mpih-mul1.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul1.c linux-903/crypto/mpi/generic_mpih-mul1.c +--- linux-902/crypto/mpi/generic_mpih-mul1.c ++++ linux-903/crypto/mpi/generic_mpih-mul1.c @@ -0,0 +1,58 @@ +/* mpihelp-mul_1.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. @@ -210,9 +210,9 @@ + return cy_limb; +} + -diff -urNp linux-602/crypto/mpi/generic_mpih-mul2.c linux-603/crypto/mpi/generic_mpih-mul2.c ---- linux-602/crypto/mpi/generic_mpih-mul2.c -+++ linux-603/crypto/mpi/generic_mpih-mul2.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul2.c linux-903/crypto/mpi/generic_mpih-mul2.c +--- linux-902/crypto/mpi/generic_mpih-mul2.c ++++ linux-903/crypto/mpi/generic_mpih-mul2.c @@ -0,0 +1,63 @@ +/* mpihelp-mul_2.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. @@ -277,9 +277,9 @@ +} + + -diff -urNp linux-602/crypto/mpi/generic_mpih-mul3.c linux-603/crypto/mpi/generic_mpih-mul3.c ---- linux-602/crypto/mpi/generic_mpih-mul3.c -+++ linux-603/crypto/mpi/generic_mpih-mul3.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul3.c linux-903/crypto/mpi/generic_mpih-mul3.c +--- linux-902/crypto/mpi/generic_mpih-mul3.c ++++ linux-903/crypto/mpi/generic_mpih-mul3.c @@ -0,0 +1,64 @@ +/* mpihelp-mul_3.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. @@ -345,9 +345,9 @@ +} + + -diff -urNp linux-602/crypto/mpi/generic_mpih-rshift.c linux-603/crypto/mpi/generic_mpih-rshift.c ---- linux-602/crypto/mpi/generic_mpih-rshift.c -+++ linux-603/crypto/mpi/generic_mpih-rshift.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-rshift.c linux-903/crypto/mpi/generic_mpih-rshift.c +--- linux-902/crypto/mpi/generic_mpih-rshift.c ++++ linux-903/crypto/mpi/generic_mpih-rshift.c @@ -0,0 +1,65 @@ +/* mpih-rshift.c - MPI helper functions + * Copyright (C) 1994, 1996, 1998, 1999, @@ -414,9 +414,9 @@ + return retval; +} + -diff -urNp linux-602/crypto/mpi/generic_mpih-sub1.c linux-603/crypto/mpi/generic_mpih-sub1.c ---- linux-602/crypto/mpi/generic_mpih-sub1.c -+++ linux-603/crypto/mpi/generic_mpih-sub1.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-sub1.c linux-903/crypto/mpi/generic_mpih-sub1.c +--- linux-902/crypto/mpi/generic_mpih-sub1.c ++++ linux-903/crypto/mpi/generic_mpih-sub1.c @@ -0,0 +1,62 @@ +/* mpihelp-add_2.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. @@ -480,9 +480,9 @@ +} + + -diff -urNp linux-602/crypto/mpi/generic_udiv-w-sdiv.c linux-603/crypto/mpi/generic_udiv-w-sdiv.c ---- linux-602/crypto/mpi/generic_udiv-w-sdiv.c -+++ linux-603/crypto/mpi/generic_udiv-w-sdiv.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_udiv-w-sdiv.c linux-903/crypto/mpi/generic_udiv-w-sdiv.c +--- linux-902/crypto/mpi/generic_udiv-w-sdiv.c ++++ linux-903/crypto/mpi/generic_udiv-w-sdiv.c @@ -0,0 +1,130 @@ +/* mpihelp_udiv_w_sdiv -- implement udiv_qrnnd on machines with only signed + * division. @@ -614,9 +614,9 @@ + +#endif + -diff -urNp linux-602/crypto/mpi/longlong.h linux-603/crypto/mpi/longlong.h ---- linux-602/crypto/mpi/longlong.h -+++ linux-603/crypto/mpi/longlong.h +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/longlong.h linux-903/crypto/mpi/longlong.h +--- linux-902/crypto/mpi/longlong.h ++++ linux-903/crypto/mpi/longlong.h @@ -0,0 +1,1502 @@ +/* longlong.h -- definitions for mixed size 32/64 bit arithmetic. + Note: I added some stuff for use with gnupg @@ -2120,9 +2120,9 @@ +#ifndef UDIV_NEEDS_NORMALIZATION +#define UDIV_NEEDS_NORMALIZATION 0 +#endif -diff -urNp linux-602/crypto/mpi/Makefile linux-603/crypto/mpi/Makefile ---- linux-602/crypto/mpi/Makefile -+++ linux-603/crypto/mpi/Makefile +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/Makefile linux-903/crypto/mpi/Makefile +--- linux-902/crypto/mpi/Makefile ++++ linux-903/crypto/mpi/Makefile @@ -0,0 +1,30 @@ +# +# MPI multiprecision maths library (from gpg) @@ -2154,9 +2154,9 @@ + mpi-scan.o \ + mpiutil.o + -diff -urNp linux-602/crypto/mpi/mpi-add.c linux-603/crypto/mpi/mpi-add.c ---- linux-602/crypto/mpi/mpi-add.c -+++ linux-603/crypto/mpi/mpi-add.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-add.c linux-903/crypto/mpi/mpi-add.c +--- linux-902/crypto/mpi/mpi-add.c ++++ linux-903/crypto/mpi/mpi-add.c @@ -0,0 +1,258 @@ +/* mpi-add.c - MPI functions + * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -2416,9 +2416,9 @@ + return 0; +} + -diff -urNp linux-602/crypto/mpi/mpi-bit.c linux-603/crypto/mpi/mpi-bit.c ---- linux-602/crypto/mpi/mpi-bit.c -+++ linux-603/crypto/mpi/mpi-bit.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-bit.c linux-903/crypto/mpi/mpi-bit.c +--- linux-902/crypto/mpi/mpi-bit.c ++++ linux-903/crypto/mpi/mpi-bit.c @@ -0,0 +1,245 @@ +/* mpi-bit.c - MPI bit level fucntions + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. @@ -2665,9 +2665,9 @@ +} + + -diff -urNp linux-602/crypto/mpi/mpi-cmp.c linux-603/crypto/mpi/mpi-cmp.c ---- linux-602/crypto/mpi/mpi-cmp.c -+++ linux-603/crypto/mpi/mpi-cmp.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-cmp.c linux-903/crypto/mpi/mpi-cmp.c +--- linux-902/crypto/mpi/mpi-cmp.c ++++ linux-903/crypto/mpi/mpi-cmp.c @@ -0,0 +1,71 @@ +/* mpi-cmp.c - MPI functions + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. @@ -2740,9 +2740,9 @@ +} + + -diff -urNp linux-602/crypto/mpi/mpicoder.c linux-603/crypto/mpi/mpicoder.c ---- linux-602/crypto/mpi/mpicoder.c -+++ linux-603/crypto/mpi/mpicoder.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpicoder.c linux-903/crypto/mpi/mpicoder.c +--- linux-902/crypto/mpi/mpicoder.c ++++ linux-903/crypto/mpi/mpicoder.c @@ -0,0 +1,359 @@ +/* mpicoder.c - Coder for the external representation of MPIs + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. @@ -3103,9 +3103,9 @@ + return 0; +} + -diff -urNp linux-602/crypto/mpi/mpi-div.c linux-603/crypto/mpi/mpi-div.c ---- linux-602/crypto/mpi/mpi-div.c -+++ linux-603/crypto/mpi/mpi-div.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-div.c linux-903/crypto/mpi/mpi-div.c +--- linux-902/crypto/mpi/mpi-div.c ++++ linux-903/crypto/mpi/mpi-div.c @@ -0,0 +1,345 @@ +/* mpi-div.c - MPI functions + * Copyright (C) 1994, 1996 Free Software Foundation, Inc. @@ -3452,9 +3452,9 @@ + return !mpihelp_mod_1( dividend->d, dividend->nlimbs, divisor ); +} + -diff -urNp linux-602/crypto/mpi/mpi-gcd.c linux-603/crypto/mpi/mpi-gcd.c ---- linux-602/crypto/mpi/mpi-gcd.c -+++ linux-603/crypto/mpi/mpi-gcd.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-gcd.c linux-903/crypto/mpi/mpi-gcd.c +--- linux-902/crypto/mpi/mpi-gcd.c ++++ linux-903/crypto/mpi/mpi-gcd.c @@ -0,0 +1,60 @@ +/* mpi-gcd.c - MPI functions + * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -3516,9 +3516,9 @@ + mpi_free(b); + return -ENOMEM; +} -diff -urNp linux-602/crypto/mpi/mpih-cmp.c linux-603/crypto/mpi/mpih-cmp.c ---- linux-602/crypto/mpi/mpih-cmp.c -+++ linux-603/crypto/mpi/mpih-cmp.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpih-cmp.c linux-903/crypto/mpi/mpih-cmp.c +--- linux-902/crypto/mpi/mpih-cmp.c ++++ linux-903/crypto/mpi/mpih-cmp.c @@ -0,0 +1,58 @@ +/* mpihelp-sub.c - MPI helper functions + * Copyright (C) 1994, 1996 Free Software Foundation, Inc. @@ -3578,9 +3578,9 @@ + return (op1_word > op2_word) ? 1 : -1; +} + -diff -urNp linux-602/crypto/mpi/mpih-div.c linux-603/crypto/mpi/mpih-div.c ---- linux-602/crypto/mpi/mpih-div.c -+++ linux-603/crypto/mpi/mpih-div.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpih-div.c linux-903/crypto/mpi/mpih-div.c +--- linux-902/crypto/mpi/mpih-div.c ++++ linux-903/crypto/mpi/mpih-div.c @@ -0,0 +1,534 @@ +/* mpihelp-div.c - MPI helper functions + * Copyright (C) 1994, 1996 Free Software Foundation, Inc. @@ -4116,9 +4116,9 @@ +} + + -diff -urNp linux-602/crypto/mpi/mpih-mul.c linux-603/crypto/mpi/mpih-mul.c ---- linux-602/crypto/mpi/mpih-mul.c -+++ linux-603/crypto/mpi/mpih-mul.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpih-mul.c linux-903/crypto/mpi/mpih-mul.c +--- linux-902/crypto/mpi/mpih-mul.c ++++ linux-903/crypto/mpi/mpih-mul.c @@ -0,0 +1,547 @@ +/* mpihelp-mul.c - MPI helper functions + * Copyright (C) 1994, 1996, 1998, 1999, @@ -4667,9 +4667,9 @@ +} + + -diff -urNp linux-602/crypto/mpi/mpi-inline.c linux-603/crypto/mpi/mpi-inline.c ---- linux-602/crypto/mpi/mpi-inline.c -+++ linux-603/crypto/mpi/mpi-inline.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-inline.c linux-903/crypto/mpi/mpi-inline.c +--- linux-902/crypto/mpi/mpi-inline.c ++++ linux-903/crypto/mpi/mpi-inline.c @@ -0,0 +1,33 @@ +/* mpi-inline.c + * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. @@ -4704,9 +4704,9 @@ + */ +#include "mpi-inline.h" + -diff -urNp linux-602/crypto/mpi/mpi-inline.h linux-603/crypto/mpi/mpi-inline.h ---- linux-602/crypto/mpi/mpi-inline.h -+++ linux-603/crypto/mpi/mpi-inline.h +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-inline.h linux-903/crypto/mpi/mpi-inline.h +--- linux-902/crypto/mpi/mpi-inline.h ++++ linux-903/crypto/mpi/mpi-inline.h @@ -0,0 +1,128 @@ +/* mpi-inline.h - Internal to the Multi Precision Integers + * Copyright (C) 1994, 1996, 1998, 1999 Free Software Foundation, Inc. @@ -4836,9 +4836,9 @@ + + +#endif /*G10_MPI_INLINE_H*/ -diff -urNp linux-602/crypto/mpi/mpi-internal.h linux-603/crypto/mpi/mpi-internal.h ---- linux-602/crypto/mpi/mpi-internal.h -+++ linux-603/crypto/mpi/mpi-internal.h +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-internal.h linux-903/crypto/mpi/mpi-internal.h +--- linux-902/crypto/mpi/mpi-internal.h ++++ linux-903/crypto/mpi/mpi-internal.h @@ -0,0 +1,265 @@ +/* mpi-internal.h - Internal to the Multi Precision Integers + * Copyright (C) 1994, 1996 Free Software Foundation, Inc. @@ -5105,9 +5105,9 @@ +#endif + +#endif /*G10_MPI_INTERNAL_H*/ -diff -urNp linux-602/crypto/mpi/mpi-inv.c linux-603/crypto/mpi/mpi-inv.c ---- linux-602/crypto/mpi/mpi-inv.c -+++ linux-603/crypto/mpi/mpi-inv.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-inv.c linux-903/crypto/mpi/mpi-inv.c +--- linux-902/crypto/mpi/mpi-inv.c ++++ linux-903/crypto/mpi/mpi-inv.c @@ -0,0 +1,148 @@ +/* mpi-inv.c - MPI functions + * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -5257,9 +5257,9 @@ + mpi_free(v); + return rc; +} -diff -urNp linux-602/crypto/mpi/mpi-mpow.c linux-603/crypto/mpi/mpi-mpow.c ---- linux-602/crypto/mpi/mpi-mpow.c -+++ linux-603/crypto/mpi/mpi-mpow.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-mpow.c linux-903/crypto/mpi/mpi-mpow.c +--- linux-902/crypto/mpi/mpi-mpow.c ++++ linux-903/crypto/mpi/mpi-mpow.c @@ -0,0 +1,113 @@ +/* mpi-mpow.c - MPI functions + * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. @@ -5374,9 +5374,9 @@ + kfree(G); + return rc; +} -diff -urNp linux-602/crypto/mpi/mpi-mul.c linux-603/crypto/mpi/mpi-mul.c ---- linux-602/crypto/mpi/mpi-mul.c -+++ linux-603/crypto/mpi/mpi-mul.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-mul.c linux-903/crypto/mpi/mpi-mul.c +--- linux-902/crypto/mpi/mpi-mul.c ++++ linux-903/crypto/mpi/mpi-mul.c @@ -0,0 +1,202 @@ +/* mpi-mul.c - MPI functions + * Copyright (C) 1994, 1996 Free Software Foundation, Inc. @@ -5580,9 +5580,9 @@ + return -ENOMEM; + return mpi_fdiv_r( w, w, m ); +} -diff -urNp linux-602/crypto/mpi/mpi-pow.c linux-603/crypto/mpi/mpi-pow.c ---- linux-602/crypto/mpi/mpi-pow.c -+++ linux-603/crypto/mpi/mpi-pow.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-pow.c linux-903/crypto/mpi/mpi-pow.c +--- linux-902/crypto/mpi/mpi-pow.c ++++ linux-903/crypto/mpi/mpi-pow.c @@ -0,0 +1,312 @@ +/* mpi-pow.c - MPI functions + * Copyright (C) 1994, 1996, 1998, 2000 Free Software Foundation, Inc. @@ -5896,9 +5896,9 @@ + return rc; +} + -diff -urNp linux-602/crypto/mpi/mpi-scan.c linux-603/crypto/mpi/mpi-scan.c ---- linux-602/crypto/mpi/mpi-scan.c -+++ linux-603/crypto/mpi/mpi-scan.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-scan.c linux-903/crypto/mpi/mpi-scan.c +--- linux-902/crypto/mpi/mpi-scan.c ++++ linux-903/crypto/mpi/mpi-scan.c @@ -0,0 +1,129 @@ +/* mpi-scan.c - MPI functions + * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -6029,9 +6029,9 @@ +} + + -diff -urNp linux-602/crypto/mpi/mpiutil.c linux-603/crypto/mpi/mpiutil.c ---- linux-602/crypto/mpi/mpiutil.c -+++ linux-603/crypto/mpi/mpiutil.c +diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpiutil.c linux-903/crypto/mpi/mpiutil.c +--- linux-902/crypto/mpi/mpiutil.c ++++ linux-903/crypto/mpi/mpiutil.c @@ -0,0 +1,214 @@ +/* mpiutil.ac - Utility functions for MPI + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. @@ -6247,9 +6247,9 @@ + tmp = *a; *a = *b; *b = tmp; +} + -diff -urNp linux-602/include/linux/crypto/mpi.h linux-603/include/linux/crypto/mpi.h ---- linux-602/include/linux/crypto/mpi.h -+++ linux-603/include/linux/crypto/mpi.h +diff -urNp --exclude-from=/home/davej/.exclude linux-902/include/linux/crypto/mpi.h linux-903/include/linux/crypto/mpi.h +--- linux-902/include/linux/crypto/mpi.h ++++ linux-903/include/linux/crypto/mpi.h @@ -0,0 +1,147 @@ +/* mpi.h - Multi Precision Integers + * Copyright (C) 1994, 1996, 1998, 1999, linux-2.6.7-modsign-script.patch: Makefile | 27 + mod-extract.c | 900 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ modsign.sh | 57 +++ 3 files changed, 984 insertions(+) Index: linux-2.6.7-modsign-script.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.7-modsign-script.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6.7-modsign-script.patch 15 Oct 2004 00:15:27 -0000 1.6 +++ linux-2.6.7-modsign-script.patch 22 Mar 2005 07:00:21 -0000 1.7 @@ -1,6 +1,6 @@ -diff -urNp linux-603/scripts/modsign/Makefile linux-604/scripts/modsign/Makefile ---- linux-603/scripts/modsign/Makefile -+++ linux-604/scripts/modsign/Makefile +diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/Makefile linux-904/scripts/modsign/Makefile +--- linux-903/scripts/modsign/Makefile ++++ linux-904/scripts/modsign/Makefile @@ -0,0 +1,27 @@ +# Set the following to `true' to make a debuggable build. +# Leave this set to `false' for production use. @@ -29,9 +29,9 @@ + +clean: + -rm $(OBJS) $(ROOT) -diff -uNrp linux-2.6.9-rc4-mm1/scripts/modsign/mod-extract.c linux-2.6.9-rc4-mm1-modsign/scripts/modsign/mod-extract.c ---- linux-2.6.9-rc4-mm1/scripts/modsign/mod-extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/scripts/modsign/mod-extract.c 2004-10-13 21:40:59.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/mod-extract.c linux-904/scripts/modsign/mod-extract.c +--- linux-903/scripts/modsign/mod-extract.c ++++ linux-904/scripts/modsign/mod-extract.c @@ -0,0 +1,900 @@ +/* mod-extract.c: module extractor for signing + * @@ -933,9 +933,9 @@ + ftell(outfd), ftell(outfd), xcsum); + +} /* end extract_elf32() */ -diff -uNrp linux-2.6.9-rc4-mm1/scripts/modsign/modsign.sh linux-2.6.9-rc4-mm1-modsign/scripts/modsign/modsign.sh ---- linux-2.6.9-rc4-mm1/scripts/modsign/modsign.sh 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.9-rc4-mm1-modsign/scripts/modsign/modsign.sh 2004-10-13 20:03:08.000000000 +0100 +diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/modsign.sh linux-904/scripts/modsign/modsign.sh +--- linux-903/scripts/modsign/modsign.sh ++++ linux-904/scripts/modsign/modsign.sh @@ -0,0 +1,57 @@ +#!/bin/bash +############################################################################### linux-2.6.8-lockd-racewarn2.patch: clntlock.c | 11 ++++++++--- svc.c | 19 +++++++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) Index: linux-2.6.8-lockd-racewarn2.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.8-lockd-racewarn2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.8-lockd-racewarn2.patch 19 Oct 2004 19:09:00 -0000 1.1 +++ linux-2.6.8-lockd-racewarn2.patch 22 Mar 2005 07:00:22 -0000 1.2 @@ -1,5 +1,6 @@ ---- linux-2.6.8/fs/lockd/clntlock.c.org 2004-09-27 10:03:38.000000000 -0400 -+++ linux-2.6.8/fs/lockd/clntlock.c 2004-09-27 10:03:52.000000000 -0400 +diff -urNp --exclude-from=/home/davej/.exclude linux-1200/fs/lockd/clntlock.c linux-1201/fs/lockd/clntlock.c +--- linux-1200/fs/lockd/clntlock.c ++++ linux-1201/fs/lockd/clntlock.c @@ -50,14 +50,19 @@ nlmclnt_block(struct nlm_host *host, str struct nlm_wait block, **head; int err; @@ -39,9 +40,10 @@ if (!signalled()) { *statp = block.b_status; ---- linux-2.6.8/fs/lockd/svc.c.org 2004-09-25 05:52:57.000000000 -0400 -+++ linux-2.6.8/fs/lockd/svc.c 2004-09-28 17:14:29.731453016 -0400 -@@ -278,6 +278,8 @@ void +diff -urNp --exclude-from=/home/davej/.exclude linux-1200/fs/lockd/svc.c linux-1201/fs/lockd/svc.c +--- linux-1200/fs/lockd/svc.c ++++ linux-1201/fs/lockd/svc.c +@@ -282,6 +282,8 @@ void lockd_down(void) { static int warned; @@ -50,7 +52,7 @@ down(&nlmsvc_sema); if (nlmsvc_users) { -@@ -294,20 +296,33 @@ lockd_down(void) +@@ -298,20 +300,33 @@ lockd_down(void) warned = 0; kill_proc(nlmsvc_pid, SIGKILL, 1); linux-2.6.8-netconsole.patch: netconsole.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 106 insertions(+), 14 deletions(-) Index: linux-2.6.8-netconsole.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.8-netconsole.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.8-netconsole.patch 19 Jan 2005 22:57:00 -0000 1.3 +++ linux-2.6.8-netconsole.patch 22 Mar 2005 07:00:22 -0000 1.4 @@ -1,6 +1,6 @@ -diff -purN linux-2.6.8/drivers/net/netconsole.c linux/drivers/net/netconsole.c ---- linux-2.6.8/drivers/net/netconsole.c 2004-08-14 01:36:57.000000000 -0400 -+++ linux/drivers/net/netconsole.c 2004-09-10 16:34:14.141135896 -0400 +diff -urNp --exclude-from=/home/davej/.exclude linux-1501/drivers/net/netconsole.c linux-1502/drivers/net/netconsole.c +--- linux-1501/drivers/net/netconsole.c ++++ linux-1502/drivers/net/netconsole.c @@ -45,6 +45,9 @@ #include #include linux-2.6.9-NFSD-non-null-getxattr.patch: vfs.c | 10 ++++++++++ 1 files changed, 10 insertions(+) Index: linux-2.6.9-NFSD-non-null-getxattr.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-NFSD-non-null-getxattr.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.9-NFSD-non-null-getxattr.patch 25 Dec 2004 06:10:33 -0000 1.2 +++ linux-2.6.9-NFSD-non-null-getxattr.patch 22 Mar 2005 07:00:22 -0000 1.3 @@ -1,8 +1,9 @@ ---- linux-2.6.9/fs/nfsd/vfs.c.orig 2004-10-18 17:53:51.000000000 -0400 -+++ linux-2.6.9/fs/nfsd/vfs.c 2004-11-08 06:23:01.098362000 -0500 -@@ -450,6 +450,16 @@ - - down(&inode->i_sem); +diff -urNp --exclude-from=/home/davej/.exclude linux-1102/fs/nfsd/vfs.c linux-1200/fs/nfsd/vfs.c +--- linux-1102/fs/nfsd/vfs.c ++++ linux-1200/fs/nfsd/vfs.c +@@ -461,6 +461,16 @@ _get_posix_acl(struct dentry *dentry, ch + if (error) + goto out_err; + error = -EOPNOTSUPP; + if (inode->i_op == NULL) linux-2.6.9-ide-cd-early-EOF.patch: drivers/ide/ide-cd.c | 101 +++++++++++++++++++++++++++++++++++++++++---------- drivers/ide/ide-io.c | 56 ++++++++++++++++++++++++++++ include/linux/ide.h | 2 + 3 files changed, 141 insertions(+), 18 deletions(-) Index: linux-2.6.9-ide-cd-early-EOF.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-ide-cd-early-EOF.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6.9-ide-cd-early-EOF.patch 18 Mar 2005 21:54:20 -0000 1.4 +++ linux-2.6.9-ide-cd-early-EOF.patch 22 Mar 2005 07:00:22 -0000 1.5 @@ -1,142 +1,7 @@ -CD-R and CD-RW media have undefined end (its variable by about 150K from -what the table of contents says). Most CD devices when you read past the end -but include a legal sector hand back an apparently valid result. It seems -some give you a partial I/O back. - -The ide-cd driver doesn't use sense data an can't handle partial results so -it throws the entire mess back at the block layer as failed and the valid -sectors are lost. ide-scsi (sr.c actually) is smart about this. - -The block layer has no way to indicate early EOF. This area does not need -fixing for the blocker cases and will get dealt with later. Also errors may -hit the log on EOF on afflicted drives. Previously you got errors and it -broke now just errors. This is not a blocker issue and has been pushed off -(onto Steeleye who have the same issue with SCSI reservations 8)) - -What the code does - -Implement ide_end_dequeued_request so we can remove a request from the queue -and end it later. We need this for sense handling. - -On an I/O error for fs blocks we now issue a REQUEST_SENSE and we parse the -sense data using the algorithm used by sr.c. If the buffer was partially -completed at media end we adjust the size information we have and complete -the valid part of the I/O according to the sense information. - -This also improves all the CD I/O diagnostics for file system level errors. - -The small locking and 400nS sleep fixes a race and IDE timing violation in -PIO mode issuing commands. The IDE status registers are not valid for 400nS -after command I/O and we must not take an IDE IRQ during that window. - -It also fixes the printk levels (old vendor moan) - -Testing - -Lacking a problem CD I simulated it by faking the media size return of the -driver to fake the problem. I've verified that with exact size reading the -problem goes away, the readahead blocks will still error but they do not -affect the actual I/O. I can thus correctly media check devices. - -Status - -Jeremy tells me that the installer media check does only read sufficient -bytes. I've told him about this fix and provided himn with an alternate -tested workaround that could also be use. At the moment he still plans to -remove media check because of concerns about testing and changes to the -installer but that isn't my problem 8). We need the change anyway because -otherwise we get short ISO copies and also mount problems with multi -session CD-R/CD-RW on these drives. - -diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.9/drivers/ide/ide-io.c linux-2.6.9/drivers/ide/ide-io.c ---- linux.vanilla-2.6.9/drivers/ide/ide-io.c 2004-10-20 23:16:53.000000000 +0100 -+++ linux-2.6.9/drivers/ide/ide-io.c 2004-11-30 13:32:44.000000000 +0000 -@@ -189,6 +189,62 @@ - EXPORT_SYMBOL(ide_end_request); - - /** -+ * ide_end_dequeued_request - complete an IDE I/O -+ * @drive: IDE device for the I/O -+ * @uptodate: -+ * @nr_sectors: number of sectors completed -+ * -+ * Complete an I/O that is no longer on the request queue. This -+ * typically occurs when we pull the request and issue a REQUEST_SENSE. -+ * We must still finish the old request but we must not tamper with the -+ * queue in the meantime. -+ * -+ * NOTE: This path does not handle barrier, but barrier is not supported -+ * on ide-cd anyway. -+ */ -+ -+int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq, -+ int uptodate, int nr_sectors) -+{ -+ unsigned long flags; -+ int ret = 1; -+ -+ spin_lock_irqsave(&ide_lock, flags); -+ -+ BUG_ON(!(rq->flags & REQ_STARTED)); -+ -+ /* -+ * if failfast is set on a request, override number of sectors and -+ * complete the whole request right now -+ */ -+ if (blk_noretry_request(rq) && end_io_error(uptodate)) -+ nr_sectors = rq->hard_nr_sectors; -+ -+ if (!blk_fs_request(rq) && end_io_error(uptodate) && !rq->errors) -+ rq->errors = -EIO; -+ -+ /* -+ * decide whether to reenable DMA -- 3 is a random magic for now, -+ * if we DMA timeout more than 3 times, just stay in PIO -+ */ -+ if (drive->state == DMA_PIO_RETRY && drive->retry_pio <= 3) { -+ drive->state = 0; -+ HWGROUP(drive)->hwif->ide_dma_on(drive); -+ } -+ -+ if (!end_that_request_first(rq, uptodate, nr_sectors)) { -+ add_disk_randomness(rq->rq_disk); -+ if (blk_rq_tagged(rq)) -+ blk_queue_end_tag(drive->queue, rq); -+ end_that_request_last(rq); -+ ret = 0; -+ } -+ spin_unlock_irqrestore(&ide_lock, flags); -+ return ret; -+} -+EXPORT_SYMBOL_GPL(ide_end_dequeued_request); -+ -+/** - * ide_complete_pm_request - end the current Power Management request - * @drive: target drive - * @rq: request -diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.9/include/linux/ide.h linux-2.6.9/include/linux/ide.h ---- linux.vanilla-2.6.9/include/linux/ide.h 2004-10-20 23:17:22.000000000 +0100 -+++ linux-2.6.9/include/linux/ide.h 2004-12-02 17:18:43.570380320 +0000 -@@ -780,6 +781,7 @@ - unsigned int max_failures; /* maximum allowed failure count */ - - u64 capacity64; /* total number of sectors */ -+ u64 probed_capacity;/* initial reported media capacity (ide-cd only currently) */ - - int lun; /* logical unit */ - int crc_count; /* crc counter to reduce drive speed */ -@@ -1127,6 +1127,7 @@ extern int noautodma; - - extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); - extern int __ide_end_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs); -+extern int ide_end_dequeued_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs); - - /* - * This is used on exit from the driver to designate the next irq handler -diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.9/drivers/ide/ide-cd.c linux-2.6.9/drivers/ide/ide-cd.c ---- linux.vanilla-2.6.9/drivers/ide/ide-cd.c 2004-10-20 23:16:53.000000000 +0100 -+++ linux-2.6.9/drivers/ide/ide-cd.c 2004-12-02 17:31:48.037123248 +0000 -@@ -366,7 +366,8 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-2001/drivers/ide/ide-cd.c linux-2100/drivers/ide/ide-cd.c +--- linux-2001/drivers/ide/ide-cd.c ++++ linux-2100/drivers/ide/ide-cd.c +@@ -366,7 +366,8 @@ static int cdrom_log_sense(ide_drive_t * * we cannot reliably check if drive can auto-close */ if (rq->cmd[0] == GPCMD_START_STOP_UNIT && sense->asc == 0x24) @@ -146,7 +11,7 @@ break; case UNIT_ATTENTION: /* -@@ -388,6 +389,10 @@ +@@ -388,6 +389,10 @@ void cdrom_analyze_sense_data(ide_drive_ struct request *failed_command, struct request_sense *sense) { @@ -157,7 +22,7 @@ if (!cdrom_log_sense(drive, failed_command, sense)) return; -@@ -400,13 +405,43 @@ +@@ -400,13 +405,43 @@ void cdrom_analyze_sense_data(ide_drive_ if (sense->sense_key == 0x05 && sense->asc == 0x24) return; @@ -202,7 +67,7 @@ if (sense->error_code==0x70) printk(" Error: "); else if (sense->error_code==0x71) -@@ -635,17 +670,22 @@ +@@ -579,17 +614,22 @@ static void cdrom_end_request (ide_drive sense = failed->sense; failed->sense_len = rq->sense_len; } @@ -232,7 +97,7 @@ } if (!rq->current_nr_sectors && blk_fs_request(rq)) -@@ -659,6 +699,13 @@ +@@ -603,6 +643,13 @@ static void cdrom_end_request (ide_drive ide_end_request(drive, uptodate, nsectors); } @@ -246,7 +111,7 @@ /* Returns 0 if the request should be continued. Returns 1 if the request was ended. */ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret) -@@ -787,16 +834,16 @@ +@@ -731,16 +778,16 @@ static int cdrom_decode_status(ide_drive sense_key == DATA_PROTECT) { /* No point in retrying after an illegal request or data protect error.*/ @@ -266,7 +131,7 @@ do_end_request = 1; } else if ((err & ~ABRT_ERR) != 0) { /* Go to the default handler -@@ -808,13 +855,27 @@ +@@ -752,13 +799,27 @@ static int cdrom_decode_status(ide_drive do_end_request = 1; } @@ -300,7 +165,7 @@ } else { blk_dump_rq_flags(rq, "ide-cd: bad rq"); cdrom_end_request(drive, 0); -@@ -2268,6 +2333,9 @@ +@@ -2202,6 +2263,9 @@ static int cdrom_read_toc(ide_drive_t *d toc->capacity = 0x1fffff; set_capacity(drive->disk, toc->capacity * sectors_per_frame); @@ -310,7 +175,7 @@ blk_queue_hardsect_size(drive->queue, sectors_per_frame << SECTOR_BITS); -@@ -2382,6 +2450,7 @@ +@@ -2322,6 +2386,7 @@ static int cdrom_read_toc(ide_drive_t *d if (!stat && (last_written > toc->capacity)) { toc->capacity = last_written; set_capacity(drive->disk, toc->capacity * sectors_per_frame); @@ -318,3 +183,88 @@ } /* Remember that we've read this stuff. */ +diff -urNp --exclude-from=/home/davej/.exclude linux-2001/drivers/ide/ide-io.c linux-2100/drivers/ide/ide-io.c +--- linux-2001/drivers/ide/ide-io.c ++++ linux-2100/drivers/ide/ide-io.c +@@ -223,6 +223,62 @@ static ide_startstop_t ide_start_power_s + } + + /** ++ * ide_end_dequeued_request - complete an IDE I/O ++ * @drive: IDE device for the I/O ++ * @uptodate: ++ * @nr_sectors: number of sectors completed ++ * ++ * Complete an I/O that is no longer on the request queue. This ++ * typically occurs when we pull the request and issue a REQUEST_SENSE. ++ * We must still finish the old request but we must not tamper with the ++ * queue in the meantime. ++ * ++ * NOTE: This path does not handle barrier, but barrier is not supported ++ * on ide-cd anyway. ++ */ ++ ++int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq, ++ int uptodate, int nr_sectors) ++{ ++ unsigned long flags; ++ int ret = 1; ++ ++ spin_lock_irqsave(&ide_lock, flags); ++ ++ BUG_ON(!(rq->flags & REQ_STARTED)); ++ ++ /* ++ * if failfast is set on a request, override number of sectors and ++ * complete the whole request right now ++ */ ++ if (blk_noretry_request(rq) && end_io_error(uptodate)) ++ nr_sectors = rq->hard_nr_sectors; ++ ++ if (!blk_fs_request(rq) && end_io_error(uptodate) && !rq->errors) ++ rq->errors = -EIO; ++ ++ /* ++ * decide whether to reenable DMA -- 3 is a random magic for now, ++ * if we DMA timeout more than 3 times, just stay in PIO ++ */ ++ if (drive->state == DMA_PIO_RETRY && drive->retry_pio <= 3) { ++ drive->state = 0; ++ HWGROUP(drive)->hwif->ide_dma_on(drive); ++ } ++ ++ if (!end_that_request_first(rq, uptodate, nr_sectors)) { ++ add_disk_randomness(rq->rq_disk); ++ if (blk_rq_tagged(rq)) ++ blk_queue_end_tag(drive->queue, rq); ++ end_that_request_last(rq); ++ ret = 0; ++ } ++ spin_unlock_irqrestore(&ide_lock, flags); ++ return ret; ++} ++EXPORT_SYMBOL_GPL(ide_end_dequeued_request); ++ ++/** + * ide_complete_pm_request - end the current Power Management request + * @drive: target drive + * @rq: request +diff -urNp --exclude-from=/home/davej/.exclude linux-2001/include/linux/ide.h linux-2100/include/linux/ide.h +--- linux-2001/include/linux/ide.h ++++ linux-2100/include/linux/ide.h +@@ -750,6 +750,7 @@ typedef struct ide_drive_s { + unsigned int max_failures; /* maximum allowed failure count */ + + u64 capacity64; /* total number of sectors */ ++ u64 probed_capacity;/* initial reported media capacity (ide-cd only currently) */ + + int lun; /* logical unit */ + int crc_count; /* crc counter to reduce drive speed */ +@@ -1126,6 +1127,7 @@ extern int noautodma; + + extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); + extern int __ide_end_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs); ++extern int ide_end_dequeued_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs); + + /* + * This is used on exit from the driver to designate the next irq handler linux-2.6.9-ieee80211.patch: Makefile | 1 ieee80211/LICENSE | 339 +++++++++++ ieee80211/Makefile | 23 ieee80211/ieee80211.h | 877 ++++++++++++++++++++++++++++ ieee80211/ieee80211_crypt.c | 253 ++++++++ ieee80211/ieee80211_crypt.h | 104 +++ ieee80211/ieee80211_crypt_ccmp.c | 477 +++++++++++++++ ieee80211/ieee80211_crypt_tkip.c | 714 +++++++++++++++++++++++ ieee80211/ieee80211_crypt_wep.c | 277 +++++++++ ieee80211/ieee80211_module.c | 266 ++++++++ ieee80211/ieee80211_rx.c | 1183 +++++++++++++++++++++++++++++++++++++++ ieee80211/ieee80211_tx.c | 464 +++++++++++++++ ieee80211/ieee80211_wx.c | 526 +++++++++++++++++ 13 files changed, 5504 insertions(+) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6.9-ieee80211.patch Index: linux-2.6.9-ieee80211.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-ieee80211.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.9-ieee80211.patch 2 Mar 2005 03:44:13 -0000 1.3 +++ linux-2.6.9-ieee80211.patch 22 Mar 2005 07:00:22 -0000 1.4 @@ -1,289 +1,268 @@ - -IEEE802.11 infrastructure, used by Intel Centrino drivers...(all new...) - -The Kconfig changes were picked-up in the IPW2100 patch... - - drivers/net/wireless/Makefile | 1 - drivers/net/wireless/ieee80211/LICENSE | 339 +++++ - drivers/net/wireless/ieee80211/Makefile | 23 - drivers/net/wireless/ieee80211/ieee80211.h | 831 +++++++++++++ - drivers/net/wireless/ieee80211/ieee80211_crypt.c | 253 +++ - drivers/net/wireless/ieee80211/ieee80211_crypt.h | 104 + - drivers/net/wireless/ieee80211/ieee80211_crypt_ccmp.c | 477 +++++++ - drivers/net/wireless/ieee80211/ieee80211_crypt_tkip.c | 714 +++++++++++ - drivers/net/wireless/ieee80211/ieee80211_crypt_wep.c | 281 ++++ - drivers/net/wireless/ieee80211/ieee80211_module.c | 252 +++ - drivers/net/wireless/ieee80211/ieee80211_rx.c | 1139 ++++++++++++++++++ - drivers/net/wireless/ieee80211/ieee80211_tx.c | 433 ++++++ - drivers/net/wireless/ieee80211/ieee80211_wx.c | 467 +++++++ - 13 files changed, 5314 insertions(+) - ---- /dev/null -+++ linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_module.c -@@ -0,0 +1,252 @@ -+/******************************************************************************* -+ -+ Copyright(c) 2004 Intel Corporation. All rights reserved. -+ -+ Portions of this file are based on the WEP enablement code provided by the -+ Host AP project hostap-drivers v0.1.3 -+ Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -+ -+ Copyright (c) 2002-2003, Jouni Malinen -+ -+ This program is free software; you can redistribute it and/or modify it -+ under the terms of version 2 of the GNU General Public License as -+ published by the Free Software Foundation. -+ -+ This program is distributed in the hope that it will be useful, but WITHOUT -+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ more details. -+ -+ You should have received a copy of the GNU General Public License along with -+ this program; if not, write to the Free Software Foundation, Inc., 59 -+ Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ The full GNU General Public License is included in this distribution in the -+ file called LICENSE. -+ -+ Contact Information: -+ James P. Ketrenos -+ Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -+ -+*******************************************************************************/ +diff -urNp --exclude-from=/home/davej/.exclude linux-3021/drivers/net/wireless/ieee80211/ieee80211_crypt.c linux-3022/drivers/net/wireless/ieee80211/ieee80211_crypt.c +--- linux-3021/drivers/net/wireless/ieee80211/ieee80211_crypt.c ++++ linux-3022/drivers/net/wireless/ieee80211/ieee80211_crypt.c +@@ -0,0 +1,253 @@ ++/* ++ * Host AP crypto routines ++ * ++ * Copyright (c) 2002-2003, Jouni Malinen ++ * Portions Copyright (C) 2004, Intel Corporation ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. See README and COPYING for ++ * more details. ++ * ++ */ + -+#include +#include -+#include -+#include -+#include -+#include -+#include -+#include ++#include +#include -+#include -+#include -+#include -+#include -+#include ++#include +#include -+#include -+#include -+#include -+#include -+#include -+#include ++#include ++#include + +#include "ieee80211.h" + -+MODULE_DESCRIPTION("802.11 data/management/control stack"); -+MODULE_AUTHOR("Copyright (C) 2004 Intel Corporation "); ++MODULE_AUTHOR("Jouni Malinen"); ++MODULE_DESCRIPTION("HostAP crypto"); +MODULE_LICENSE("GPL"); + -+#define DRV_NAME "ieee80211" ++struct ieee80211_crypto_alg { ++ struct list_head list; ++ struct ieee80211_crypto_ops *ops; ++}; + -+static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee) ++ ++struct ieee80211_crypto { ++ struct list_head algs; ++ spinlock_t lock; ++}; ++ ++static struct ieee80211_crypto *hcrypt; ++ ++void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, ++ int force) +{ -+ if (ieee->networks) -+ return 0; ++ struct list_head *ptr, *n; ++ struct ieee80211_crypt_data *entry; + -+ ieee->networks = kmalloc( -+ MAX_NETWORK_COUNT * sizeof(struct ieee80211_network), -+ GFP_KERNEL); -+ if (!ieee->networks) { -+ printk(KERN_WARNING "%s: Out of memory allocating beacons\n", -+ ieee->dev->name); -+ return -ENOMEM; -+ } ++ for (ptr = ieee->crypt_deinit_list.next, n = ptr->next; ++ ptr != &ieee->crypt_deinit_list; ptr = n, n = ptr->next) { ++ entry = list_entry(ptr, struct ieee80211_crypt_data, list); + -+ memset(ieee->networks, 0, -+ MAX_NETWORK_COUNT * sizeof(struct ieee80211_network)); ++ if (atomic_read(&entry->refcnt) != 0 && !force) ++ continue; + -+ return 0; -+} ++ list_del(ptr); + -+static inline void ieee80211_networks_free(struct ieee80211_device *ieee) -+{ -+ if (!ieee->networks) -+ return; -+ kfree(ieee->networks); -+ ieee->networks = NULL; ++ if (entry->ops) { ++ entry->ops->deinit(entry->priv); ++ module_put(entry->ops->owner); ++ } ++ kfree(entry); ++ } +} + -+static inline void ieee80211_networks_initialize(struct ieee80211_device *ieee) ++void ieee80211_crypt_deinit_handler(unsigned long data) +{ -+ int i; ++ struct ieee80211_device *ieee = (struct ieee80211_device *)data; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&ieee->lock, flags); ++ ieee80211_crypt_deinit_entries(ieee, 0); ++ if (!list_empty(&ieee->crypt_deinit_list)) { ++ printk(KERN_DEBUG "%s: entries remaining in delayed crypt " ++ "deletion list\n", ieee->dev->name); ++ ieee->crypt_deinit_timer.expires = jiffies + HZ; ++ add_timer(&ieee->crypt_deinit_timer); ++ } ++ spin_unlock_irqrestore(&ieee->lock, flags); + -+ INIT_LIST_HEAD(&ieee->network_free_list); -+ INIT_LIST_HEAD(&ieee->network_list); -+ for (i = 0; i < MAX_NETWORK_COUNT; i++) -+ list_add_tail(&ieee->networks[i].list, &ieee->network_free_list); +} + -+struct ieee80211_device *ieee80211_alloc(struct net_device *dev, -+ void *priv) ++void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee, ++ struct ieee80211_crypt_data **crypt) +{ [...10510 lines suppressed...] -- fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA; -- -- if (ieee->iw_mode == IW_MODE_INFRA) { -- fc |= IEEE80211_FCTL_TODS; -- hdr_len = 24; -- /* To DS: Addr1 = BSSID, Addr2 = SA, -- Addr3 = DA */ -- memcpy(&header.addr1, ieee->bssid, ETH_ALEN); -- memcpy(&header.addr2, &src, ETH_ALEN); -- memcpy(&header.addr3, &dest, ETH_ALEN); -- } else if (ieee->iw_mode == IW_MODE_ADHOC) { -- /* not From/To DS: Addr1 = DA, Addr2 = SA, -- Addr3 = BSSID */ -- memcpy(&header.addr1, dest, ETH_ALEN); -- memcpy(&header.addr2, src, ETH_ALEN); -- memcpy(&header.addr3, ieee->bssid, ETH_ALEN); -- } -- header.frame_ctl = cpu_to_le16(fc); -- hdr_len = IEEE80211_3ADDR_SIZE; -- } else -- hdr_len = 0; -+ if (encrypt) -+ fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA | -+ IEEE80211_FCTL_WEP; -+ else -+ fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA; - -- /* Determine amount of payload per fragment. Regardless of if -- * this stack is providing the full 802.11 header, one will -- * eventually be affixed to this fragment -- so we must account for -- * it when determining the amount of payload space. */ -+ if (ieee->iw_mode == IW_MODE_INFRA) { -+ fc |= IEEE80211_FCTL_TODS; -+ /* To DS: Addr1 = BSSID, Addr2 = SA, -+ Addr3 = DA */ -+ memcpy(&header.addr1, ieee->bssid, ETH_ALEN); -+ memcpy(&header.addr2, &src, ETH_ALEN); -+ memcpy(&header.addr3, &dest, ETH_ALEN); -+ } else if (ieee->iw_mode == IW_MODE_ADHOC) { -+ /* not From/To DS: Addr1 = DA, Addr2 = SA, -+ Addr3 = BSSID */ -+ memcpy(&header.addr1, dest, ETH_ALEN); -+ memcpy(&header.addr2, src, ETH_ALEN); -+ memcpy(&header.addr3, ieee->bssid, ETH_ALEN); -+ } -+ header.frame_ctl = cpu_to_le16(fc); -+ hdr_len = IEEE80211_3ADDR_LEN; ++This General Public License does not permit incorporating your program into ++proprietary programs. If your program is a subroutine library, you may ++consider it more useful to permit linking proprietary applications with the ++library. If this is what you want to do, use the GNU Library General Public ++License instead of this License. +diff -urNp --exclude-from=/home/davej/.exclude linux-3021/drivers/net/wireless/ieee80211/Makefile linux-3022/drivers/net/wireless/ieee80211/Makefile +--- linux-3021/drivers/net/wireless/ieee80211/Makefile ++++ linux-3022/drivers/net/wireless/ieee80211/Makefile +@@ -0,0 +1,23 @@ ++# ++# Makefile for the Linux Wireless network device drivers. ++# ++# Original makefile by Peter Johanson + -+ /* Determine fragmentation size based on destination (multicast -+ * and broadcast are not fragmented) */ - if (is_multicast_ether_addr(dest) || - is_broadcast_ether_addr(dest)) -- frag_size = MAX_FRAG_THRESHOLD - IEEE80211_3ADDR_SIZE; -+ frag_size = MAX_FRAG_THRESHOLD; - else -- frag_size = ieee->fts - IEEE80211_3ADDR_SIZE; -+ frag_size = ieee->fts; - -- bytes_per_frag = frag_size; -+ /* Determine amount of payload per fragment. Regardless of if -+ * this stack is providing the full 802.11 header, one will -+ * eventually be affixed to this fragment -- so we must account for -+ * it when determining the amount of payload space. */ -+ bytes_per_frag = frag_size - IEEE80211_3ADDR_LEN; -+ if (ieee->config & -+ (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS)) -+ bytes_per_frag -= IEEE80211_FCS_LEN; - - #ifdef CONFIG_IEEE80211_CRYPT - /* Each fragment may need to have room for encryptiong pre/postfix */ -@@ -381,8 +379,8 @@ struct ieee80211_txb *ieee80211_skb_to_t - bytes_last_frag = bytes_per_frag; - - /* When we allocate the TXB we allocate enough space for the reserve -- * and full fragment bytes (bytes_per_frag doesn't include prefix and -- * postfix) */ -+ * and full fragment bytes (bytes_per_frag doesn't include prefix, -+ * postfix, header, FCS, etc.) */ - txb = ieee80211_alloc_txb(nr_frags, frag_size, GFP_ATOMIC); - if (unlikely(!txb)) { - printk(KERN_WARNING "%s: Could not allocate TXB\n", -@@ -400,12 +398,21 @@ struct ieee80211_txb *ieee80211_skb_to_t - skb_reserve(skb_frag, crypt->ops->extra_prefix_len); - #endif - -- if (hdr_len) -- memcpy(skb_put(skb_frag, hdr_len), &header, hdr_len); -+ frag_hdr = (struct ieee80211_hdr *)skb_put(skb_frag, hdr_len); -+ memcpy(frag_hdr, &header, hdr_len); - -- bytes = (i == nr_frags - 1) ? bytes_last_frag : bytes_per_frag; -- -- /* Put a SNAP header on the first fragment */ -+ /* If this is not the last fragment, then add the MOREFRAGS -+ * bit to the frame control */ -+ if (i != nr_frags - 1) { -+ frag_hdr->frame_ctl = cpu_to_le16( -+ fc | IEEE80211_FCTL_MOREFRAGS); -+ bytes = bytes_per_frag; -+ } else { -+ /* The last fragment takes the remaining length */ -+ bytes = bytes_last_frag; -+ } -+ -+ /* Put a SNAP header on the first fragment */ - if (i == 0) { - ieee80211_put_snap( - skb_put(skb_frag, SNAP_SIZE + sizeof(u16)), -@@ -421,32 +428,37 @@ struct ieee80211_txb *ieee80211_skb_to_t - #ifdef CONFIG_IEEE80211_CRYPT - /* Encryption routine will move the header forward in order - * to insert the IV between the header and the payload */ -- if (encrypt) { -+ if (encrypt) - ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len); -- skb_pull(skb_frag, hdr_len); -- } - #endif -+ if (ieee->config & -+ (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS)) -+ skb_put(skb_frag, 4); - } - -- stats->tx_packets++; -- stats->tx_bytes += txb->payload_size; - --#ifdef CONFIG_IEEE80211_WPA - success: --#endif -- /* We are now done with the SKB provided to us */ -- dev_kfree_skb_any(skb); -- - spin_unlock_irqrestore(&ieee->lock, flags); - -- return txb; -+ dev_kfree_skb_any(skb); ++list-m := + -+ if (txb) { -+ if ((*ieee->hard_start_xmit)(txb, dev) == 0) { -+ stats->tx_packets++; -+ stats->tx_bytes += txb->payload_size; -+ return 0; -+ } -+ ieee80211_txb_free(txb); -+ } ++list-$(CONFIG_IEEE80211) += ieee80211 ++list-$(CONFIG_IEEE80211_CRYPT) += ieee80211_crypt ++list-$(CONFIG_IEEE80211_CRYPT) += ieee80211_crypt_wep ++list-$(CONFIG_IEEE80211_WPA) += ieee80211_crypt_ccmp ++list-$(CONFIG_IEEE80211_WPA) += ieee80211_crypt_tkip + -+ return 0; - - failed: -+ spin_unlock_irqrestore(&ieee->lock, flags); -+ netif_stop_queue(dev); - stats->tx_errors++; -- -- return NULL; -+ return 1; - - } ++obj-$(CONFIG_IEEE80211) += ieee80211.o ++obj-$(CONFIG_IEEE80211_CRYPT) += ieee80211_crypt.o ++obj-$(CONFIG_IEEE80211_CRYPT) += ieee80211_crypt_wep.o ++obj-$(CONFIG_IEEE80211_WPA) += ieee80211_crypt_ccmp.o ++obj-$(CONFIG_IEEE80211_WPA) += ieee80211_crypt_tkip.o ++ieee80211-objs := \ ++ ieee80211_module.o \ ++ ieee80211_tx.o \ ++ ieee80211_rx.o \ ++ ieee80211_wx.o +diff -urNp --exclude-from=/home/davej/.exclude linux-3021/drivers/net/wireless/Makefile linux-3022/drivers/net/wireless/Makefile +--- linux-3021/drivers/net/wireless/Makefile ++++ linux-3022/drivers/net/wireless/Makefile +@@ -3,6 +3,7 @@ + # + obj-$(CONFIG_IPW2100) += ipw2100/ + obj-$(CONFIG_IPW2200) += ipw2200/ ++obj-$(CONFIG_IEEE80211) += ieee80211/ --EXPORT_SYMBOL(ieee80211_skb_to_txb); - EXPORT_SYMBOL(ieee80211_txb_free); - + obj-$(CONFIG_STRIP) += strip.o + obj-$(CONFIG_ARLAN) += arlan.o linux-2.6.9-ipw2100.patch: Documentation/networking/README.ipw2100 | 179 drivers/net/wireless/Kconfig | 128 drivers/net/wireless/Makefile | 1 drivers/net/wireless/ipw2100/LICENSE | 339 + drivers/net/wireless/ipw2100/Makefile | 15 drivers/net/wireless/ipw2100/ipw2100.c | 8975 ++++++++++++++++++++++++++++++++ drivers/net/wireless/ipw2100/ipw2100.h | 1287 ++++ 7 files changed, 10924 insertions(+) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6.9-ipw2100.patch Index: linux-2.6.9-ipw2100.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-ipw2100.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6.9-ipw2100.patch 2 Mar 2005 03:44:13 -0000 1.3 +++ linux-2.6.9-ipw2100.patch 22 Mar 2005 07:00:22 -0000 1.4 @@ -1,18 +1,190 @@ - -IPW2100 driver from Intel...(almost all new...) - - Documentation/networking/README.ipw2100 | 179 - drivers/net/wireless/Kconfig | 128 - drivers/net/wireless/Makefile | 1 - drivers/net/wireless/ipw2100/LICENSE | 339 + - drivers/net/wireless/ipw2100/Makefile | 15 - drivers/net/wireless/ipw2100/ipw2100.c | 8726 ++++++++++++++++++++++++++++++++ - drivers/net/wireless/ipw2100/ipw2100.h | 1493 +++++ - 7 files changed, 10881 insertions(+) - ---- /dev/null -+++ linux-2.6.9/drivers/net/wireless/ipw2100/ipw2100.h -@@ -0,0 +1,1493 @@ +diff -urNp --exclude-from=/home/davej/.exclude linux-2999/Documentation/networking/README.ipw2100 linux-3020/Documentation/networking/README.ipw2100 +--- linux-2999/Documentation/networking/README.ipw2100 ++++ linux-3020/Documentation/networking/README.ipw2100 +@@ -0,0 +1,179 @@ ++ ++Intel PRO/Wireless 2100 802.11b Driver for Linux ++README.ipw2100 ++ ++October 13, 2004 ++ ++ ++Release 0.56 Current Features ++------------ ----- ----- ---- --- -- - ++ ++- IBSS and BSS modes ++- 802.11 fragmentation ++- WEP (shared key and open) ++- wireless extension support ++- 802.1x EAP via xsupplicant ++- Monitor/RFMon mode ++- transmit power control ++- long/short preamble support ++- power states support (ACPI) ++ ++TODO ++------------ ----- ----- ---- --- -- - ++- Fix bugs... The biggies: ++ C3 corruption ++ Fragmentation ++ ++ ++Command Line Parameters ++------------ ----- ----- ---- --- -- - ++ ++If the driver is built as a module, the following optional parameters are used ++by entering them on the command line with the modprobe command using this ++syntax: ++ ++ modprobe ipw2100 [